Bug#260521: Intent to NMU

Robert Millan Robert Millan <zeratul2@wanadoo.es>, 260521@bugs.debian.org
Wed, 21 Jul 2004 16:31:26 +0200


--IiVenqGWf+H9Y6IX
Content-Type: multipart/mixed; boundary="zhXaljGHf11kAtnf"
Content-Disposition: inline


--zhXaljGHf11kAtnf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

tags 260521 patch
tags 260521 pending
thanks

Hi!

I'm attaching a patch for libtool update in upstream sources, which seems to
be the way you used in previous versions of the package. Since the patch is
quite big I've signed the message so that you don't need to check it.

If I recieve no reply I'll NMU within 7 days.

--=20
Robert Millan

"[..] but the delight and pride of Aule is in the deed of making, and in the
thing made, and neither in possession nor in his own mastery; wherefore he
gives and hoards not, and is free from care, passing ever on to some new wo=
rk."

 -- J.R.R.T., Ainulindale (Silmarillion)

--zhXaljGHf11kAtnf
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="atk1.0.diff"
Content-Transfer-Encoding: quoted-printable

diff -ur atk-1.6.1.old/aclocal.m4 atk-1.6.1/aclocal.m4
--- atk-1.6.1.old/aclocal.m4	2004-04-19 16:17:45.000000000 +0200
+++ atk-1.6.1/aclocal.m4	2004-07-21 16:09:42.000000000 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.7.2 -*- Autoconf -*-
+# generated automatically by aclocal 1.7.9 -*- Autoconf -*-
=20
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
@@ -42,7 +42,7 @@
 # This macro actually does too much some checks are only needed if
 # your package does certain things.  But this isn't really a big deal.
=20
-# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
 # Free Software Foundation, Inc.
=20
 # This program is free software; you can redistribute it and/or modify
@@ -60,14 +60,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
=20
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
+# serial 10
=20
 AC_PREREQ([2.54])
=20
@@ -112,8 +105,8 @@
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
- AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
=20
 _AM_IF_OPTION([no-define],,
 [AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
@@ -134,6 +127,7 @@
 # some platforms.
 AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
=20
 _AM_IF_OPTION([no-dependencies],,
 [AC_PROVIDE_IFELSE([AC_PROG_CC],
@@ -156,7 +150,16 @@
 # loop where config.status creates the headers, so we can generate
 # our stamp files there.
 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[_am_stamp_count=3D`expr ${_am_stamp_count-0} + 1`
+[# Compute $1's index in $config_headers.
+_am_stamp_count=3D1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $1 | $1:* )
+      break ;;
+    * )
+      _am_stamp_count=3D`expr $_am_stamp_count + 1` ;;
+  esac
+done
 echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
=20
 # Copyright 2002  Free Software Foundation, Inc.
@@ -186,7 +189,7 @@
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.7.2])])
+	 [AM_AUTOMAKE_VERSION([1.7.9])])
=20
 # Helper functions for option handling.                    -*- Autoconf -*-
=20
@@ -472,9 +475,42 @@
 INSTALL_STRIP_PROGRAM=3D"\${SHELL} \$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
=20
-# serial 4						-*- Autoconf -*-
+#                                                          -*- Autoconf -*-
+# Copyright (C) 2003  Free Software Foundation, Inc.
=20
-# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 1
+
+# Check whether the underlying file-system supports filenames
+# with a leading dot.  For instance MS-DOS doesn't.
+AC_DEFUN([AM_SET_LEADING_DOT],
+[rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=3D.
+else
+  am__leading_dot=3D_
+fi
+rmdir .tst 2>/dev/null
+AC_SUBST([am__leading_dot])])
+
+# serial 5						-*- Autoconf -*-
+
+# Copyright (C) 1999, 2000, 2001, 2002, 2003  Free Software Foundation, In=
c.
=20
 # 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
@@ -535,18 +571,32 @@
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
=20
   am_cv_$1_dependencies_compiler_type=3Dnone
   if test "$am_compiler_list" =3D ""; then
      am_compiler_list=3D`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depco=
mp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
=20
     case $depmode in
     nosideeffect)
@@ -564,13 +614,20 @@
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=3D$depmode \
-       source=3Dconftest.c object=3Dconftest.o \
-       depfile=3Dconftest.Po tmpdepfile=3Dconftest.TPo \
-       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1=
 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       source=3Dsub/conftest.c object=3Dsub/conftest.${OBJEXT-o} \
+       depfile=3Dsub/conftest.Po tmpdepfile=3Dsub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest=
=2Ec \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      am_cv_$1_dependencies_compiler_type=3D$depmode
-      break
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+        am_cv_$1_dependencies_compiler_type=3D$depmode
+        break
+      fi
     fi
   done
=20
@@ -592,16 +649,8 @@
 # Choose a directory name for dependency files.
 # This macro is AC_REQUIREd in _AM_DEPENDENCIES
 AC_DEFUN([AM_SET_DEPDIR],
-[rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
-  DEPDIR=3D.deps
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  DEPDIR=3D_deps
-fi
-rmdir .deps 2>/dev/null
-AC_SUBST([DEPDIR])
+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
 ])
=20
=20
@@ -705,7 +754,7 @@
=20
 # Check to see how 'make' treats includes.	-*- Autoconf -*-
=20
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
=20
 # 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
@@ -730,8 +779,9 @@
 AC_DEFUN([AM_MAKE_INCLUDE],
 [am_make=3D${MAKE-make}
 cat > confinc << 'END'
-doit:
+am__doit:
 	@echo done
+.PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
 AC_MSG_CHECKING([for style of include used by $am_make])
@@ -759,9 +809,9 @@
       _am_result=3DBSD
    fi
 fi
-AC_SUBST(am__include)
-AC_SUBST(am__quote)
-AC_MSG_RESULT($_am_result)
+AC_SUBST([am__include])
+AC_SUBST([am__quote])
+AC_MSG_RESULT([$_am_result])
 rm -f confinc confmf
 ])
=20
@@ -812,6 +862,7 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
=20
 # serial 47 AC_PROG_LIBTOOL
+# Debian $Rev: 192 $
=20
=20
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -1289,7 +1340,7 @@
         x86_64-*linux*)
           LD=3D"${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*)
+        ppc64-*linux*|powerpc64-*linux*)
           LD=3D"${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -1353,7 +1404,8 @@
 # ----------------------------------------------------------------
 # Check whether the given compiler option works
 AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
+[AC_REQUIRE([LT_AC_PROG_SED])
+AC_CACHE_CHECK([$1], [$2],
   [$2=3Dno
   ifelse([$4], , [ac_outfile=3Dconftest.$ac_objext], [ac_outfile=3D$4])
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -1458,6 +1510,12 @@
     lt_cv_sys_max_cmd_len=3D8192;
     ;;
=20
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=3D8192;
+    ;;
+
  *)
     # 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
@@ -1621,7 +1679,7 @@
     lt_cv_dlopen_self=3Dyes
     ])
    ;;
-   =20
+
   *)
     AC_CHECK_FUNC([shl_load],
 	  [lt_cv_dlopen=3D"shl_load"],
@@ -1710,13 +1768,6 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
=20
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compil=
ers
-   # that will create temporary files in the current directory regardless =
of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do para=
llel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag=3D"-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -1740,8 +1791,11 @@
      fi
    fi
    chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -1858,7 +1912,7 @@
    *)
   AC_MSG_RESULT([no])
     ;;
-  esac =20
+  esac
 fi
 ])# AC_LIBTOOL_SYS_LIB_STRIP
=20
@@ -1959,7 +2013,7 @@
 amigaos*)
   library_names_spec=3D'$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval=3D'for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libna=
me=3D`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; =
test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $l=
ib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibra=
ry.a) || exit 1; done'
+  finish_eval=3D'for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libna=
me=3D`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; =
test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $li=
b ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.=
a || exit 1; done'
   ;;
=20
 beos*)
@@ -2006,7 +2060,7 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec=3D'`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${relea=
se} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=3D"/lib /lib/w32api /usr/lib /usr/local/lib"
+      sys_lib_search_path_spec=3D"/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw*)
       # MinGW DLLs use traditional 'lib' prefix
@@ -2045,17 +2099,16 @@
   version_type=3Ddarwin
   need_lib_prefix=3Dno
   need_version=3Dno
-  # FIXME: Relying on posixy $() will cause problems for
-  #        cross-compilation, but unfortunately the echo tests do not
-  #        yet detect zsh echo's removal of \ escapes.
   library_names_spec=3D'${libname}${release}${versuffix}$shared_ext ${libn=
ame}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec=3D'${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=3Dyes
   shlibpath_var=3DDYLD_LIBRARY_PATH
   shrext=3D'$(test .$module =3D .yes && echo .so || echo .dylib)'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then=20
-  sys_lib_search_path_spec=3D`$CC -print-search-dirs | tr "\n" "$PATH_SEPA=
RATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^librarie=
s:" | sed -e "s/^libraries://" -e "s,=3D/,/,g" -e "s,$PATH_SEPARATOR, ,g" -=
e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  if test "$GCC" =3D yes; then
+    sys_lib_search_path_spec=3D`$CC -print-search-dirs | tr "\n" "$PATH_SE=
PARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^librar=
ies:" | sed -e "s/^libraries://" -e "s,=3D/,/,g" -e "s,$PATH_SEPARATOR, ,g"=
 -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  else
+    sys_lib_search_path_spec=3D'/lib /usr/lib /usr/local/lib'
   fi
   sys_lib_dlsearch_path_spec=3D'/usr/local/lib /lib /usr/lib'
   ;;
@@ -2073,6 +2126,18 @@
   dynamic_linker=3Dno
   ;;
=20
+kfreebsd*-gnu)
+  version_type=3Dlinux
+  need_lib_prefix=3Dno
+  need_version=3Dno
+  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec=3D'${libname}${release}${shared_ext}$major'
+  shlibpath_var=3DLD_LIBRARY_PATH
+  shlibpath_overrides_runpath=3Dno
+  hardcode_into_libs=3Dyes
+  dynamic_linker=3D'GNU ld.so'
+  ;;
+
 freebsd*)
   objformat=3D`test -x /usr/bin/objformat && /usr/bin/objformat || echo ao=
ut`
   version_type=3Dfreebsd-$objformat
@@ -2216,6 +2281,12 @@
   # before this can be enabled.
   hardcode_into_libs=3Dyes
=20
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    ld_extra=3D`$SED -e 's/[:,\t]/ /g;s/=3D[^=3D]*$//;s/=3D[^=3D ]* / /g' =
/etc/ld.so.conf`
+    sys_lib_dlsearch_path_spec=3D"/lib /usr/lib $ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -2225,6 +2296,18 @@
   dynamic_linker=3D'GNU/Linux ld.so'
   ;;
=20
+knetbsd*-gnu)
+  version_type=3Dlinux
+  need_lib_prefix=3Dno
+  need_version=3Dno
+  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec=3D'${libname}${release}${shared_ext}$major'
+  shlibpath_var=3DLD_LIBRARY_PATH
+  shlibpath_overrides_runpath=3Dno
+  hardcode_into_libs=3Dyes
+  dynamic_linker=3D'GNU ld.so'
+  ;;
+
 netbsd*)
   version_type=3Dsunos
   need_lib_prefix=3Dno
@@ -2234,7 +2317,7 @@
     finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker=3D'NetBSD (a.out) ld.so'
   else
-    library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${lib=
name}${shared_ext}'
+    library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec=3D'${libname}${release}${shared_ext}$major'
     dynamic_linker=3D'NetBSD ld.elf_so'
   fi
@@ -2250,7 +2333,7 @@
   shlibpath_overrides_runpath=3Dyes
   ;;
=20
-nto-qnx)
+nto-qnx*)
   version_type=3Dlinux
   need_lib_prefix=3Dno
   need_version=3Dno
@@ -2263,7 +2346,7 @@
 openbsd*)
   version_type=3Dsunos
   need_lib_prefix=3Dno
-  need_version=3Dno
+  need_version=3Dyes
   library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${shared_ext}$versuffix'
   finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=3DLD_LIBRARY_PATH
@@ -2719,7 +2802,7 @@
=20
 # AC_PROG_LD
 # ----------
-# find the path to the GNU or non-GNU linker
+# find the pathname to the GNU or non-GNU linker
 AC_DEFUN([AC_PROG_LD],
 [AC_ARG_WITH([gnu-ld],
     [AC_HELP_STRING([--with-gnu-ld],
@@ -2745,7 +2828,7 @@
     # Accept absolute paths.
     [[\\/]]* | ?:[[\\/]]*)
       re_direlt=3D'/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the path of ld
+      # Canonicalize the pathname of ld
       ac_prog=3D`echo $ac_prog| $SED 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=3D`echo $ac_prog| $SED "s%$re_direlt%/%"`
@@ -2808,7 +2891,7 @@
 [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.
-case `"$LD" -v 2>&1 </dev/null` in
+case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=3Dyes
   ;;
@@ -2873,28 +2956,24 @@
   lt_cv_file_magic_test_file=3D/shlib/libc.so
   ;;
=20
-cygwin* | mingw* | pw32*)
+cygwin*)
   # win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method=3D'file_magic ^x86 archive import|^x86 DLL'
   lt_cv_file_magic_cmd=3D'win32_libid'
   ;;
=20
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # win32_libid shell function, so use a weaker test based on 'objdump'.
+  lt_cv_deplibs_check_method=3D'file_magic file format pei*-i386(.*archite=
cture: i386)?'
+  lt_cv_file_magic_cmd=3D'$OBJDUMP -f'
+  ;;
+
 darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  lt_cv_deplibs_check_method=3D'file_magic Mach-O dynamically linked share=
d library'
-  lt_cv_file_magic_cmd=3D'/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[[012]])
-    lt_cv_file_magic_test_file=3D`/System/Library/Frameworks/System.framew=
ork/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file=3D'/usr/lib/libSystem.dylib'
-    ;;
-  esac
   lt_cv_deplibs_check_method=3Dpass_all
   ;;
=20
-freebsd*)
+freebsd* | kfreebsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -2933,39 +3012,21 @@
   ;;
=20
 irix5* | irix6* | nonstopux*)
-  case $host_os in
-  irix5* | nonstopux*)
-    # this will be overridden with pass_all, but let us keep it just in ca=
se
-    lt_cv_deplibs_check_method=3D"file_magic ELF 32-bit MSB dynamic lib MI=
PS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=3D32-bit;;
-    *-n32|*"-n32 ") libmagic=3DN32;;
-    *-64|*"-64 ") libmagic=3D64-bit;;
-    *) libmagic=3Dnever-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in ca=
se
-    lt_cv_deplibs_check_method=3D"file_magic ELF ${libmagic} MSB mips-[[12=
34]] dynamic lib MIPS - version 1"
-    ;;
+  case $LD in
+  *-32|*"-32 ") libmagic=3D32-bit;;
+  *-n32|*"-n32 ") libmagic=3DN32;;
+  *-64|*"-64 ") libmagic=3D64-bit;;
+  *) libmagic=3Dnever-match;;
   esac
-  lt_cv_file_magic_test_file=3D`echo /lib${libsuff}/libc.so*`
   lt_cv_deplibs_check_method=3Dpass_all
   ;;
=20
 # This must be Linux ELF.
 linux*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc*=
 | s390* | sh*)
-    lt_cv_deplibs_check_method=3Dpass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=3D'file_magic ELF [[0-9]][[0-9]]*-bit [[LM]=
]SB (shared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=3D`echo /lib/libc.so* /lib/libc-*.so`
+  lt_cv_deplibs_check_method=3Dpass_all
   ;;
=20
-netbsd*)
+netbsd* | knetbsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method=3D'match_pattern /lib[[^/]]+(\.so\.[[0-9]]+=
\.[[0-9]]+|_pic\.a)$'
   else
@@ -2979,7 +3040,7 @@
   lt_cv_file_magic_test_file=3D/usr/lib/libnls.so
   ;;
=20
-nto-qnx)
+nto-qnx*)
   lt_cv_deplibs_check_method=3Dunknown
   ;;
=20
@@ -2994,9 +3055,6 @@
   ;;
=20
 osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method=3D'file_magic COFF format alpha shared librar=
y'
-  lt_cv_file_magic_test_file=3D/shlib/libc.so
   lt_cv_deplibs_check_method=3Dpass_all
   ;;
=20
@@ -3006,7 +3064,6 @@
=20
 solaris*)
   lt_cv_deplibs_check_method=3Dpass_all
-  lt_cv_file_magic_test_file=3D/lib/libc.so
   ;;
=20
 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
@@ -3046,7 +3103,7 @@
=20
 # AC_PROG_NM
 # ----------
-# find the path to a BSD-compatible name lister
+# find the pathname to a BSD-compatible name lister
 AC_DEFUN([AC_PROG_NM],
 [AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
 [if test -n "$NM"; then
@@ -3184,7 +3241,7 @@
 AC_DEFUN([_LT_AC_LANG_CXX],
 [AC_REQUIRE([AC_PROG_CXX])
 AC_REQUIRE([AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=3D`echo "$tagnames,CXX" | sed 's/^,//'`])
+_LT_AC_SHELL_INIT([tagnames=3D${tagnames+${tagnames},}CXX])
 ])# _LT_AC_LANG_CXX
=20
=20
@@ -3200,7 +3257,7 @@
 # ---------------
 AC_DEFUN([_LT_AC_LANG_F77],
 [AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=3D`echo "$tagnames,F77" | sed 's/^,//'`])
+_LT_AC_SHELL_INIT([tagnames=3D${tagnames+${tagnames},}F77])
 ])# _LT_AC_LANG_F77
=20
=20
@@ -3221,7 +3278,7 @@
       [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
 	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
 	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=3D`echo "$tagnames,GCJ" | sed 's/^,//'`])
+_LT_AC_SHELL_INIT([tagnames=3D${tagnames+${tagnames},}GCJ])
 ])# _LT_AC_LANG_GCJ
=20
=20
@@ -3230,7 +3287,7 @@
 # enable support for Windows resource files
 AC_DEFUN([AC_LIBTOOL_RC],
 [AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=3D`echo "$tagnames,RC" | sed 's/^,//'`])
+_LT_AC_SHELL_INIT([tagnames=3D${tagnames+${tagnames},}RC])
 ])# AC_LIBTOOL_RC
=20
=20
@@ -3272,7 +3329,7 @@
 fi
 if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
   AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to bu=
ild shared libraries])
-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$]_LT_AC_TAGVAR(lt_prog_cc_=
shlib, $1)[[[ 	]]" >/dev/null; then :
+  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_s=
hlib, $1)[[ 	]]" >/dev/null; then :
   else
     AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or C=
FLAGS env variable and reconfigure])
     _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=3Dno
@@ -3295,9 +3352,9 @@
 AC_LIBTOOL_PROG_CC_C_O($1)
 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_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_DLOPEN_SELF($1)
=20
 # Report which librarie types wil actually be built
@@ -3324,33 +3381,42 @@
   fi
   ;;
   darwin* | rhapsody*)
-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then=20
+  if test "$GCC" =3D yes; then
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=3Dno
     case "$host_os" in
     rhapsody* | darwin1.[[012]])
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-undefined suppress'
       ;;
     *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_fl=
ag, $1)=3D'-flat_namespace -undefined suppress'
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-flat_namespace -undefin=
ed suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[[012]])
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-flat_namespace -un=
defined suppress'
+            ;;
+          10.*)
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-undefined dynamic_=
lookup'
+            ;;
+        esac
+      fi
       ;;
     esac
-    # FIXME: Relying on posixy $() will cause problems for
-    #        cross-compilation, but unfortunately the echo tests do not
-    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-    #	       `"' quotes if we put them in here... so don't!
-		output_verbose_link_cmd=3D'echo'
+    output_verbose_link_cmd=3D'echo'
     _LT_AC_TAGVAR(archive_cmds, $1)=3D'$CC -dynamiclib $allow_undefined_fl=
ag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $v=
erstring'
-    _LT_AC_TAGVAR(module_cmds, $1)=3D'$CC -bundle $allow_undefined_flag -o=
 $lib $libobjs $deplibs$compiler_flags'
+    _LT_AC_TAGVAR(module_cmds, $1)=3D'$CC $allow_undefined_flag -o $lib -b=
undle $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)=3D'sed -e "s,#.*,," -e "s,^[   =
 ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-sy=
mbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $depli=
bs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output=
_objdir/${libname}-symbols.expsym ${lib}'
-		  _LT_AC_TAGVAR(module_expsym_cmds, $1)=3D'sed -e "s,#.*,," -e "s,^[    =
]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-sym=
bols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$co=
mpiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)=3D'sed -e "s,#.*,," -e "s,^[   =
 ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-sy=
mbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $depli=
bs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output=
_objdir/${libname}-symbols.expsym ${lib}'
+    _LT_AC_TAGVAR(module_expsym_cmds, $1)=3D'sed -e "s,#.*,," -e "s,^[    =
]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-sym=
bols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$co=
mpiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     _LT_AC_TAGVAR(hardcode_direct, $1)=3Dno
     _LT_AC_TAGVAR(hardcode_automatic, $1)=3Dyes
     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=3Dunsupported
     _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=3D'-all_load $convenience'
     _LT_AC_TAGVAR(link_all_deplibs, $1)=3Dyes
-    fi
-    ;; =20
+  else
+    _LT_AC_TAGVAR(ld_shlibs, $1)=3Dno
+  fi
+    ;;
 esac
 AC_MSG_RESULT([$enable_shared])
=20
@@ -3485,7 +3551,7 @@
     # linker, instead of GNU ld.  If possible, this setting should
     # overridden to take advantage of the native linker features on
     # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)=3D'$CC -shared $predep_objects $libobj=
s $deplibs $postdep_objects $compiler_flags -o $lib'
+    _LT_AC_TAGVAR(archive_cmds, $1)=3D'$CC -shared -nostdlib $predep_objec=
ts $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
   fi
=20
   # Commands to make compiler produce verbose output that lists
@@ -3652,41 +3718,54 @@
   ;;
=20
   darwin* | rhapsody*)
-   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then=20
+  if test "$GXX" =3D yes; then
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=3Dno
     case "$host_os" in
     rhapsody* | darwin1.[[012]])
       _LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-undefined suppress'
       ;;
     *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_fl=
ag, $1)=3D'-flat_namespace -undefined suppress'
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-flat_namespace -undefin=
ed suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[[012]])
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-flat_namespace -un=
defined suppress'
+            ;;
+          10.*)
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-undefined dynamic_=
lookup'
+            ;;
+        esac
+      fi
       ;;
     esac
-    	lt_int_apple_cc_single_mod=3Dno
-    	output_verbose_link_cmd=3D'echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=3Dyes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" =3D Xyes ; then
-    	  _LT_AC_TAGVAR(archive_cmds, $1)=3D'$CC -dynamiclib -single_module $=
allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_nam=
e $rpath/$soname $verstring'
-    	else
-        _LT_AC_TAGVAR(archive_cmds, $1)=3D'$CC -r ${wl}-bind_at_load -keep=
_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $all=
ow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install=
_name $rpath/$soname $verstring'
-      fi
-      _LT_AC_TAGVAR(module_cmds, $1)=3D'$CC -bundle ${wl}-bind_at_load $al=
low_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+    lt_int_apple_cc_single_mod=3Dno
+    output_verbose_link_cmd=3D'echo'
+    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+      lt_int_apple_cc_single_mod=3Dyes
+    fi
+    if test "X$lt_int_apple_cc_single_mod" =3D Xyes ; then
+      _LT_AC_TAGVAR(archive_cmds, $1)=3D'$CC -dynamiclib -single_module $a=
llow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name=
 $rpath/$soname $verstring'
+    else
+      _LT_AC_TAGVAR(archive_cmds, $1)=3D'$CC -r ${wl}-bind_at_load -keep_p=
rivate_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow=
_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_n=
ame $rpath/$soname $verstring'
+    fi
+    _LT_AC_TAGVAR(module_cmds, $1)=3D'$CC ${wl}-bind_at_load $allow_undefi=
ned_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
=20
     # 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" =3D Xyes ; then
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)=3D'sed -e "s,#.*,," -e "s,^=
[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname=
}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $l=
ib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstrin=
g~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      else
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)=3D'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 $verst=
ring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      fi
-        _LT_AC_TAGVAR(module_expsym_cmds, $1)=3D'sed -e "s,#.*,," -e "s,^[=
    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}=
-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplib=
s$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    if test "X$lt_int_apple_cc_single_mod" =3D Xyes ; then
+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)=3D'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)=3D'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 ${l=
ib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstri=
ng~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    _LT_AC_TAGVAR(module_expsym_cmds, $1)=3D'sed -e "s,#.*,," -e "s,^[    =
]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-sym=
bols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$co=
mpiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
     _LT_AC_TAGVAR(hardcode_direct, $1)=3Dno
     _LT_AC_TAGVAR(hardcode_automatic, $1)=3Dyes
     _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=3Dunsupported
     _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=3D'-all_load $convenience'
     _LT_AC_TAGVAR(link_all_deplibs, $1)=3Dyes
-   fi=20
+  else
+    _LT_AC_TAGVAR(ld_shlibs, $1)=3Dno
+  fi
     ;;
=20
   dgux*)
@@ -3713,7 +3792,7 @@
   freebsd-elf*)
     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=3Dno
     ;;
-  freebsd*)
+  freebsd* | kfreebsd*-gnu)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     _LT_AC_TAGVAR(ld_shlibs, $1)=3Dyes
@@ -3941,7 +4020,7 @@
 	;;
     esac
     ;;
-  netbsd*)
+  netbsd* | knetbsd*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       _LT_AC_TAGVAR(archive_cmds, $1)=3D'$LD -Bshareable  -o $lib $predep_=
objects $libobjs $deplibs $postdep_objects $linker_flags'
       wlarc=3D
@@ -4223,9 +4302,9 @@
 AC_LIBTOOL_PROG_CC_C_O($1)
 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_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_DLOPEN_SELF($1)
=20
 AC_LIBTOOL_CONFIG($1)
@@ -4467,9 +4546,10 @@
 AC_LIBTOOL_PROG_CC_C_O($1)
 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_SYS_DYNAMIC_LINKER($1)
+
=20
 AC_LIBTOOL_CONFIG($1)
=20
@@ -4517,9 +4597,9 @@
 AC_LIBTOOL_PROG_CC_C_O($1)
 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_SYS_DYNAMIC_LINKER($1)
 AC_LIBTOOL_DLOPEN_SELF($1)
=20
 AC_LIBTOOL_CONFIG($1)
@@ -4584,11 +4664,12 @@
   # without removal of \ escapes.
   if test -n "${ZSH_VERSION+set}" ; then
     setopt NO_GLOB_SUBST
-  fi =20
+  fi
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM =
SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -4638,7 +4719,7 @@
     _LT_AC_TAGVAR(archive_cmds, $1) | \
     _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
     _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \  =20
+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
     _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
     _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
     extract_expsyms_cmds | reload_cmds | finish_cmds | \
@@ -4769,7 +4850,7 @@
 NM=3D$lt_NM
=20
 # A symbol stripping program
-STRIP=3D$STRIP
+STRIP=3D$lt_STRIP
=20
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=3D$MAGIC_CMD
@@ -5044,7 +5125,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=3D`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
 ])# AC_LIBTOOL_CONFIG
=20
@@ -5117,7 +5201,7 @@
   symcode=3D'[[BCDEGQRST]]'
   ;;
 solaris* | sysv5*)
-  symcode=3D'[[BDT]]'
+  symcode=3D'[[BDRT]]'
   ;;
 sysv4)
   symcode=3D'[[DFNSTU]]'
@@ -5135,7 +5219,7 @@
 # If we're using GNU nm, then use its standard symbol codes.
 case `$NM -V 2>&1` in
 *GNU* | *'with BFD'*)
-  symcode=3D'[[ABCDGISTW]]' ;;
+  symcode=3D'[[ABCDGIRSTW]]' ;;
 esac
=20
 # Try without a prefix undercore, then with it.
@@ -5350,7 +5434,7 @@
 	    ;;
 	esac
 	;;
-      freebsd*)
+      freebsd* | kfreebsd*-gnu)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -5401,7 +5485,7 @@
 	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=3D'-Wl,'
 	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=3D'-KPIC'
 	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=3D'-static'
-	    ;;=20
+	    ;;
 	  cxx)
 	    # Compaq C++
 	    # Make sure the PIC flag is empty.  It appears that all Alpha
@@ -5426,7 +5510,7 @@
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | knetbsd*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
@@ -5626,12 +5710,12 @@
=20
     linux*)
       case $CC in
-      icc|ecc)
+      icc* | ecc*)
 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=3D'-Wl,'
 	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=3D'-KPIC'
 	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=3D'-static'
         ;;
-      ccc)
+      ccc*)
         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=3D'-Wl,'
         # All Alpha code is PIC.
         _LT_AC_TAGVAR(lt_prog_compiler_static, $1)=3D'-non_shared'
@@ -5761,7 +5845,7 @@
   _LT_AC_TAGVAR(link_all_deplibs, $1)=3Dunknown
   _LT_AC_TAGVAR(hardcode_automatic, $1)=3Dno
   _LT_AC_TAGVAR(module_cmds, $1)=3D
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=3D =20
+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=3D
   _LT_AC_TAGVAR(always_export_symbols, $1)=3Dno
   _LT_AC_TAGVAR(export_symbols_cmds, $1)=3D'$NM $libobjs $convenience | $g=
lobal_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
   # include_expsyms should be a list of space-separated symbols to be *alw=
ays*
@@ -5866,7 +5950,7 @@
       fi
       ;;
=20
-    netbsd*)
+    netbsd* | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)=3D'$LD -Bshareable $libobjs $deplibs $lin=
ker_flags -o $lib'
 	wlarc=3D
@@ -5904,6 +5988,31 @@
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=3Dno
       ;;
=20
+  linux*)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; t=
hen
+        tmp_archive_cmds=3D'$CC -shared $libobjs $deplibs $compiler_flags =
${wl}-soname $wl$soname -o $lib'
+	_LT_AC_TAGVAR(archive_cmds, $1)=3D"$tmp_archive_cmds"
+      supports_anon_versioning=3Dno
+      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=3Dyes ;; # RH7.3 ...
+        *\ 2.11.92.0.12\ *) supports_anon_versioning=3Dyes ;; # Mandrake 8=
=2E2 ...
+        *\ 2.11.*) ;; # other 2.11 versions
+        *) supports_anon_versioning=3Dyes ;;
+      esac
+      if test $supports_anon_versioning =3D yes; then
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)=3D'$echo "{ global:" > $out=
put_objdir/$libname.ver~
+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ve=
r~
+$echo "local: *; };" >> $output_objdir/$libname.ver~
+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$son=
ame ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+      else
+        _LT_AC_TAGVAR(archive_expsym_cmds, $1)=3D"$tmp_archive_cmds"
+      fi
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=3Dno
+    fi
+    ;;
+
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; =
then
 	_LT_AC_TAGVAR(archive_cmds, $1)=3D'$CC -shared $libobjs $deplibs $compile=
r_flags ${wl}-soname $wl$soname -o $lib'
@@ -6092,20 +6201,27 @@
       ;;
=20
     darwin* | rhapsody*)
-    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then=20
+    if test "$GXX" =3D yes ; then
       _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=3Dno
       case "$host_os" in
       rhapsody* | darwin1.[[012]])
 	_LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-undefined suppress'
 	;;
       *) # Darwin 1.3 on
-	test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, $=
1)=3D'-flat_namespace -undefined suppress'
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	_LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-flat_namespace -undefin=
ed suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[[012]])
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-flat_namespace -un=
defined suppress'
+            ;;
+          10.*)
+            _LT_AC_TAGVAR(allow_undefined_flag, $1)=3D'-undefined dynamic_=
lookup'
+            ;;
+        esac
+      fi
 	;;
       esac
-      # FIXME: Relying on posixy $() will cause problems for
-      #        cross-compilation, but unfortunately the echo tests do not
-      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangl=
es
-      #	       `"' quotes if we put them in here... so don't!
     	lt_int_apple_cc_single_mod=3Dno
     	output_verbose_link_cmd=3D'echo'
     	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -6116,20 +6232,22 @@
     	else
         _LT_AC_TAGVAR(archive_cmds, $1)=3D'$CC -r ${wl}-bind_at_load -keep=
_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $all=
ow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install=
_name $rpath/$soname $verstring'
       fi
-      _LT_AC_TAGVAR(module_cmds, $1)=3D'$CC -bundle ${wl}-bind_at_load $al=
low_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
+      _LT_AC_TAGVAR(module_cmds, $1)=3D'$CC ${wl}-bind_at_load $allow_unde=
fined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
       # Don't fix this by using the ld -exported_symbols_list flag, it doe=
sn't exist in older darwin ld's
         if test "X$lt_int_apple_cc_single_mod" =3D Xyes ; then
           _LT_AC_TAGVAR(archive_expsym_cmds, $1)=3D'sed -e "s,#.*,," -e "s=
,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libna=
me}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o =
$lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstr=
ing~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
         else
           _LT_AC_TAGVAR(archive_expsym_cmds, $1)=3D'sed -e "s,#.*,," -e "s=
,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libna=
me}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdli=
b -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib=
 ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $ver=
string~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
         fi
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)=3D'sed -e "s,#.*,," -e "s,=
^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libnam=
e}-symbols.expsym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $depl=
ibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib=
}'
+          _LT_AC_TAGVAR(module_expsym_cmds, $1)=3D'sed -e "s,#.*,," -e "s,=
^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libnam=
e}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $depl=
ibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib=
}'
       _LT_AC_TAGVAR(hardcode_direct, $1)=3Dno
       _LT_AC_TAGVAR(hardcode_automatic, $1)=3Dyes
       _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=3Dunsupported
       _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=3D'-all_load $convenience'
       _LT_AC_TAGVAR(link_all_deplibs, $1)=3Dyes
-    fi =20
+    else
+      _LT_AC_TAGVAR(ld_shlibs, $1)=3Dno
+    fi
       ;;
=20
     dgux*)
@@ -6162,7 +6280,7 @@
       ;;
=20
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd*)
+    freebsd* | kfreebsd*-gnu)
       _LT_AC_TAGVAR(archive_cmds, $1)=3D'$CC -shared -o $lib $libobjs $dep=
libs $compiler_flags'
       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=3D'-R$libdir'
       _LT_AC_TAGVAR(hardcode_direct, $1)=3Dyes
@@ -6249,7 +6367,7 @@
       _LT_AC_TAGVAR(link_all_deplibs, $1)=3Dyes
       ;;
=20
-    netbsd*)
+    netbsd* | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	_LT_AC_TAGVAR(archive_cmds, $1)=3D'$LD -Bshareable -o $lib $libobjs $depl=
ibs $linker_flags'  # a.out
       else
@@ -6479,7 +6597,7 @@
       AC_MSG_CHECKING([whether -lc should be explicitly linked in])
       $rm conftest*
       printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- =20
+
       if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
         soname=3Dconftest
         lib=3Dconftest
@@ -7104,7 +7222,8 @@
 	  AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
 	  GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
 	    [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-	   AC_TRY_LINK([#include <libintl.h>], [return (int) bind_textdomain_code=
set ("", "")],=20
+	  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr],
 	    [CATOBJEXT=3D.gmo=20
              DATADIRNAME=3Dshare],
 	    [case $host in
diff -ur atk-1.6.1.old/config.guess atk-1.6.1/config.guess
--- atk-1.6.1.old/config.guess	2003-05-23 10:59:21.000000000 +0200
+++ atk-1.6.1/config.guess	2004-07-21 16:09:31.000000000 +0200
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
=20
-timestamp=3D'2003-02-22'
+timestamp=3D'2004-03-12'
=20
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -106,6 +106,7 @@
 : ${TMPDIR=3D/tmp} ;
  { tmp=3D`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && t=
est -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=3D$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir =
$tmp) ; } ||
+ { tmp=3D$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: crea=
ting insecure temp directory" >&2 ; } ||
  { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1=
 ; } ;
 dummy=3D$tmp/dummy ;
 tmpfiles=3D"$dummy.c $dummy.o $dummy.rel $dummy" ;
@@ -196,12 +197,18 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit 0 ;;
+    amd64:OpenBSD:*:*)
+	echo x86_64-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
     arc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    cats:OpenBSD:*:*)
+	echo arm-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -220,6 +227,9 @@
     mvmeppc:OpenBSD:*:*)
 	echo powerpc-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    pegasos:OpenBSD:*:*)
+	echo powerpc-unknown-openbsd${UNAME_RELEASE}
+	exit 0 ;;
     pmax:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -235,10 +245,24 @@
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:ekkoBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+	exit 0 ;;
+    macppc:MirBSD:*:*)
+	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
+    *:MirBSD:*:*)
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+	exit 0 ;;
     alpha:OSF1:*:*)
-	if test $UNAME_RELEASE =3D "V4.0"; then
+	case $UNAME_RELEASE in
+	*4.0)
 		UNAME_RELEASE=3D`/usr/sbin/sizer -v | awk '{print $3}'`
-	fi
+		;;
+	*5.*)
+	        UNAME_RELEASE=3D`/usr/sbin/sizer -v | awk '{print $4}'`
+		;;
+	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
 	# OSF/1 and Tru64 systems produced since 1995.  I hope that
 	# covers most systems running today.  This code pipes the CPU
@@ -276,11 +300,15 @@
 	    "EV7.9 (21364A)")
 		UNAME_MACHINE=3D"alphaev79" ;;
 	esac
+	# A Pn.n version is a patched version.
 	# A Vn.n version is a released version.
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'=
 | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//=
' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+	exit 0 ;;
+    Alpha*:OpenVMS:*:*)
+	echo alpha-hp-vms
 	exit 0 ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
@@ -303,6 +331,9 @@
     *:OS/390:*:*)
 	echo i370-ibm-openedition
 	exit 0 ;;
+    *:OS400:*:*)
+        echo powerpc-ibm-os400
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
@@ -320,6 +351,9 @@
     NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
+    DRS?6000:unix:4.0:6*)
+	echo sparc-icl-nx6
+	exit 0 ;;
     DRS?6000:UNIX_SV:4.2*:7*)
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7 && exit 0 ;;
@@ -392,6 +426,9 @@
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
         echo m68k-unknown-mint${UNAME_RELEASE}
         exit 0 ;;
+    m68k:machten:*:*)
+	echo m68k-apple-machten${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
@@ -727,7 +764,7 @@
 	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     *:UNICOS/mp:*:*)
-	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'=20
+	echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit 0 ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=3D`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklm=
nopqrstuvwxyz'`
@@ -735,6 +772,11 @@
         FUJITSU_REL=3D`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
         echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
         exit 0 ;;
+    5000:UNIX_System_V:4.*:*)
+        FUJITSU_SYS=3D`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefg=
hijklmnopqrstuvwxyz' | sed -e 's/\///'`
+        FUJITSU_REL=3D`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVW=
XYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit 0 ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
@@ -756,7 +798,10 @@
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=3D`
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(=
].*//'`${LIBC:+-$LIBC}
+	# GNU/KFreeBSD systems have a "k" prefix to indicate we are using
+	# FreeBSD's kernel, but not the complete OS.
+	case ${LIBC} in gnu) kernel_only=3D'k' ;; esac
+	echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}=
|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
 	exit 0 ;;
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
@@ -767,8 +812,8 @@
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit 0 ;;
-    x86:Interix*:3*)
-	echo i586-pc-interix3
+    x86:Interix*:[34]*)
+	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 	exit 0 ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
@@ -789,17 +834,28 @@
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit 0 ;;
     *:GNU:*:*)
+	# the GNU system
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAM=
E_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
+    *:GNU/*:*:*)
+	# other systems with GNU libc and userland
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' |=
 tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	exit 0 ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    cris:Linux:*:*)
+	echo cris-axis-linux-gnu
+	exit 0 ;;
     ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
+    m32r*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -875,6 +931,9 @@
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
+    sh64*:Linux:*:*)
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit 0 ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
@@ -932,6 +991,9 @@
 	LIBC=3Dgnuaout
 	#endif
 	#endif
+	#ifdef __dietlibc__
+	LIBC=3Ddietlibc
+	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=3D`
 	test x"${LIBC}" !=3D x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exi=
t 0
@@ -962,6 +1024,9 @@
     i*86:atheos:*:*)
 	echo ${UNAME_MACHINE}-unknown-atheos
 	exit 0 ;;
+	i*86:syllable:*:*)
+	echo ${UNAME_MACHINE}-pc-syllable
+	exit 0 ;;
     i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
@@ -1033,7 +1098,7 @@
 	exit 0 ;;
     M68*:*:R3V[567]*:*)
 	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??=
/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4=
=2E0:3.0)
+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]?=
?/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:=
4.0:3.0 | SHG2:*:4.0:3.0)
 	OS_REL=3D''
 	test -r /etc/.relid \
 	&& OS_REL=3D.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
@@ -1148,7 +1213,7 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit 0 ;;
-    NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*)
+    NSR-?:NONSTOP_KERNEL:*:*)
 	echo nsr-tandem-nsk${UNAME_RELEASE}
 	exit 0 ;;
     *:NonStop-UX:*:*)
@@ -1189,6 +1254,12 @@
     *:ITS:*:*)
 	echo pdp10-unknown-its
 	exit 0 ;;
+    SEI:*:*:SEIUX)
+        echo mips-sei-seiux${UNAME_RELEASE}
+	exit 0 ;;
+    *:DragonFly:*:*)
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[=
-(].*//'`
+	exit 0 ;;
 esac
=20
 #echo '(No uname command or uname output not recognized.)' 1>&2
diff -ur atk-1.6.1.old/config.sub atk-1.6.1/config.sub
--- atk-1.6.1.old/config.sub	2003-05-23 10:59:21.000000000 +0200
+++ atk-1.6.1/config.sub	2004-07-21 16:09:31.000000000 +0200
@@ -3,7 +3,7 @@
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 #   2000, 2001, 2002, 2003 Free Software Foundation, Inc.
=20
-timestamp=3D'2003-02-22'
+timestamp=3D'2004-03-12'
=20
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -118,7 +118,8 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=3D`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os=
2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc*=
 | uclinux-gnu* | \
+  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* =
| rtmk-nova*)
     os=3D-$maybe_os
     basic_machine=3D`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
@@ -228,14 +229,15 @@
 	| a29k \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[6=
7] \
+	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| clipper \
+	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
 	| fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
-	| ip2k \
-	| m32r | m68000 | m68k | m88k | mcore \
+	| ip2k | iq2000 \
+	| m32r | m32rle | m68000 | m68k | m88k | mcore \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
@@ -247,6 +249,7 @@
 	| mipsisa32 | mipsisa32el \
 	| mipsisa32r2 | mipsisa32r2el \
 	| mipsisa64 | mipsisa64el \
+	| mipsisa64r2 | mipsisa64r2el \
 	| mipsisa64sb1 | mipsisa64sb1el \
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
@@ -259,9 +262,9 @@
 	| pyramid \
 	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
-	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
+	| sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 |=
 sparcv9b \
 	| strongarm \
-	| tahoe | thumb | tic80 | tron \
+	| tahoe | thumb | tic4x | tic80 | tron \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xscale | xstormy16 | xtensa \
@@ -304,8 +307,8 @@
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* \
-	| m32r-* \
+	| ip2k-* | iq2000-* \
+	| m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 	| m88110-* | m88k-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -319,6 +322,7 @@
 	| mipsisa32-* | mipsisa32el-* \
 	| mipsisa32r2-* | mipsisa32r2el-* \
 	| mipsisa64-* | mipsisa64el-* \
+	| mipsisa64r2-* | mipsisa64r2el-* \
 	| mipsisa64sb1-* | mipsisa64sb1el-* \
 	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
 	| mipstx39-* | mipstx39el-* \
@@ -332,7 +336,7 @@
 	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
-	| sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
@@ -359,6 +363,9 @@
 		basic_machine=3Da29k-amd
 		os=3D-udi
 		;;
+    	abacus)
+		basic_machine=3Dabacus-unknown
+		;;
 	adobe68k)
 		basic_machine=3Dm68010-adobe
 		os=3D-scout
@@ -373,6 +380,12 @@
 		basic_machine=3Da29k-none
 		os=3D-bsd
 		;;
+	amd64)
+		basic_machine=3Dx86_64-pc
+		;;
+	amd64-*)
+		basic_machine=3Dx86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	amdahl)
 		basic_machine=3D580-amdahl
 		os=3D-sysv
@@ -432,12 +445,20 @@
 		basic_machine=3Dj90-cray
 		os=3D-unicos
 		;;
+	cr16c)
+		basic_machine=3Dcr16c-unknown
+		os=3D-elf
+		;;
 	crds | unos)
 		basic_machine=3Dm68k-crds
 		;;
 	cris | cris-* | etrax*)
 		basic_machine=3Dcris-axis
 		;;
+	crx)
+		basic_machine=3Dcrx-unknown
+		os=3D-elf
+		;;
 	da30 | da30-*)
 		basic_machine=3Dm68k-da30
 		;;
@@ -737,6 +758,10 @@
 		basic_machine=3Dor32-unknown
 		os=3D-coff
 		;;
+	os400)
+		basic_machine=3Dpowerpc-ibm
+		os=3D-os400
+		;;
 	OSE68000 | ose68000)
 		basic_machine=3Dm68000-ericsson
 		os=3D-ose
@@ -768,18 +793,24 @@
 	pentiumpro | p6 | 6x86 | athlon | athlon_*)
 		basic_machine=3Di686-pc
 		;;
-	pentiumii | pentium2)
+	pentiumii | pentium2 | pentiumiii | pentium3)
 		basic_machine=3Di686-pc
 		;;
+	pentium4)
+		basic_machine=3Di786-pc
+		;;
 	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
 		basic_machine=3Di586-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	pentiumpro-* | p6-* | 6x86-* | athlon-*)
 		basic_machine=3Di686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pentiumii-* | pentium2-*)
+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
 		basic_machine=3Di686-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
+	pentium4-*)
+		basic_machine=3Di786-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	pn)
 		basic_machine=3Dpn-gould
 		;;
@@ -838,6 +869,10 @@
 	sb1el)
 		basic_machine=3Dmipsisa64sb1el-unknown
 		;;
+	sei)
+		basic_machine=3Dmips-sei
+		os=3D-seiux
+		;;
 	sequent)
 		basic_machine=3Di386-sequent
 		;;
@@ -845,6 +880,9 @@
 		basic_machine=3Dsh-hitachi
 		os=3D-hms
 		;;
+	sh64)
+		basic_machine=3Dsh64-unknown
+		;;
 	sparclite-wrs | simso-wrs)
 		basic_machine=3Dsparclite-wrs
 		os=3D-vxworks
@@ -919,10 +957,6 @@
 		basic_machine=3Dt90-cray
 		os=3D-unicos
 		;;
-        tic4x | c4x*)
-		basic_machine=3Dtic4x-unknown
-		os=3D-coff
-		;;
 	tic54x | c54x*)
 		basic_machine=3Dtic54x-unknown
 		os=3D-coff
@@ -948,6 +982,10 @@
 	tower | tower-32)
 		basic_machine=3Dm68k-ncr
 		;;
+	tpf)
+		basic_machine=3Ds390x-ibm
+		os=3D-tpf
+		;;
 	udi29k)
 		basic_machine=3Da29k-amd
 		os=3D-udi
@@ -1043,7 +1081,7 @@
 	sh64)
 		basic_machine=3Dsh64-unknown
 		;;
-	sparc | sparcv9 | sparcv9b)
+	sparc | sparcv8 | sparcv9 | sparcv9b)
 		basic_machine=3Dsparc-sun
 		;;
 	cydra)
@@ -1116,19 +1154,20 @@
 	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
-	      | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi*=
 \
+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpe=
ix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix*)
+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@@ -1152,6 +1191,9 @@
 	-mac*)
 		os=3D`echo $os | sed -e 's|mac|macos|'`
 		;;
+	-linux-dietlibc)
+		os=3D-linux-dietlibc
+		;;
 	-linux*)
 		os=3D`echo $os | sed -e 's|linux|linux-gnu|'`
 		;;
@@ -1164,6 +1206,9 @@
 	-opened*)
 		os=3D-openedition
 		;;
+        -os400*)
+		os=3D-os400
+		;;
 	-wince*)
 		os=3D-wince
 		;;
@@ -1185,6 +1230,9 @@
 	-atheos*)
 		os=3D-atheos
 		;;
+	-syllable*)
+		os=3D-syllable
+		;;
 	-386bsd)
 		os=3D-bsd
 		;;
@@ -1207,6 +1255,9 @@
 	-sinix*)
 		os=3D-sysv4
 		;;
+        -tpf*)
+		os=3D-tpf
+		;;
 	-triton*)
 		os=3D-sysv3
 		;;
@@ -1274,6 +1325,9 @@
 	arm*-semi)
 		os=3D-aout
 		;;
+    c4x-* | tic4x-*)
+        os=3D-coff
+        ;;
 	# This must come before the *-dec entry.
 	pdp10-*)
 		os=3D-tops20
@@ -1452,9 +1506,15 @@
 			-mvs* | -opened*)
 				vendor=3Dibm
 				;;
+			-os400*)
+				vendor=3Dibm
+				;;
 			-ptx*)
 				vendor=3Dsequent
 				;;
+			-tpf*)
+				vendor=3Dibm
+				;;
 			-vxsim* | -vxworks* | -windiss*)
 				vendor=3Dwrs
 				;;
diff -ur atk-1.6.1.old/configure atk-1.6.1/configure
--- atk-1.6.1.old/configure	2004-04-19 16:18:38.000000000 +0200
+++ atk-1.6.1/configure	2004-07-21 16:10:12.000000000 +0200
@@ -1,11 +1,10 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for atk 1.6.1.
+# Generated by GNU Autoconf 2.59 for atk 1.6.1.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=3Datk>.
 #
-# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-# Free Software Foundation, Inc.
+# Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 ## --------------------- ##
@@ -22,9 +21,10 @@
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
+DUALCASE=3D1; export DUALCASE # for MKS sh
=20
 # Support unset when possible.
-if (FOO=3DFOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=3D60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=3Dunset
 else
   as_unset=3Dfalse
@@ -43,7 +43,7 @@
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -n "`(eval $as_var=3DC; export $as_var) 2>&1`"); then
+  if (set +x; test -z "`(eval $as_var=3DC; export $as_var) 2>&1`"); then
     eval $as_var=3DC; export $as_var
   else
     $as_unset $as_var
@@ -220,16 +220,17 @@
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=3D:
 else
+  test -d ./-p && rmdir ./-p
   as_mkdir_p=3Dfalse
 fi
=20
 as_executable_p=3D"test -f"
=20
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp=3D"sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp=3D"eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnu=
m]%_%g'"
=20
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh=3D"sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh=3D"eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
=20
=20
 # IFS
@@ -392,9 +393,9 @@
=20
=20
=20
-tagnames=3D`echo "$tagnames,CXX" | sed 's/^,//'`
+tagnames=3D${tagnames+${tagnames},}CXX
=20
-tagnames=3D`echo "$tagnames,F77" | sed 's/^,//'`
+tagnames=3D${tagnames+${tagnames},}F77
=20
 # Name of the host.
 # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -464,7 +465,7 @@
 # include <unistd.h>
 #endif"
=20
-ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE=
_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transf=
orm_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir locals=
tatedir libdir includedir oldincludedir infodir mandir build_alias host_ali=
as target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRI=
PT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEA=
DER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK S=
ET_MAKE GLIB_REQUIRED_VERSION ATK_MAJOR_VERSION ATK_MINOR_VERSION ATK_VERSI=
ON ATK_API_VERSION ATK_MICRO_VERSION ATK_INTERFACE_AGE ATK_BINARY_AGE LT_VE=
RSION_INFO LT_CURRENT_MINUS_AGE GETTEXT_PACKAGE CC CFLAGS LDFLAGS CPPFLAGS =
ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE =
AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build=
_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECH=
O AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP=
 ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am=
__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PLATFORM_WIN32_TRUE =
PLATFORM_WIN32_FALSE OS_WIN32_TRUE OS_WIN32_FALSE ms_librarian MS_LIB_AVAIL=
ABLE_TRUE MS_LIB_AVAILABLE_FALSE GLIB_PACKAGES PKG_CONFIG GLIB_CFLAGS GLIB_=
LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS DEP_CFLAGS DEP_LIBS USE_NLS=
 MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT=
 INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIR=
S HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRU=
E GTK_DOC_USE_LIBTOOL_FALSE PERL REBUILD LIBOBJS LTLIBOBJS'
+ac_subst_vars=3D'SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE=
_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transf=
orm_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir locals=
tatedir libdir includedir oldincludedir infodir mandir build_alias host_ali=
as target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRI=
PT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEA=
DER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK S=
ET_MAKE am__leading_dot GLIB_REQUIRED_VERSION ATK_MAJOR_VERSION ATK_MINOR_V=
ERSION ATK_VERSION ATK_API_VERSION ATK_MICRO_VERSION ATK_INTERFACE_AGE ATK_=
BINARY_AGE LT_VERSION_INFO LT_CURRENT_MINUS_AGE GETTEXT_PACKAGE CC CFLAGS L=
DFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_T=
RUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_F=
ALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_o=
s EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS =
ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fa=
stdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PLAT=
FORM_WIN32_TRUE PLATFORM_WIN32_FALSE OS_WIN32_TRUE OS_WIN32_FALSE ms_librar=
ian MS_LIB_AVAILABLE_TRUE MS_LIB_AVAILABLE_FALSE GLIB_PACKAGES PKG_CONFIG G=
LIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS DEP_CFLAGS =
DEP_LIBS USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMO=
FILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES PO=
SUB MKINSTALLDIRS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC=
_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE PERL REBUILD LIBOBJS LTLIBOBJS'
 ac_subst_files=3D''
=20
 # Initialize some variables set by options.
@@ -823,7 +824,7 @@
=20
 # Be sure to have absolute paths.
 for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-              localstatedir libdir includedir oldincludedir infodir mandir
+	      localstatedir libdir includedir oldincludedir infodir mandir
 do
   eval ac_val=3D$`echo $ac_var`
   case $ac_val in
@@ -863,10 +864,10 @@
   # Try the directory containing this script, then its parent.
   ac_confdir=3D`(dirname "$0") 2>/dev/null ||
 $as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$0" : 'X\(//\)[^/]' \| \
-         X"$0" : 'X\(//\)$' \| \
-         X"$0" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$0" : 'X\(//\)[^/]' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$0" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -978,9 +979,9 @@
   cat <<_ACEOF
 Installation directories:
   --prefix=3DPREFIX         install architecture-independent files in PREF=
IX
-                          [$ac_default_prefix]
+			  [$ac_default_prefix]
   --exec-prefix=3DEPREFIX   install architecture-dependent files in EPREFIX
-                          [PREFIX]
+			  [PREFIX]
=20
 By default, \`make install' will install all the files in
 \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
@@ -1100,12 +1101,45 @@
     ac_srcdir=3D$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=3D$ac_top_builddir$srcdir ;;
 esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can =
be
-# absolute.
-ac_abs_builddir=3D`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=3D`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=3D`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=3D`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir=3D"$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=3D`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir=3D"$ac_dir";;
+  *) ac_abs_builddir=3D`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=3D$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=3D$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=3D$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=3D$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=3D$ac_srcdir;;
+  *) ac_abs_srcdir=3D$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=3D$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=3D$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
=20
     cd $ac_dir
     # Check for guested configure; otherwise get Cygnus style configure.
@@ -1116,13 +1150,13 @@
       echo
       $SHELL $ac_srcdir/configure  --help=3Drecursive
     elif test -f $ac_srcdir/configure.ac ||
-           test -f $ac_srcdir/configure.in; then
+	   test -f $ac_srcdir/configure.in; then
       echo
       $ac_configure --help
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >=
&2
     fi
-    cd $ac_popdir
+    cd "$ac_popdir"
   done
 fi
=20
@@ -1130,10 +1164,9 @@
 if $ac_init_version; then
   cat <<\_ACEOF
 atk configure 1.6.1
-generated by GNU Autoconf 2.57
+generated by GNU Autoconf 2.59
=20
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1145,7 +1178,7 @@
 running configure, to aid debugging if configure makes a mistake.
=20
 It was created by atk $as_me 1.6.1, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was
=20
   $ $0 $@
=20
@@ -1222,19 +1255,19 @@
     2)
       ac_configure_args1=3D"$ac_configure_args1 '$ac_arg'"
       if test $ac_must_keep_next =3D true; then
-        ac_must_keep_next=3Dfalse # Got value, back to normal.
+	ac_must_keep_next=3Dfalse # Got value, back to normal.
       else
-        case $ac_arg in
-          *=3D* | --config-cache | -C | -disable-* | --disable-* \
-          | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-          | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-          | -with-* | --with-* | -without-* | --without-* | --x)
-            case "$ac_configure_args0 " in
-              "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-            esac
-            ;;
-          -* ) ac_must_keep_next=3Dtrue ;;
-        esac
+	case $ac_arg in
+	  *=3D* | --config-cache | -C | -disable-* | --disable-* \
+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
+	  | -with-* | --with-* | -without-* | --without-* | --x)
+	    case "$ac_configure_args0 " in
+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
+	    esac
+	    ;;
+	  -* ) ac_must_keep_next=3Dtrue ;;
+	esac
       fi
       ac_configure_args=3D"$ac_configure_args$ac_sep'$ac_arg'"
       # Get rid of the leading space.
@@ -1268,12 +1301,12 @@
     case `(ac_space=3D'"'"' '"'"'; set | grep ac_space) 2>&1` in
     *ac_space=3D\ *)
       sed -n \
-        "s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D'"'"=
'\\2'"'"'/p"
+	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D'"'"'\\2=
'"'"'/p"
       ;;
     *)
       sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D\\=
2/p"
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D\\2/p"
       ;;
     esac;
 }
@@ -1302,7 +1335,7 @@
       for ac_var in $ac_subst_files
       do
 	eval ac_val=3D$`echo $ac_var`
-        echo "$ac_var=3D'"'"'$ac_val'"'"'"
+	echo "$ac_var=3D'"'"'$ac_val'"'"'"
       done | sort
       echo
     fi
@@ -1321,7 +1354,7 @@
       echo "$as_me: caught signal $ac_signal"
     echo "$as_me: exit $exit_status"
   } >&5
-  rm -f core core.* *.core &&
+  rm -f core *.core &&
   rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
     exit $exit_status
      ' 0
@@ -1401,7 +1434,7 @@
 # value.
 ac_cache_corrupted=3Dfalse
 for ac_var in `(set) 2>&1 |
-               sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=3D.*/\1/p'`; do
+	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=3D.*/\1/p'`; do
   eval ac_old_set=3D\$ac_cv_env_${ac_var}_set
   eval ac_new_set=3D\$ac_env_${ac_var}_set
   eval ac_old_val=3D"\$ac_cv_env_${ac_var}_value"
@@ -1418,13 +1451,13 @@
     ,);;
     *)
       if test "x$ac_old_val" !=3D "x$ac_new_val"; then
-        { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the pr=
evious run:" >&5
+	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous =
run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
+	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
+	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
-        ac_cache_corrupted=3D:
+	ac_cache_corrupted=3D:
       fi;;
   esac
   # Pass precious variables to config.status.
@@ -1522,6 +1555,7 @@
 # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
+# OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
@@ -1538,6 +1572,7 @@
 case $as_dir/ in
   ./ | .// | /cC/* | \
   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
   /usr/ucb/* ) ;;
   *)
     # OSF1 and SCO ODT 3.0 have their own names for install.
@@ -1545,20 +1580,20 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-        if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-          if test $ac_prog =3D install &&
-            grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; th=
en
-            # AIX install.  It has an incompatible calling convention.
-            :
-          elif test $ac_prog =3D install &&
-            grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; th=
en
-            # program-specific install script used by HP pwplus--don't use.
-            :
-          else
-            ac_cv_path_install=3D"$as_dir/$ac_prog$ac_exec_ext -c"
-            break 3
-          fi
-        fi
+	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	  if test $ac_prog =3D install &&
+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # AIX install.  It has an incompatible calling convention.
+	    :
+	  elif test $ac_prog =3D install &&
+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	    # program-specific install script used by HP pwplus--don't use.
+	    :
+	  else
+	    ac_cv_path_install=3D"$as_dir/$ac_prog$ac_exec_ext -c"
+	    break 3
+	  fi
+	fi
       done
     done
     ;;
@@ -1702,7 +1737,7 @@
=20
 echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=3D`echo "$2" | sed 'y,./+-,__p_,'`
+set dummy ${MAKE-make}; ac_make=3D`echo "$2" | sed 'y,:./+-,___p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" =3D set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
@@ -1729,6 +1764,15 @@
   SET_MAKE=3D"MAKE=3D${MAKE-make}"
 fi
=20
+rm -rf .tst 2>/dev/null
+mkdir .tst 2>/dev/null
+if test -d .tst; then
+  am__leading_dot=3D.
+else
+  am__leading_dot=3D_
+fi
+rmdir .tst 2>/dev/null
+
  # test to see if srcdir already configured
 if test "`cd $srcdir && pwd`" !=3D "`pwd`" &&
    test -f $srcdir/config.status; then
@@ -1748,8 +1792,8 @@
=20
=20
 # Define the identity of the package.
- PACKAGE=3Datk
- VERSION=3D1.6.1
+ PACKAGE=3D'atk'
+ VERSION=3D'1.6.1'
=20
=20
 cat >>confdefs.h <<_ACEOF
@@ -2247,7 +2291,6 @@
   (exit $ac_status); }
=20
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2267,8 +2310,8 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output" >&5
-echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C"=
 >&6
 ac_link_default=3D`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
 if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
@@ -2288,23 +2331,23 @@
   test -f "$ac_file" || continue
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
o | *.obj )
-        ;;
+	;;
     conftest.$ac_ext )
-        # This is the source file.
-        ;;
+	# This is the source file.
+	;;
     [ab].out )
-        # We found the default executable, but exeext=3D'' is most
-        # certainly right.
-        break;;
+	# We found the default executable, but exeext=3D'' is most
+	# certainly right.
+	break;;
     *.* )
-        ac_cv_exeext=3D`expr "$ac_file" : '[^.]*\(\..*\)'`
-        # FIXME: I believe we export ac_cv_exeext for Libtool,
-        # but it would be cool to find out if it's true.  Does anybody
-        # maintain Libtool? --akim.
-        export ac_cv_exeext
-        break;;
+	ac_cv_exeext=3D`expr "$ac_file" : '[^.]*\(\..*\)'`
+	# FIXME: I believe we export ac_cv_exeext for Libtool,
+	# but it would be cool to find out if it's true.  Does anybody
+	# maintain Libtool? --akim.
+	export ac_cv_exeext
+	break;;
     * )
-        break;;
+	break;;
   esac
 done
 else
@@ -2378,8 +2421,8 @@
   case $ac_file in
     *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.=
o | *.obj ) ;;
     *.* ) ac_cv_exeext=3D`expr "$ac_file" : '[^.]*\(\..*\)'`
-          export ac_cv_exeext
-          break;;
+	  export ac_cv_exeext
+	  break;;
     * ) break;;
   esac
 done
@@ -2404,7 +2447,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2455,7 +2497,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2475,11 +2516,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -2492,7 +2542,7 @@
=20
 ac_compiler_gnu=3Dno
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=3D$ac_compiler_gnu
=20
 fi
@@ -2508,7 +2558,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2525,11 +2574,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -2542,7 +2600,7 @@
=20
 ac_cv_prog_cc_g=3Dno
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
@@ -2569,7 +2627,6 @@
   ac_cv_prog_cc_stdc=3Dno
 ac_save_CC=3D$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2597,6 +2654,16 @@
   va_end (v);
   return s;
 }
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
+   function prototypes and stuff, but not '\xHH' hex character constants.
+   These don't provoke an error unfortunately, instead are silently treated
+   as 'x'.  The following induces an error, until -std1 is added to get
+   proper ANSI mode.  Curiously '\x00'!=3D'x' always comes out true, for an
+   array size at least.  It's necessary to write '\x00'=3D=3D0 to get some=
thing
+   that's true only with -std1.  */
+int osf4_cc_array ['\x00' =3D=3D 0 ? 1 : -1];
+
 int test (int i, double x);
 struct s1 {int (*f) (int a);};
 struct s2 {int (*f) (double a);};
@@ -2623,11 +2690,20 @@
   CC=3D"$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -2640,7 +2716,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext
+rm -f conftest.err conftest.$ac_objext
 done
 rm -f conftest.$ac_ext conftest.$ac_objext
 CC=3D$ac_save_CC
@@ -2668,19 +2744,27 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
-   ''\
-   '#include <stdlib.h>' \
+   '' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -2688,14 +2772,13 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
 $ac_declaration
+#include <stdlib.h>
 int
 main ()
 {
@@ -2706,11 +2789,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -2723,9 +2815,8 @@
=20
 continue
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -2742,11 +2833,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -2758,7 +2858,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest*
 if test -n "$ac_declaration"; then
@@ -2772,30 +2872,22 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_ext=3Dc
 ac_cpp=3D'$CPP $CPPFLAGS'
 ac_compile=3D'$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link=3D'$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$=
ac_ext $LIBS >&5'
 ac_compiler_gnu=3D$ac_cv_c_compiler_gnu
-rm -f .deps 2>/dev/null
-mkdir .deps 2>/dev/null
-if test -d .deps; then
-  DEPDIR=3D.deps
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  DEPDIR=3D_deps
-fi
-rmdir .deps 2>/dev/null
-
+DEPDIR=3D"${am__leading_dot}deps"
=20
           ac_config_commands=3D"$ac_config_commands depfiles"
=20
=20
 am_make=3D${MAKE-make}
 cat > confinc << 'END'
-doit:
+am__doit:
 	@echo done
+.PHONY: am__doit
 END
 # If we don't find an include directive, just comment out the code.
 echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
@@ -2870,18 +2962,32 @@
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
=20
   am_cv_CC_dependencies_compiler_type=3Dnone
   if test "$am_compiler_list" =3D ""; then
      am_compiler_list=3D`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
=20
     case $depmode in
     nosideeffect)
@@ -2899,13 +3005,20 @@
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=3D$depmode \
-       source=3Dconftest.c object=3Dconftest.o \
-       depfile=3Dconftest.Po tmpdepfile=3Dconftest.TPo \
-       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1=
 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       source=3Dsub/conftest.c object=3Dsub/conftest.${OBJEXT-o} \
+       depfile=3Dsub/conftest.Po tmpdepfile=3Dsub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest=
=2Ec \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      am_cv_CC_dependencies_compiler_type=3D$depmode
-      break
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+        am_cv_CC_dependencies_compiler_type=3D$depmode
+        break
+      fi
     fi
   done
=20
@@ -3158,7 +3271,7 @@
     # Accept absolute paths.
     [\\/]* | ?:[\\/]*)
       re_direlt=3D'/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
+      # Canonicalize the pathname of ld
       ac_prog=3D`echo $ac_prog| $SED 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=3D`echo $ac_prog| $SED "s%$re_direlt%/%"`
@@ -3227,7 +3340,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accep=
t -v.
-case `"$LD" -v 2>&1 </dev/null` in
+case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=3Dyes
   ;;
@@ -3348,28 +3461,24 @@
   lt_cv_file_magic_test_file=3D/shlib/libc.so
   ;;
=20
-cygwin* | mingw* | pw32*)
+cygwin*)
   # win32_libid is a shell function defined in ltmain.sh
   lt_cv_deplibs_check_method=3D'file_magic ^x86 archive import|^x86 DLL'
   lt_cv_file_magic_cmd=3D'win32_libid'
   ;;
=20
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # win32_libid shell function, so use a weaker test based on 'objdump'.
+  lt_cv_deplibs_check_method=3D'file_magic file format pei*-i386(.*archite=
cture: i386)?'
+  lt_cv_file_magic_cmd=3D'$OBJDUMP -f'
+  ;;
+
 darwin* | rhapsody*)
-  # this will be overwritten by pass_all, but leave it in just in case
-  lt_cv_deplibs_check_method=3D'file_magic Mach-O dynamically linked share=
d library'
-  lt_cv_file_magic_cmd=3D'/usr/bin/file -L'
-  case "$host_os" in
-  rhapsody* | darwin1.[012])
-    lt_cv_file_magic_test_file=3D`/System/Library/Frameworks/System.framew=
ork/System`
-    ;;
-  *) # Darwin 1.3 on
-    lt_cv_file_magic_test_file=3D'/usr/lib/libSystem.dylib'
-    ;;
-  esac
   lt_cv_deplibs_check_method=3Dpass_all
   ;;
=20
-freebsd*)
+freebsd* | kfreebsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     case $host_cpu in
     i*86 )
@@ -3408,39 +3517,21 @@
   ;;
=20
 irix5* | irix6* | nonstopux*)
-  case $host_os in
-  irix5* | nonstopux*)
-    # this will be overridden with pass_all, but let us keep it just in ca=
se
-    lt_cv_deplibs_check_method=3D"file_magic ELF 32-bit MSB dynamic lib MI=
PS - version 1"
-    ;;
-  *)
-    case $LD in
-    *-32|*"-32 ") libmagic=3D32-bit;;
-    *-n32|*"-n32 ") libmagic=3DN32;;
-    *-64|*"-64 ") libmagic=3D64-bit;;
-    *) libmagic=3Dnever-match;;
-    esac
-    # this will be overridden with pass_all, but let us keep it just in ca=
se
-    lt_cv_deplibs_check_method=3D"file_magic ELF ${libmagic} MSB mips-[123=
4] dynamic lib MIPS - version 1"
-    ;;
+  case $LD in
+  *-32|*"-32 ") libmagic=3D32-bit;;
+  *-n32|*"-n32 ") libmagic=3DN32;;
+  *-64|*"-64 ") libmagic=3D64-bit;;
+  *) libmagic=3Dnever-match;;
   esac
-  lt_cv_file_magic_test_file=3D`echo /lib${libsuff}/libc.so*`
   lt_cv_deplibs_check_method=3Dpass_all
   ;;
=20
 # This must be Linux ELF.
 linux*)
-  case $host_cpu in
-  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc*=
 | s390* | sh*)
-    lt_cv_deplibs_check_method=3Dpass_all ;;
-  *)
-    # glibc up to 2.1.1 does not perform some relocations on ARM
-    lt_cv_deplibs_check_method=3D'file_magic ELF [0-9][0-9]*-bit [LM]SB (s=
hared object|dynamic lib )' ;;
-  esac
-  lt_cv_file_magic_test_file=3D`echo /lib/libc.so* /lib/libc-*.so`
+  lt_cv_deplibs_check_method=3Dpass_all
   ;;
=20
-netbsd*)
+netbsd* | knetbsd*-gnu)
   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
     lt_cv_deplibs_check_method=3D'match_pattern /lib[^/]+(\.so\.[0-9]+\.[0=
-9]+|_pic\.a)$'
   else
@@ -3454,7 +3545,7 @@
   lt_cv_file_magic_test_file=3D/usr/lib/libnls.so
   ;;
=20
-nto-qnx)
+nto-qnx*)
   lt_cv_deplibs_check_method=3Dunknown
   ;;
=20
@@ -3469,9 +3560,6 @@
   ;;
=20
 osf3* | osf4* | osf5*)
-  # this will be overridden with pass_all, but let us keep it just in case
-  lt_cv_deplibs_check_method=3D'file_magic COFF format alpha shared librar=
y'
-  lt_cv_file_magic_test_file=3D/shlib/libc.so
   lt_cv_deplibs_check_method=3Dpass_all
   ;;
=20
@@ -3481,7 +3569,6 @@
=20
 solaris*)
   lt_cv_deplibs_check_method=3Dpass_all
-  lt_cv_file_magic_test_file=3D/lib/libc.so
   ;;
=20
 sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
@@ -3561,7 +3648,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3564 "configure"' > conftest.$ac_ext
+  echo '#line 3651 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=3D$?
@@ -3610,7 +3697,7 @@
         x86_64-*linux*)
           LD=3D"${LD-ld} -m elf_i386"
           ;;
-        ppc64-*linux*)
+        ppc64-*linux*|powerpc64-*linux*)
           LD=3D"${LD-ld} -m elf32ppclinux"
           ;;
         s390x-*linux*)
@@ -3658,7 +3745,6 @@
 ac_compiler_gnu=3D$ac_cv_c_compiler_gnu
=20
      cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3675,11 +3761,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -3692,7 +3787,8 @@
=20
 lt_cv_cc_needs_belf=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
      ac_ext=3Dc
 ac_cpp=3D'$CPP $CPPFLAGS'
 ac_compile=3D'$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3983,7 +4079,6 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -3994,7 +4089,7 @@
 #else
 # include <assert.h>
 #endif
-                     Syntax error
+		     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -4006,6 +4101,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=3D$ac_c_preproc_warn_flag
+    ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=3D
   fi
@@ -4026,7 +4122,6 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4044,6 +4139,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=3D$ac_c_preproc_warn_flag
+    ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=3D
   fi
@@ -4090,7 +4186,6 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4101,7 +4196,7 @@
 #else
 # include <assert.h>
 #endif
-                     Syntax error
+		     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -4113,6 +4208,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=3D$ac_c_preproc_warn_flag
+    ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=3D
   fi
@@ -4133,7 +4229,6 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4151,6 +4246,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=3D$ac_c_preproc_warn_flag
+    ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=3D
   fi
@@ -4196,7 +4292,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4217,11 +4312,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -4234,12 +4338,11 @@
=20
 ac_cv_header_stdc=3Dno
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
=20
 if test $ac_cv_header_stdc =3D yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4261,7 +4364,6 @@
 if test $ac_cv_header_stdc =3D yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4286,7 +4388,6 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4298,9 +4399,9 @@
 # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
 #else
 # define ISLOWER(c) \
-                   (('a' <=3D (c) && (c) <=3D 'i') \
-                     || ('j' <=3D (c) && (c) <=3D 'r') \
-                     || ('s' <=3D (c) && (c) <=3D 'z'))
+		   (('a' <=3D (c) && (c) <=3D 'i') \
+		     || ('j' <=3D (c) && (c) <=3D 'r') \
+		     || ('s' <=3D (c) && (c) <=3D 'z'))
 # define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 #endif
=20
@@ -4311,7 +4412,7 @@
   int i;
   for (i =3D 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
-        || toupper (i) !=3D TOUPPER (i))
+	|| toupper (i) !=3D TOUPPER (i))
       exit(2);
   exit (0);
 }
@@ -4336,7 +4437,7 @@
 ( exit $ac_status )
 ac_cv_header_stdc=3Dno
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_o=
bjext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext c=
onftest.$ac_ext
 fi
 fi
 fi
@@ -4361,7 +4462,7 @@
=20
=20
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings=
=2Eh \
-                  inttypes.h stdint.h unistd.h
+		  inttypes.h stdint.h unistd.h
 do
 as_ac_Header=3D`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 echo "$as_me:$LINENO: checking for $ac_header" >&5
@@ -4370,7 +4471,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4382,11 +4482,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -4399,7 +4508,7 @@
=20
 eval "$as_ac_Header=3Dno"
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -4430,7 +4539,6 @@
 echo "$as_me:$LINENO: checking $ac_header usability" >&5
 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4441,11 +4549,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -4458,7 +4575,7 @@
=20
 ac_header_compiler=3Dno
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6
=20
@@ -4466,7 +4583,6 @@
 echo "$as_me:$LINENO: checking $ac_header presence" >&5
 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4484,6 +4600,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=3D$ac_c_preproc_warn_flag
+    ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=3D
   fi
@@ -4503,33 +4620,32 @@
 echo "${ECHO_T}$ac_header_preproc" >&6
=20
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler,=
 rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by t=
he preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the prepr=
ocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's resu=
lt" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compi=
ler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" =
>&2;}
+    ac_header_preproc=3Dyes
     ;;
-  no:yes )
+  no:yes:* )
     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be com=
piled" >&5
 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequ=
isite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?=
" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing pre=
requisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite head=
ers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf document=
ation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But=
 Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Com=
piled\"" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the prepr=
ocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's resu=
lt" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compil=
er will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take p=
recedence" >&2;}
     (
       cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ------------------------------------------------------------------ ##
+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=3Datk ##
+## ------------------------------------------------------------------ ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -4540,7 +4656,7 @@
 if eval "test \"\${$as_ac_Header+set}\" =3D set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  eval "$as_ac_Header=3D$ac_header_preproc"
+  eval "$as_ac_Header=3D\$ac_header_preproc"
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -4674,7 +4790,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4694,11 +4809,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -4711,7 +4835,7 @@
=20
 ac_compiler_gnu=3Dno
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=3D$ac_compiler_gnu
=20
 fi
@@ -4727,7 +4851,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4744,11 +4867,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -4761,7 +4893,7 @@
=20
 ac_cv_prog_cxx_g=3Dno
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
@@ -4781,8 +4913,7 @@
   fi
 fi
 for ac_declaration in \
-   ''\
-   '#include <stdlib.h>' \
+   '' \
    'extern "C" void std::exit (int) throw (); using std::exit;' \
    'extern "C" void std::exit (int); using std::exit;' \
    'extern "C" void exit (int) throw ();' \
@@ -4790,14 +4921,13 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <stdlib.h>
 $ac_declaration
+#include <stdlib.h>
 int
 main ()
 {
@@ -4808,11 +4938,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -4825,9 +4964,8 @@
=20
 continue
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4844,11 +4982,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -4860,7 +5007,7 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 done
 rm -f conftest*
 if test -n "$ac_declaration"; then
@@ -4893,18 +5040,32 @@
   # using a relative directory.
   cp "$am_depcomp" conftest.dir
   cd conftest.dir
+  # We will build objects and dependencies in a subdirectory because
+  # it helps to detect inapplicable dependency modes.  For instance
+  # both Tru64's cc and ICC support -MD to output dependencies as a
+  # side effect of compilation, but ICC will put the dependencies in
+  # the current directory while Tru64 will put them in the object
+  # directory.
+  mkdir sub
=20
   am_cv_CXX_dependencies_compiler_type=3Dnone
   if test "$am_compiler_list" =3D ""; then
      am_compiler_list=3D`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
   fi
   for depmode in $am_compiler_list; do
+    # Setup a source with many dependencies, because some compilers
+    # like to wrap large dependency lists on column 80 (with \), and
+    # we should not choose a depcomp mode which is confused by this.
+    #
     # We need to recreate these files for each test, as the compiler may
     # overwrite some of them when testing with obscure command lines.
     # This happens at least with the AIX C compiler.
-    echo '#include "conftest.h"' > conftest.c
-    echo 'int i;' > conftest.h
-    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+    : > sub/conftest.c
+    for i in 1 2 3 4 5 6; do
+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
+      : > sub/conftst$i.h
+    done
+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
=20
     case $depmode in
     nosideeffect)
@@ -4922,13 +5083,20 @@
     # mode.  It turns out that the SunPro C++ compiler does not properly
     # handle `-M -o', and we need to detect this.
     if depmode=3D$depmode \
-       source=3Dconftest.c object=3Dconftest.o \
-       depfile=3Dconftest.Po tmpdepfile=3Dconftest.TPo \
-       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1=
 &&
-       grep conftest.h conftest.Po > /dev/null 2>&1 &&
+       source=3Dsub/conftest.c object=3Dsub/conftest.${OBJEXT-o} \
+       depfile=3Dsub/conftest.Po tmpdepfile=3Dsub/conftest.TPo \
+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest=
=2Ec \
+         >/dev/null 2>conftest.err &&
+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      am_cv_CXX_dependencies_compiler_type=3D$depmode
-      break
+      # icc doesn't choke on unknown options, it will just issue warnings
+      # (even with -Werror).  So we grep stderr for any message
+      # that says an option was ignored.
+      if grep 'ignoring option' conftest.err >/dev/null 2>&1; then :; else
+        am_cv_CXX_dependencies_compiler_type=3D$depmode
+        break
+      fi
     fi
   done
=20
@@ -4980,7 +5148,6 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -4991,7 +5158,7 @@
 #else
 # include <assert.h>
 #endif
-                     Syntax error
+		     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -5003,6 +5170,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=3D$ac_cxx_preproc_warn_flag
+    ac_cpp_err=3D$ac_cpp_err$ac_cxx_werror_flag
   else
     ac_cpp_err=3D
   fi
@@ -5023,7 +5191,6 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5041,6 +5208,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=3D$ac_cxx_preproc_warn_flag
+    ac_cpp_err=3D$ac_cpp_err$ac_cxx_werror_flag
   else
     ac_cpp_err=3D
   fi
@@ -5087,7 +5255,6 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5098,7 +5265,7 @@
 #else
 # include <assert.h>
 #endif
-                     Syntax error
+		     Syntax error
 _ACEOF
 if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
@@ -5110,6 +5277,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=3D$ac_cxx_preproc_warn_flag
+    ac_cpp_err=3D$ac_cpp_err$ac_cxx_werror_flag
   else
     ac_cpp_err=3D
   fi
@@ -5130,7 +5298,6 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -5148,6 +5315,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=3D$ac_cxx_preproc_warn_flag
+    ac_cpp_err=3D$ac_cpp_err$ac_cxx_werror_flag
   else
     ac_cpp_err=3D
   fi
@@ -5192,7 +5360,7 @@
 ac_link=3D'$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $L=
IBS >&5'
 ac_compiler_gnu=3D$ac_cv_f77_compiler_gnu
 if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 ep=
cf90 f95 fort xlf95 lf95 g95
+  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 ep=
cf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a =
program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=3D$2
@@ -5234,7 +5402,7 @@
 fi
 if test -z "$F77"; then
   ac_ct_F77=3D$F77
-  for ac_prog in g77 f77 xlf frt pgf77 fl32 af77 fort77 f90 xlf90 pgf90 ep=
cf90 f95 fort xlf95 lf95 g95
+  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 ep=
cf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
 do
   # Extract the first word of "$ac_prog", so it can be a program name with=
 args.
 set dummy $ac_prog; ac_word=3D$2
@@ -5279,7 +5447,7 @@
=20
=20
 # Provide some information about the compiler.
-echo "$as_me:5282:" \
+echo "$as_me:5450:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=3D`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") =
>&5
@@ -5297,9 +5465,10 @@
   ac_status=3D$?
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); }
+rm -f a.out
=20
 # If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.
+# input file.  (Note that this only needs to work for GNU compilers.)
 ac_save_ext=3D$ac_ext
 ac_ext=3DF
 echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 com=
piler" >&5
@@ -5317,11 +5486,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -5334,14 +5512,13 @@
=20
 ac_compiler_gnu=3Dno
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 ac_cv_f77_compiler_gnu=3D$ac_compiler_gnu
=20
 fi
 echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
 ac_ext=3D$ac_save_ext
-G77=3D`test $ac_compiler_gnu =3D yes && echo yes`
 ac_test_FFLAGS=3D${FFLAGS+set}
 ac_save_FFLAGS=3D$FFLAGS
 FFLAGS=3D
@@ -5358,11 +5535,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -5375,7 +5561,7 @@
=20
 ac_cv_prog_f77_g=3Dno
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
=20
 fi
 echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
@@ -5383,18 +5569,20 @@
 if test "$ac_test_FFLAGS" =3D set; then
   FFLAGS=3D$ac_save_FFLAGS
 elif test $ac_cv_prog_f77_g =3D yes; then
-  if test "$G77" =3D yes; then
+  if test "x$ac_cv_f77_compiler_gnu" =3D xyes; then
     FFLAGS=3D"-g -O2"
   else
     FFLAGS=3D"-g"
   fi
 else
-  if test "$G77" =3D yes; then
+  if test "x$ac_cv_f77_compiler_gnu" =3D xyes; then
     FFLAGS=3D"-O2"
   else
     FFLAGS=3D
   fi
 fi
+
+G77=3D`test $ac_compiler_gnu =3D yes && echo yes`
 ac_ext=3Dc
 ac_cpp=3D'$CPP $CPPFLAGS'
 ac_compile=3D'$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5441,6 +5629,12 @@
     lt_cv_sys_max_cmd_len=3D8192;
     ;;
=20
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=3D8192;
+    ;;
+
  *)
     # 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
@@ -5522,7 +5716,7 @@
   symcode=3D'[BCDEGQRST]'
   ;;
 solaris* | sysv5*)
-  symcode=3D'[BDT]'
+  symcode=3D'[BDRT]'
   ;;
 sysv4)
   symcode=3D'[DFNSTU]'
@@ -5540,7 +5734,7 @@
 # If we're using GNU nm, then use its standard symbol codes.
 case `$NM -V 2>&1` in
 *GNU* | *'with BFD'*)
-  symcode=3D'[ABCDGISTW]' ;;
+  symcode=3D'[ABCDGIRSTW]' ;;
 esac
=20
 # Try without a prefix undercore, then with it.
@@ -6266,7 +6460,8 @@
 if test "$GCC" =3D yes; then
   lt_prog_compiler_no_builtin_flag=3D' -fno-builtin'
=20
-  echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exce=
ptions" >&5
+
+echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-except=
ions" >&5
 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... =
$ECHO_C" >&6
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" =3D set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6284,11 +6479,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6287: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6482: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=3D$?
    cat conftest.err >&5
-   echo "$as_me:6291: \$? =3D $ac_status" >&5
+   echo "$as_me:6486: \$? =3D $ac_status" >&5
    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
@@ -6431,12 +6626,12 @@
=20
     linux*)
       case $CC in
-      icc|ecc)
+      icc* | ecc*)
 	lt_prog_compiler_wl=3D'-Wl,'
 	lt_prog_compiler_pic=3D'-KPIC'
 	lt_prog_compiler_static=3D'-static'
         ;;
-      ccc)
+      ccc*)
         lt_prog_compiler_wl=3D'-Wl,'
         # All Alpha code is PIC.
         lt_prog_compiler_static=3D'-non_shared'
@@ -6498,7 +6693,8 @@
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic"; then
-  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_p=
ic works" >&5
+
+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic=
 works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works..=
=2E $ECHO_C" >&6
 if test "${lt_prog_compiler_pic_works+set}" =3D set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6516,11 +6712,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6519: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6715: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=3D$?
    cat conftest.err >&5
-   echo "$as_me:6523: \$? =3D $ac_status" >&5
+   echo "$as_me:6719: \$? =3D $ac_status" >&5
    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
@@ -6567,13 +6763,6 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
=20
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compil=
ers
-   # that will create temporary files in the current directory regardless =
of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do para=
llel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag=3D"-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -6583,11 +6772,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6586: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6775: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=3D$?
    cat out/conftest.err >&5
-   echo "$as_me:6590: \$? =3D $ac_status" >&5
+   echo "$as_me:6779: \$? =3D $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -6597,8 +6786,11 @@
      fi
    fi
    chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -6757,7 +6949,7 @@
       fi
       ;;
=20
-    netbsd*)
+    netbsd* | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds=3D'$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=3D
@@ -6795,6 +6987,31 @@
       hardcode_shlibpath_var=3Dno
       ;;
=20
+  linux*)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; t=
hen
+        tmp_archive_cmds=3D'$CC -shared $libobjs $deplibs $compiler_flags =
${wl}-soname $wl$soname -o $lib'
+	archive_cmds=3D"$tmp_archive_cmds"
+      supports_anon_versioning=3Dno
+      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=3Dyes ;; # RH7.3 ...
+        *\ 2.11.92.0.12\ *) supports_anon_versioning=3Dyes ;; # Mandrake 8=
=2E2 ...
+        *\ 2.11.*) ;; # other 2.11 versions
+        *) supports_anon_versioning=3Dyes ;;
+      esac
+      if test $supports_anon_versioning =3D yes; then
+        archive_expsym_cmds=3D'$echo "{ global:" > $output_objdir/$libname=
=2Ever~
+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ve=
r~
+$echo "local: *; };" >> $output_objdir/$libname.ver~
+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$son=
ame ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+      else
+        archive_expsym_cmds=3D"$tmp_archive_cmds"
+      fi
+    else
+      ld_shlibs=3Dno
+    fi
+    ;;
+
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; =
then
 	archive_cmds=3D'$CC -shared $libobjs $deplibs $compiler_flags ${wl}-sonam=
e $wl$soname -o $lib'
@@ -6923,7 +7140,6 @@
 	allow_undefined_flag=3D'-berok'
        # Determine the default libpath from the value encoded in an empty =
executable.
        cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -6940,11 +7156,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -6961,7 +7186,8 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
        hardcode_libdir_flag_spec=3D'${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -6974,7 +7200,6 @@
 	else
 	 # Determine the default libpath from the value encoded in an empty execu=
table.
 	 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -6991,11 +7216,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -7012,7 +7246,8 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
 	 hardcode_libdir_flag_spec=3D'${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -7065,20 +7300,27 @@
       ;;
=20
     darwin* | rhapsody*)
-    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+    if test "$GXX" =3D yes ; then
       archive_cmds_need_lc=3Dno
       case "$host_os" in
       rhapsody* | darwin1.[012])
 	allow_undefined_flag=3D'-undefined suppress'
 	;;
       *) # Darwin 1.3 on
-	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag=3D'-flat_namespa=
ce -undefined suppress'
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	allow_undefined_flag=3D'-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag=3D'-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            allow_undefined_flag=3D'-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
 	;;
       esac
-      # FIXME: Relying on posixy $() will cause problems for
-      #        cross-compilation, but unfortunately the echo tests do not
-      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangl=
es
-      #	       `"' quotes if we put them in here... so don't!
     	lt_int_apple_cc_single_mod=3Dno
     	output_verbose_link_cmd=3D'echo'
     	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -7089,19 +7331,21 @@
     	else
         archive_cmds=3D'$CC -r ${wl}-bind_at_load -keep_private_externs -n=
ostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -=
o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$sonam=
e $verstring'
       fi
-      module_cmds=3D'$CC -bundle ${wl}-bind_at_load $allow_undefined_flag =
-o $lib $libobjs $deplibs$compiler_flags'
+      module_cmds=3D'$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 doe=
sn't exist in older darwin ld's
         if test "X$lt_int_apple_cc_single_mod" =3D Xyes ; then
           archive_expsym_cmds=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,=
^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~=
$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $depl=
ibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $outp=
ut_objdir/${libname}-symbols.expsym ${lib}'
         else
           archive_expsym_cmds=3D'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 $d=
eplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $o=
utput_objdir/${libname}-symbols.expsym ${lib}'
         fi
-          module_expsym_cmds=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^=
\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$=
CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~=
nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds=3D'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}'
       hardcode_direct=3Dno
       hardcode_automatic=3Dyes
       hardcode_shlibpath_var=3Dunsupported
       whole_archive_flag_spec=3D'-all_load $convenience'
       link_all_deplibs=3Dyes
+    else
+      ld_shlibs=3Dno
     fi
       ;;
=20
@@ -7135,7 +7379,7 @@
       ;;
=20
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd*)
+    freebsd* | kfreebsd*-gnu)
       archive_cmds=3D'$CC -shared -o $lib $libobjs $deplibs $compiler_flag=
s'
       hardcode_libdir_flag_spec=3D'-R$libdir'
       hardcode_direct=3Dyes
@@ -7222,7 +7466,7 @@
       link_all_deplibs=3Dyes
       ;;
=20
-    netbsd*)
+    netbsd* | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds=3D'$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' =
 # a.out
       else
@@ -7495,72 +7739,6 @@
   ;;
 esac
=20
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs=
" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECH=
O_C" >&6
-hardcode_action=3D
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var " || \
-   test "X$hardcode_automatic"=3D"Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" !=3D no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" !=3D no &&
-     test "$hardcode_minus_L" !=3D no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=3Drelink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=3Dimmediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=3Dunsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
-
-if test "$hardcode_action" =3D relink; then
-  # Fast installation is not supported
-  enable_fast_install=3Dno
-elif test "$shlibpath_overrides_runpath" =3D yes ||
-     test "$enable_shared" =3D no; then
-  # Fast installation is not necessary
-  enable_fast_install=3Dneedless
-fi
-
-striplib=3D
-old_striplib=3D
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C"=
 >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib=3D"$STRIP --strip-debug"
-  test -z "$striplib" && striplib=3D"$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib=3D"$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
 echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=3D
@@ -7654,7 +7832,7 @@
 amigaos*)
   library_names_spec=3D'$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval=3D'for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libna=
me=3D`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; te=
st $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib=
 ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary=
=2Ea) || exit 1; done'
+  finish_eval=3D'for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libna=
me=3D`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; te=
st $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib =
${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a =
|| exit 1; done'
   ;;
=20
 beos*)
@@ -7701,7 +7879,7 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec=3D'`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${relea=
se} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=3D"/lib /lib/w32api /usr/lib /usr/local/lib"
+      sys_lib_search_path_spec=3D"/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw*)
       # MinGW DLLs use traditional 'lib' prefix
@@ -7740,17 +7918,16 @@
   version_type=3Ddarwin
   need_lib_prefix=3Dno
   need_version=3Dno
-  # FIXME: Relying on posixy $() will cause problems for
-  #        cross-compilation, but unfortunately the echo tests do not
-  #        yet detect zsh echo's removal of \ escapes.
   library_names_spec=3D'${libname}${release}${versuffix}$shared_ext ${libn=
ame}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec=3D'${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=3Dyes
   shlibpath_var=3DDYLD_LIBRARY_PATH
   shrext=3D'$(test .$module =3D .yes && echo .so || echo .dylib)'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
-  sys_lib_search_path_spec=3D`$CC -print-search-dirs | tr "\n" "$PATH_SEPA=
RATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^librarie=
s:" | sed -e "s/^libraries://" -e "s,=3D/,/,g" -e "s,$PATH_SEPARATOR, ,g" -=
e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  if test "$GCC" =3D yes; then
+    sys_lib_search_path_spec=3D`$CC -print-search-dirs | tr "\n" "$PATH_SE=
PARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^librar=
ies:" | sed -e "s/^libraries://" -e "s,=3D/,/,g" -e "s,$PATH_SEPARATOR, ,g"=
 -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  else
+    sys_lib_search_path_spec=3D'/lib /usr/lib /usr/local/lib'
   fi
   sys_lib_dlsearch_path_spec=3D'/usr/local/lib /lib /usr/lib'
   ;;
@@ -7768,6 +7945,18 @@
   dynamic_linker=3Dno
   ;;
=20
+kfreebsd*-gnu)
+  version_type=3Dlinux
+  need_lib_prefix=3Dno
+  need_version=3Dno
+  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec=3D'${libname}${release}${shared_ext}$major'
+  shlibpath_var=3DLD_LIBRARY_PATH
+  shlibpath_overrides_runpath=3Dno
+  hardcode_into_libs=3Dyes
+  dynamic_linker=3D'GNU ld.so'
+  ;;
+
 freebsd*)
   objformat=3D`test -x /usr/bin/objformat && /usr/bin/objformat || echo ao=
ut`
   version_type=3Dfreebsd-$objformat
@@ -7911,6 +8100,12 @@
   # before this can be enabled.
   hardcode_into_libs=3Dyes
=20
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    ld_extra=3D`$SED -e 's/:,\t/ /g;s/=3D^=3D*$//;s/=3D^=3D * / /g' /etc/l=
d.so.conf`
+    sys_lib_dlsearch_path_spec=3D"/lib /usr/lib $ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -7920,6 +8115,18 @@
   dynamic_linker=3D'GNU/Linux ld.so'
   ;;
=20
+knetbsd*-gnu)
+  version_type=3Dlinux
+  need_lib_prefix=3Dno
+  need_version=3Dno
+  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec=3D'${libname}${release}${shared_ext}$major'
+  shlibpath_var=3DLD_LIBRARY_PATH
+  shlibpath_overrides_runpath=3Dno
+  hardcode_into_libs=3Dyes
+  dynamic_linker=3D'GNU ld.so'
+  ;;
+
 netbsd*)
   version_type=3Dsunos
   need_lib_prefix=3Dno
@@ -7929,7 +8136,7 @@
     finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker=3D'NetBSD (a.out) ld.so'
   else
-    library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${lib=
name}${shared_ext}'
+    library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec=3D'${libname}${release}${shared_ext}$major'
     dynamic_linker=3D'NetBSD ld.elf_so'
   fi
@@ -7945,7 +8152,7 @@
   shlibpath_overrides_runpath=3Dyes
   ;;
=20
-nto-qnx)
+nto-qnx*)
   version_type=3Dlinux
   need_lib_prefix=3Dno
   need_version=3Dno
@@ -7958,7 +8165,7 @@
 openbsd*)
   version_type=3Dsunos
   need_lib_prefix=3Dno
-  need_version=3Dno
+  need_version=3Dyes
   library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${shared_ext}$versuffix'
   finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=3DLD_LIBRARY_PATH
@@ -8076,6 +8283,72 @@
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" =3D no && can_build_shared=3Dno
=20
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs=
" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECH=
O_C" >&6
+hardcode_action=3D
+if test -n "$hardcode_libdir_flag_spec" || \
+   test -n "$runpath_var " || \
+   test "X$hardcode_automatic"=3D"Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct" !=3D no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" !=3D no &&
+     test "$hardcode_minus_L" !=3D no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action=3Drelink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action=3Dimmediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action=3Dunsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action" >&5
+echo "${ECHO_T}$hardcode_action" >&6
+
+if test "$hardcode_action" =3D relink; then
+  # Fast installation is not supported
+  enable_fast_install=3Dno
+elif test "$shlibpath_overrides_runpath" =3D yes ||
+     test "$enable_shared" =3D no; then
+  # Fast installation is not necessary
+  enable_fast_install=3Dneedless
+fi
+
+striplib=3D
+old_striplib=3D
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C"=
 >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib=3D"$STRIP --strip-debug"
+  test -z "$striplib" && striplib=3D"$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib=3D"$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
 if test "x$enable_dlopen" !=3D xyes; then
   enable_dlopen=3Dunknown
   enable_dlopen_self=3Dunknown
@@ -8111,7 +8384,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8135,11 +8407,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -8152,7 +8433,8 @@
=20
 ac_cv_lib_dl_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -8176,21 +8458,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares sh=
l_load.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shl_load innocuous_shl_load
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef shl_load
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -8221,11 +8510,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -8238,7 +8536,8 @@
=20
 ac_cv_func_shl_load=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
 echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -8253,7 +8552,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8277,11 +8575,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -8294,7 +8601,8 @@
=20
 ac_cv_lib_dld_shl_load=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -8308,21 +8616,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlop=
en.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define dlopen innocuous_dlopen
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef dlopen
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -8353,11 +8668,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -8370,7 +8694,8 @@
=20
 ac_cv_func_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
 echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -8385,7 +8710,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8409,11 +8733,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -8426,7 +8759,8 @@
=20
 ac_cv_lib_dl_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -8442,7 +8776,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-lsvld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8466,11 +8799,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -8483,7 +8825,8 @@
=20
 ac_cv_lib_svld_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -8499,7 +8842,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -8523,11 +8865,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -8540,7 +8891,8 @@
=20
 ac_cv_lib_dld_dld_link=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -8595,7 +8947,7 @@
   lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
   lt_status=3D$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8598 "configure"
+#line 8950 "configure"
 #include "confdefs.h"
=20
 #if HAVE_DLFCN_H
@@ -8693,7 +9045,7 @@
   lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
   lt_status=3D$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8696 "configure"
+#line 9048 "configure"
 #include "confdefs.h"
=20
 #if HAVE_DLFCN_H
@@ -8824,32 +9176,41 @@
   fi
   ;;
   darwin* | rhapsody*)
-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+  if test "$GCC" =3D yes; then
     archive_cmds_need_lc=3Dno
     case "$host_os" in
     rhapsody* | darwin1.[012])
       allow_undefined_flag=3D'-undefined suppress'
       ;;
     *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag=3D'-flat_na=
mespace -undefined suppress'
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	allow_undefined_flag=3D'-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag=3D'-flat_namespace -undefined suppress'
+            ;;
+          10.*)
+            allow_undefined_flag=3D'-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
       ;;
     esac
-    # FIXME: Relying on posixy $() will cause problems for
-    #        cross-compilation, but unfortunately the echo tests do not
-    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
-    #	       `"' quotes if we put them in here... so don't!
-		output_verbose_link_cmd=3D'echo'
+    output_verbose_link_cmd=3D'echo'
     archive_cmds=3D'$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs=
 $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-    module_cmds=3D'$CC -bundle $allow_undefined_flag -o $lib $libobjs $dep=
libs$compiler_flags'
+    module_cmds=3D'$CC $allow_undefined_flag -o $lib -bundle $libobjs $dep=
libs$compiler_flags'
     # Don't fix this by using the ld -exported_symbols_list flag, it doesn=
't exist in older darwin ld's
-		  archive_expsym_cmds=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*=
\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -d=
ynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -=
install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-=
symbols.expsym ${lib}'
-		  module_expsym_cmds=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\=
),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -bu=
ndle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags~nmedit=
 -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    archive_expsym_cmds=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*=
\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -d=
ynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -=
install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-=
symbols.expsym ${lib}'
+    module_expsym_cmds=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\=
),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $al=
low_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit=
 -s $output_objdir/${libname}-symbols.expsym ${lib}'
     hardcode_direct=3Dno
     hardcode_automatic=3Dyes
     hardcode_shlibpath_var=3Dunsupported
     whole_archive_flag_spec=3D'-all_load $convenience'
     link_all_deplibs=3Dyes
-    fi
+  else
+    ld_shlibs=3Dno
+  fi
     ;;
 esac
 echo "$as_me:$LINENO: result: $enable_shared" >&5
@@ -8875,7 +9236,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM =
SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -9053,7 +9415,7 @@
 NM=3D$lt_NM
=20
 # A symbol stripping program
-STRIP=3D$STRIP
+STRIP=3D$lt_STRIP
=20
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=3D$MAGIC_CMD
@@ -9326,7 +9688,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=3D`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
=20
=20
@@ -9507,7 +9872,7 @@
     # Accept absolute paths.
     [\\/]* | ?:[\\/]*)
       re_direlt=3D'/[^/][^/]*/\.\./'
-      # Canonicalize the path of ld
+      # Canonicalize the pathname of ld
       ac_prog=3D`echo $ac_prog| $SED 's%\\\\%/%g'`
       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
 	ac_prog=3D`echo $ac_prog| $SED "s%$re_direlt%/%"`
@@ -9576,7 +9941,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   # I'd rather use --version here, but apparently some GNU ld's only accep=
t -v.
-case `"$LD" -v 2>&1 </dev/null` in
+case `$LD -v 2>&1 </dev/null` in
 *GNU* | *'with BFD'*)
   lt_cv_prog_gnu_ld=3Dyes
   ;;
@@ -9621,7 +9986,7 @@
     # linker, instead of GNU ld.  If possible, this setting should
     # overridden to take advantage of the native linker features on
     # the platform it is being used on.
-    archive_cmds_CXX=3D'$CC -shared $predep_objects $libobjs $deplibs $pos=
tdep_objects $compiler_flags -o $lib'
+    archive_cmds_CXX=3D'$CC -shared -nostdlib $predep_objects $libobjs $de=
plibs $postdep_objects $compiler_flags -o $lib'
   fi
=20
   # Commands to make compiler produce verbose output that lists
@@ -9729,7 +10094,6 @@
       allow_undefined_flag_CXX=3D'-berok'
       # Determine the default libpath from the value encoded in an empty e=
xecutable.
       cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9746,11 +10110,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -9767,7 +10140,8 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
       hardcode_libdir_flag_spec_CXX=3D'${wl}-blibpath:$libdir:'"$aix_libpa=
th"
@@ -9781,7 +10155,6 @@
       else
 	# Determine the default libpath from the value encoded in an empty execut=
able.
 	cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -9798,11 +10171,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -9819,7 +10201,8 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
 	hardcode_libdir_flag_spec_CXX=3D'${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -9871,41 +10254,54 @@
   ;;
=20
   darwin* | rhapsody*)
-   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+  if test "$GXX" =3D yes; then
     archive_cmds_need_lc_CXX=3Dno
     case "$host_os" in
     rhapsody* | darwin1.[012])
       allow_undefined_flag_CXX=3D'-undefined suppress'
       ;;
     *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX=3D'-fla=
t_namespace -undefined suppress'
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	allow_undefined_flag_CXX=3D'-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag_CXX=3D'-flat_namespace -undefined suppres=
s'
+            ;;
+          10.*)
+            allow_undefined_flag_CXX=3D'-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
       ;;
     esac
-    	lt_int_apple_cc_single_mod=3Dno
-    	output_verbose_link_cmd=3D'echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=3Dyes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" =3D Xyes ; then
-    	  archive_cmds_CXX=3D'$CC -dynamiclib -single_module $allow_undefined=
_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$sonam=
e $verstring'
-    	else
-        archive_cmds_CXX=3D'$CC -r ${wl}-bind_at_load -keep_private_extern=
s -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_fl=
ag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$s=
oname $verstring'
-      fi
-      module_cmds_CXX=3D'$CC -bundle ${wl}-bind_at_load $allow_undefined_f=
lag -o $lib $libobjs $deplibs$compiler_flags'
+    lt_int_apple_cc_single_mod=3Dno
+    output_verbose_link_cmd=3D'echo'
+    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+      lt_int_apple_cc_single_mod=3Dyes
+    fi
+    if test "X$lt_int_apple_cc_single_mod" =3D Xyes ; then
+      archive_cmds_CXX=3D'$CC -dynamiclib -single_module $allow_undefined_=
flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname=
 $verstring'
+    else
+      archive_cmds_CXX=3D'$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/$son=
ame $verstring'
+    fi
+    module_cmds_CXX=3D'$CC ${wl}-bind_at_load $allow_undefined_flag -o $li=
b -bundle $libobjs $deplibs$compiler_flags'
=20
     # 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" =3D Xyes ; then
-        archive_expsym_cmds_CXX=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e "=
s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsy=
m~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $de=
plibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $ou=
tput_objdir/${libname}-symbols.expsym ${lib}'
-      else
-        archive_expsym_cmds_CXX=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e "=
s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsy=
m~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-maste=
r.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
-        module_expsym_cmds_CXX=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e "s=
,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym=
~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flag=
s~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+    if test "X$lt_int_apple_cc_single_mod" =3D Xyes ; then
+      archive_expsym_cmds_CXX=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,=
^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~=
$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $depl=
ibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $outp=
ut_objdir/${libname}-symbols.expsym ${lib}'
+    else
+      archive_expsym_cmds_CXX=3D'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 $d=
eplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $o=
utput_objdir/${libname}-symbols.expsym ${lib}'
+    fi
+    module_expsym_cmds_CXX=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(=
=2E.*\),_&," < $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}'
     hardcode_direct_CXX=3Dno
     hardcode_automatic_CXX=3Dyes
     hardcode_shlibpath_var_CXX=3Dunsupported
     whole_archive_flag_spec_CXX=3D'-all_load $convenience'
     link_all_deplibs_CXX=3Dyes
-   fi
+  else
+    ld_shlibs_CXX=3Dno
+  fi
     ;;
=20
   dgux*)
@@ -9932,7 +10328,7 @@
   freebsd-elf*)
     archive_cmds_need_lc_CXX=3Dno
     ;;
-  freebsd*)
+  freebsd* | kfreebsd*-gnu)
     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
     # conventions
     ld_shlibs_CXX=3Dyes
@@ -10160,7 +10556,7 @@
 	;;
     esac
     ;;
-  netbsd*)
+  netbsd* | knetbsd*-gnu)
     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
       archive_cmds_CXX=3D'$LD -Bshareable  -o $lib $predep_objects $libobj=
s $deplibs $postdep_objects $linker_flags'
       wlarc=3D
@@ -10639,7 +11035,7 @@
 	    ;;
 	esac
 	;;
-      freebsd*)
+      freebsd* | kfreebsd*-gnu)
 	# FreeBSD uses GNU C++
 	;;
       hpux9* | hpux10* | hpux11*)
@@ -10715,7 +11111,7 @@
 	    ;;
 	esac
 	;;
-      netbsd*)
+      netbsd* | knetbsd*-gnu)
 	;;
       osf3* | osf4* | osf5*)
 	case $cc_basename in
@@ -10807,7 +11203,8 @@
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_CXX"; then
-  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_p=
ic_CXX works" >&5
+
+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic=
_CXX works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX wor=
ks... $ECHO_C" >&6
 if test "${lt_prog_compiler_pic_works_CXX+set}" =3D set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10825,11 +11222,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10828: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11225: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=3D$?
    cat conftest.err >&5
-   echo "$as_me:10832: \$? =3D $ac_status" >&5
+   echo "$as_me:11229: \$? =3D $ac_status" >&5
    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
@@ -10876,13 +11273,6 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
=20
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compil=
ers
-   # that will create temporary files in the current directory regardless =
of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do para=
llel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag=3D"-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -10892,11 +11282,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10895: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11285: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=3D$?
    cat out/conftest.err >&5
-   echo "$as_me:10899: \$? =3D $ac_status" >&5
+   echo "$as_me:11289: \$? =3D $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10906,8 +11296,11 @@
      fi
    fi
    chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -11035,72 +11428,6 @@
   ;;
 esac
=20
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs=
" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECH=
O_C" >&6
-hardcode_action_CXX=3D
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var CXX" || \
-   test "X$hardcode_automatic_CXX"=3D"Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_CXX" !=3D no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" !=3D no &&
-     test "$hardcode_minus_L_CXX" !=3D no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=3Drelink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=3Dimmediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=3Dunsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
-
-if test "$hardcode_action_CXX" =3D relink; then
-  # Fast installation is not supported
-  enable_fast_install=3Dno
-elif test "$shlibpath_overrides_runpath" =3D yes ||
-     test "$enable_shared" =3D no; then
-  # Fast installation is not necessary
-  enable_fast_install=3Dneedless
-fi
-
-striplib=3D
-old_striplib=3D
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C"=
 >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib=3D"$STRIP --strip-debug"
-  test -z "$striplib" && striplib=3D"$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib=3D"$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
 echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=3D
@@ -11194,7 +11521,7 @@
 amigaos*)
   library_names_spec=3D'$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval=3D'for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libna=
me=3D`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; te=
st $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib=
 ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary=
=2Ea) || exit 1; done'
+  finish_eval=3D'for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libna=
me=3D`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; te=
st $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib =
${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a =
|| exit 1; done'
   ;;
=20
 beos*)
@@ -11241,7 +11568,7 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec=3D'`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${relea=
se} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=3D"/lib /lib/w32api /usr/lib /usr/local/lib"
+      sys_lib_search_path_spec=3D"/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw*)
       # MinGW DLLs use traditional 'lib' prefix
@@ -11280,17 +11607,16 @@
   version_type=3Ddarwin
   need_lib_prefix=3Dno
   need_version=3Dno
-  # FIXME: Relying on posixy $() will cause problems for
-  #        cross-compilation, but unfortunately the echo tests do not
-  #        yet detect zsh echo's removal of \ escapes.
   library_names_spec=3D'${libname}${release}${versuffix}$shared_ext ${libn=
ame}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec=3D'${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=3Dyes
   shlibpath_var=3DDYLD_LIBRARY_PATH
   shrext=3D'$(test .$module =3D .yes && echo .so || echo .dylib)'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
-  sys_lib_search_path_spec=3D`$CC -print-search-dirs | tr "\n" "$PATH_SEPA=
RATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^librarie=
s:" | sed -e "s/^libraries://" -e "s,=3D/,/,g" -e "s,$PATH_SEPARATOR, ,g" -=
e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  if test "$GCC" =3D yes; then
+    sys_lib_search_path_spec=3D`$CC -print-search-dirs | tr "\n" "$PATH_SE=
PARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^librar=
ies:" | sed -e "s/^libraries://" -e "s,=3D/,/,g" -e "s,$PATH_SEPARATOR, ,g"=
 -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  else
+    sys_lib_search_path_spec=3D'/lib /usr/lib /usr/local/lib'
   fi
   sys_lib_dlsearch_path_spec=3D'/usr/local/lib /lib /usr/lib'
   ;;
@@ -11308,6 +11634,18 @@
   dynamic_linker=3Dno
   ;;
=20
+kfreebsd*-gnu)
+  version_type=3Dlinux
+  need_lib_prefix=3Dno
+  need_version=3Dno
+  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec=3D'${libname}${release}${shared_ext}$major'
+  shlibpath_var=3DLD_LIBRARY_PATH
+  shlibpath_overrides_runpath=3Dno
+  hardcode_into_libs=3Dyes
+  dynamic_linker=3D'GNU ld.so'
+  ;;
+
 freebsd*)
   objformat=3D`test -x /usr/bin/objformat && /usr/bin/objformat || echo ao=
ut`
   version_type=3Dfreebsd-$objformat
@@ -11451,6 +11789,12 @@
   # before this can be enabled.
   hardcode_into_libs=3Dyes
=20
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    ld_extra=3D`$SED -e 's/:,\t/ /g;s/=3D^=3D*$//;s/=3D^=3D * / /g' /etc/l=
d.so.conf`
+    sys_lib_dlsearch_path_spec=3D"/lib /usr/lib $ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -11460,6 +11804,18 @@
   dynamic_linker=3D'GNU/Linux ld.so'
   ;;
=20
+knetbsd*-gnu)
+  version_type=3Dlinux
+  need_lib_prefix=3Dno
+  need_version=3Dno
+  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec=3D'${libname}${release}${shared_ext}$major'
+  shlibpath_var=3DLD_LIBRARY_PATH
+  shlibpath_overrides_runpath=3Dno
+  hardcode_into_libs=3Dyes
+  dynamic_linker=3D'GNU ld.so'
+  ;;
+
 netbsd*)
   version_type=3Dsunos
   need_lib_prefix=3Dno
@@ -11469,7 +11825,7 @@
     finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker=3D'NetBSD (a.out) ld.so'
   else
-    library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${lib=
name}${shared_ext}'
+    library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec=3D'${libname}${release}${shared_ext}$major'
     dynamic_linker=3D'NetBSD ld.elf_so'
   fi
@@ -11485,7 +11841,7 @@
   shlibpath_overrides_runpath=3Dyes
   ;;
=20
-nto-qnx)
+nto-qnx*)
   version_type=3Dlinux
   need_lib_prefix=3Dno
   need_version=3Dno
@@ -11498,7 +11854,7 @@
 openbsd*)
   version_type=3Dsunos
   need_lib_prefix=3Dno
-  need_version=3Dno
+  need_version=3Dyes
   library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${shared_ext}$versuffix'
   finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=3DLD_LIBRARY_PATH
@@ -11616,6 +11972,72 @@
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" =3D no && can_build_shared=3Dno
=20
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs=
" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECH=
O_C" >&6
+hardcode_action_CXX=3D
+if test -n "$hardcode_libdir_flag_spec_CXX" || \
+   test -n "$runpath_var CXX" || \
+   test "X$hardcode_automatic_CXX"=3D"Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_CXX" !=3D no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" !=3D no &&
+     test "$hardcode_minus_L_CXX" !=3D no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_CXX=3Drelink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_CXX=3Dimmediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_CXX=3Dunsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
+echo "${ECHO_T}$hardcode_action_CXX" >&6
+
+if test "$hardcode_action_CXX" =3D relink; then
+  # Fast installation is not supported
+  enable_fast_install=3Dno
+elif test "$shlibpath_overrides_runpath" =3D yes ||
+     test "$enable_shared" =3D no; then
+  # Fast installation is not necessary
+  enable_fast_install=3Dneedless
+fi
+
+striplib=3D
+old_striplib=3D
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C"=
 >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib=3D"$STRIP --strip-debug"
+  test -z "$striplib" && striplib=3D"$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib=3D"$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
 if test "x$enable_dlopen" !=3D xyes; then
   enable_dlopen=3Dunknown
   enable_dlopen_self=3Dunknown
@@ -11651,7 +12073,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -11675,11 +12096,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -11692,7 +12122,8 @@
=20
 ac_cv_lib_dl_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -11716,21 +12147,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares sh=
l_load.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shl_load innocuous_shl_load
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef shl_load
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -11761,11 +12199,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -11778,7 +12225,8 @@
=20
 ac_cv_func_shl_load=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
 echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -11793,7 +12241,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -11817,11 +12264,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -11834,7 +12290,8 @@
=20
 ac_cv_lib_dld_shl_load=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -11848,21 +12305,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlop=
en.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define dlopen innocuous_dlopen
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef dlopen
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -11893,11 +12357,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -11910,7 +12383,8 @@
=20
 ac_cv_func_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
 echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -11925,7 +12399,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -11949,11 +12422,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -11966,7 +12448,8 @@
=20
 ac_cv_lib_dl_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -11982,7 +12465,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-lsvld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12006,11 +12488,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -12023,7 +12514,8 @@
=20
 ac_cv_lib_svld_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -12039,7 +12531,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -12063,11 +12554,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -12080,7 +12580,8 @@
=20
 ac_cv_lib_dld_dld_link=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -12135,7 +12636,7 @@
   lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
   lt_status=3D$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12138 "configure"
+#line 12639 "configure"
 #include "confdefs.h"
=20
 #if HAVE_DLFCN_H
@@ -12233,7 +12734,7 @@
   lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
   lt_status=3D$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12236 "configure"
+#line 12737 "configure"
 #include "confdefs.h"
=20
 #if HAVE_DLFCN_H
@@ -12350,7 +12851,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM =
SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -12480,7 +12982,7 @@
 NM=3D$lt_NM
=20
 # A symbol stripping program
-STRIP=3D$STRIP
+STRIP=3D$lt_STRIP
=20
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=3D$MAGIC_CMD
@@ -12728,7 +13230,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=3D`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
=20
=20
@@ -12970,12 +13475,12 @@
=20
     linux*)
       case $CC in
-      icc|ecc)
+      icc* | ecc*)
 	lt_prog_compiler_wl_F77=3D'-Wl,'
 	lt_prog_compiler_pic_F77=3D'-KPIC'
 	lt_prog_compiler_static_F77=3D'-static'
         ;;
-      ccc)
+      ccc*)
         lt_prog_compiler_wl_F77=3D'-Wl,'
         # All Alpha code is PIC.
         lt_prog_compiler_static_F77=3D'-non_shared'
@@ -13037,7 +13542,8 @@
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_F77"; then
-  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_p=
ic_F77 works" >&5
+
+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic=
_F77 works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 wor=
ks... $ECHO_C" >&6
 if test "${lt_prog_compiler_pic_works_F77+set}" =3D set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13055,11 +13561,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13058: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13564: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=3D$?
    cat conftest.err >&5
-   echo "$as_me:13062: \$? =3D $ac_status" >&5
+   echo "$as_me:13568: \$? =3D $ac_status" >&5
    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
@@ -13106,13 +13612,6 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
=20
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compil=
ers
-   # that will create temporary files in the current directory regardless =
of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do para=
llel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag=3D"-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -13122,11 +13621,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13125: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13624: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=3D$?
    cat out/conftest.err >&5
-   echo "$as_me:13129: \$? =3D $ac_status" >&5
+   echo "$as_me:13628: \$? =3D $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13136,8 +13635,11 @@
      fi
    fi
    chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -13296,7 +13798,7 @@
       fi
       ;;
=20
-    netbsd*)
+    netbsd* | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77=3D'$LD -Bshareable $libobjs $deplibs $linker_flags -o $l=
ib'
 	wlarc=3D
@@ -13334,6 +13836,31 @@
       hardcode_shlibpath_var_F77=3Dno
       ;;
=20
+  linux*)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; t=
hen
+        tmp_archive_cmds=3D'$CC -shared $libobjs $deplibs $compiler_flags =
${wl}-soname $wl$soname -o $lib'
+	archive_cmds_F77=3D"$tmp_archive_cmds"
+      supports_anon_versioning=3Dno
+      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=3Dyes ;; # RH7.3 ...
+        *\ 2.11.92.0.12\ *) supports_anon_versioning=3Dyes ;; # Mandrake 8=
=2E2 ...
+        *\ 2.11.*) ;; # other 2.11 versions
+        *) supports_anon_versioning=3Dyes ;;
+      esac
+      if test $supports_anon_versioning =3D yes; then
+        archive_expsym_cmds_F77=3D'$echo "{ global:" > $output_objdir/$lib=
name.ver~
+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ve=
r~
+$echo "local: *; };" >> $output_objdir/$libname.ver~
+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$son=
ame ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+      else
+        archive_expsym_cmds_F77=3D"$tmp_archive_cmds"
+      fi
+    else
+      ld_shlibs_F77=3Dno
+    fi
+    ;;
+
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; =
then
 	archive_cmds_F77=3D'$CC -shared $libobjs $deplibs $compiler_flags ${wl}-s=
oname $wl$soname -o $lib'
@@ -13468,11 +13995,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -13489,7 +14025,8 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
        hardcode_libdir_flag_spec_F77=3D'${wl}-blibpath:$libdir:'"$aix_libp=
ath"
@@ -13508,11 +14045,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -13529,7 +14075,8 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
 	 hardcode_libdir_flag_spec_F77=3D'${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -13582,20 +14129,27 @@
       ;;
=20
     darwin* | rhapsody*)
-    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+    if test "$GXX" =3D yes ; then
       archive_cmds_need_lc_F77=3Dno
       case "$host_os" in
       rhapsody* | darwin1.[012])
 	allow_undefined_flag_F77=3D'-undefined suppress'
 	;;
       *) # Darwin 1.3 on
-	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77=3D'-flat_nam=
espace -undefined suppress'
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	allow_undefined_flag_F77=3D'-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag_F77=3D'-flat_namespace -undefined suppres=
s'
+            ;;
+          10.*)
+            allow_undefined_flag_F77=3D'-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
 	;;
       esac
-      # FIXME: Relying on posixy $() will cause problems for
-      #        cross-compilation, but unfortunately the echo tests do not
-      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangl=
es
-      #	       `"' quotes if we put them in here... so don't!
     	lt_int_apple_cc_single_mod=3Dno
     	output_verbose_link_cmd=3D'echo'
     	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -13606,19 +14160,21 @@
     	else
         archive_cmds_F77=3D'$CC -r ${wl}-bind_at_load -keep_private_extern=
s -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_fl=
ag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$s=
oname $verstring'
       fi
-      module_cmds_F77=3D'$CC -bundle ${wl}-bind_at_load $allow_undefined_f=
lag -o $lib $libobjs $deplibs$compiler_flags'
+      module_cmds_F77=3D'$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 doe=
sn't exist in older darwin ld's
         if test "X$lt_int_apple_cc_single_mod" =3D Xyes ; then
           archive_expsym_cmds_F77=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e=
 "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.exp=
sym~$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
           archive_expsym_cmds_F77=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e=
 "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.exp=
sym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-mas=
ter.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
-          module_expsym_cmds_F77=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e =
"s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.exps=
ym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_fl=
ags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_F77=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e =
"s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.exps=
ym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_fl=
ags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       hardcode_direct_F77=3Dno
       hardcode_automatic_F77=3Dyes
       hardcode_shlibpath_var_F77=3Dunsupported
       whole_archive_flag_spec_F77=3D'-all_load $convenience'
       link_all_deplibs_F77=3Dyes
+    else
+      ld_shlibs_F77=3Dno
     fi
       ;;
=20
@@ -13652,7 +14208,7 @@
       ;;
=20
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd*)
+    freebsd* | kfreebsd*-gnu)
       archive_cmds_F77=3D'$CC -shared -o $lib $libobjs $deplibs $compiler_=
flags'
       hardcode_libdir_flag_spec_F77=3D'-R$libdir'
       hardcode_direct_F77=3Dyes
@@ -13739,7 +14295,7 @@
       link_all_deplibs_F77=3Dyes
       ;;
=20
-    netbsd*)
+    netbsd* | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_F77=3D'$LD -Bshareable -o $lib $libobjs $deplibs $linker_fla=
gs'  # a.out
       else
@@ -14012,72 +14568,6 @@
   ;;
 esac
=20
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs=
" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECH=
O_C" >&6
-hardcode_action_F77=3D
-if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var F77" || \
-   test "X$hardcode_automatic_F77"=3D"Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" !=3D no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" !=3D no &&
-     test "$hardcode_minus_L_F77" !=3D no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=3Drelink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=3Dimmediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=3Dunsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
-
-if test "$hardcode_action_F77" =3D relink; then
-  # Fast installation is not supported
-  enable_fast_install=3Dno
-elif test "$shlibpath_overrides_runpath" =3D yes ||
-     test "$enable_shared" =3D no; then
-  # Fast installation is not necessary
-  enable_fast_install=3Dneedless
-fi
-
-striplib=3D
-old_striplib=3D
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C"=
 >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib=3D"$STRIP --strip-debug"
-  test -z "$striplib" && striplib=3D"$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib=3D"$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
 echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=3D
@@ -14171,7 +14661,7 @@
 amigaos*)
   library_names_spec=3D'$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval=3D'for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libna=
me=3D`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; te=
st $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib=
 ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary=
=2Ea) || exit 1; done'
+  finish_eval=3D'for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libna=
me=3D`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; te=
st $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib =
${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a =
|| exit 1; done'
   ;;
=20
 beos*)
@@ -14218,7 +14708,7 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec=3D'`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${relea=
se} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=3D"/lib /lib/w32api /usr/lib /usr/local/lib"
+      sys_lib_search_path_spec=3D"/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw*)
       # MinGW DLLs use traditional 'lib' prefix
@@ -14257,17 +14747,16 @@
   version_type=3Ddarwin
   need_lib_prefix=3Dno
   need_version=3Dno
-  # FIXME: Relying on posixy $() will cause problems for
-  #        cross-compilation, but unfortunately the echo tests do not
-  #        yet detect zsh echo's removal of \ escapes.
   library_names_spec=3D'${libname}${release}${versuffix}$shared_ext ${libn=
ame}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec=3D'${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=3Dyes
   shlibpath_var=3DDYLD_LIBRARY_PATH
   shrext=3D'$(test .$module =3D .yes && echo .so || echo .dylib)'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
-  sys_lib_search_path_spec=3D`$CC -print-search-dirs | tr "\n" "$PATH_SEPA=
RATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^librarie=
s:" | sed -e "s/^libraries://" -e "s,=3D/,/,g" -e "s,$PATH_SEPARATOR, ,g" -=
e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  if test "$GCC" =3D yes; then
+    sys_lib_search_path_spec=3D`$CC -print-search-dirs | tr "\n" "$PATH_SE=
PARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^librar=
ies:" | sed -e "s/^libraries://" -e "s,=3D/,/,g" -e "s,$PATH_SEPARATOR, ,g"=
 -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  else
+    sys_lib_search_path_spec=3D'/lib /usr/lib /usr/local/lib'
   fi
   sys_lib_dlsearch_path_spec=3D'/usr/local/lib /lib /usr/lib'
   ;;
@@ -14285,6 +14774,18 @@
   dynamic_linker=3Dno
   ;;
=20
+kfreebsd*-gnu)
+  version_type=3Dlinux
+  need_lib_prefix=3Dno
+  need_version=3Dno
+  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec=3D'${libname}${release}${shared_ext}$major'
+  shlibpath_var=3DLD_LIBRARY_PATH
+  shlibpath_overrides_runpath=3Dno
+  hardcode_into_libs=3Dyes
+  dynamic_linker=3D'GNU ld.so'
+  ;;
+
 freebsd*)
   objformat=3D`test -x /usr/bin/objformat && /usr/bin/objformat || echo ao=
ut`
   version_type=3Dfreebsd-$objformat
@@ -14428,6 +14929,12 @@
   # before this can be enabled.
   hardcode_into_libs=3Dyes
=20
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    ld_extra=3D`$SED -e 's/:,\t/ /g;s/=3D^=3D*$//;s/=3D^=3D * / /g' /etc/l=
d.so.conf`
+    sys_lib_dlsearch_path_spec=3D"/lib /usr/lib $ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -14437,6 +14944,18 @@
   dynamic_linker=3D'GNU/Linux ld.so'
   ;;
=20
+knetbsd*-gnu)
+  version_type=3Dlinux
+  need_lib_prefix=3Dno
+  need_version=3Dno
+  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec=3D'${libname}${release}${shared_ext}$major'
+  shlibpath_var=3DLD_LIBRARY_PATH
+  shlibpath_overrides_runpath=3Dno
+  hardcode_into_libs=3Dyes
+  dynamic_linker=3D'GNU ld.so'
+  ;;
+
 netbsd*)
   version_type=3Dsunos
   need_lib_prefix=3Dno
@@ -14446,7 +14965,7 @@
     finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker=3D'NetBSD (a.out) ld.so'
   else
-    library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${lib=
name}${shared_ext}'
+    library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec=3D'${libname}${release}${shared_ext}$major'
     dynamic_linker=3D'NetBSD ld.elf_so'
   fi
@@ -14462,7 +14981,7 @@
   shlibpath_overrides_runpath=3Dyes
   ;;
=20
-nto-qnx)
+nto-qnx*)
   version_type=3Dlinux
   need_lib_prefix=3Dno
   need_version=3Dno
@@ -14475,7 +14994,7 @@
 openbsd*)
   version_type=3Dsunos
   need_lib_prefix=3Dno
-  need_version=3Dno
+  need_version=3Dyes
   library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${shared_ext}$versuffix'
   finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=3DLD_LIBRARY_PATH
@@ -14567,31 +15086,98 @@
       sys_lib_search_path_spec=3D'/lib /usr/lib /usr/ccs/lib'
       ;;
   esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=3Dlinux
-    library_names_spec=3D'$libname${shared_ext}.$versuffix $libname${share=
d_ext}.$major $libname${shared_ext}'
-    soname_spec=3D'$libname${shared_ext}.$major'
-    shlibpath_var=3DLD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=3Dlinux
-  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec=3D'${libname}${release}${shared_ext}$major'
-  shlibpath_var=3DLD_LIBRARY_PATH
-  ;;
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec ;then
+    version_type=3Dlinux
+    library_names_spec=3D'$libname${shared_ext}.$versuffix $libname${share=
d_ext}.$major $libname${shared_ext}'
+    soname_spec=3D'$libname${shared_ext}.$major'
+    shlibpath_var=3DLD_LIBRARY_PATH
+  fi
+  ;;
+
+uts4*)
+  version_type=3Dlinux
+  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major $libname${shared_ext}'
+  soname_spec=3D'${libname}${release}${shared_ext}$major'
+  shlibpath_var=3DLD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=3Dno
+  ;;
+esac
+echo "$as_me:$LINENO: result: $dynamic_linker" >&5
+echo "${ECHO_T}$dynamic_linker" >&6
+test "$dynamic_linker" =3D no && can_build_shared=3Dno
+
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs=
" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECH=
O_C" >&6
+hardcode_action_F77=3D
+if test -n "$hardcode_libdir_flag_spec_F77" || \
+   test -n "$runpath_var F77" || \
+   test "X$hardcode_automatic_F77"=3D"Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_F77" !=3D no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" !=3D no &&
+     test "$hardcode_minus_L_F77" !=3D no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_F77=3Drelink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_F77=3Dimmediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_F77=3Dunsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
+echo "${ECHO_T}$hardcode_action_F77" >&6
+
+if test "$hardcode_action_F77" =3D relink; then
+  # Fast installation is not supported
+  enable_fast_install=3Dno
+elif test "$shlibpath_overrides_runpath" =3D yes ||
+     test "$enable_shared" =3D no; then
+  # Fast installation is not necessary
+  enable_fast_install=3Dneedless
+fi
+
+striplib=3D
+old_striplib=3D
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C"=
 >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib=3D"$STRIP --strip-debug"
+  test -z "$striplib" && striplib=3D"$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib=3D"$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
=20
-*)
-  dynamic_linker=3Dno
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" =3D no && can_build_shared=3Dno
=20
=20
 # The else clause should only fire when bootstrapping the
@@ -14607,7 +15193,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM =
SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -14737,7 +15324,7 @@
 NM=3D$lt_NM
=20
 # A symbol stripping program
-STRIP=3D$STRIP
+STRIP=3D$lt_STRIP
=20
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=3D$MAGIC_CMD
@@ -14985,7 +15572,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=3D`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
=20
=20
@@ -15044,7 +15634,8 @@
 if test "$GCC" =3D yes; then
   lt_prog_compiler_no_builtin_flag_GCJ=3D' -fno-builtin'
=20
-  echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exce=
ptions" >&5
+
+echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-except=
ions" >&5
 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... =
$ECHO_C" >&6
 if test "${lt_cv_prog_compiler_rtti_exceptions+set}" =3D set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15062,11 +15653,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15065: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15656: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=3D$?
    cat conftest.err >&5
-   echo "$as_me:15069: \$? =3D $ac_status" >&5
+   echo "$as_me:15660: \$? =3D $ac_status" >&5
    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
@@ -15209,12 +15800,12 @@
=20
     linux*)
       case $CC in
-      icc|ecc)
+      icc* | ecc*)
 	lt_prog_compiler_wl_GCJ=3D'-Wl,'
 	lt_prog_compiler_pic_GCJ=3D'-KPIC'
 	lt_prog_compiler_static_GCJ=3D'-static'
         ;;
-      ccc)
+      ccc*)
         lt_prog_compiler_wl_GCJ=3D'-Wl,'
         # All Alpha code is PIC.
         lt_prog_compiler_static_GCJ=3D'-non_shared'
@@ -15276,7 +15867,8 @@
 # Check to make sure the PIC flag actually works.
 #
 if test -n "$lt_prog_compiler_pic_GCJ"; then
-  echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_p=
ic_GCJ works" >&5
+
+echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic=
_GCJ works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ wor=
ks... $ECHO_C" >&6
 if test "${lt_prog_compiler_pic_works_GCJ+set}" =3D set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -15294,11 +15886,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15297: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15889: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=3D$?
    cat conftest.err >&5
-   echo "$as_me:15301: \$? =3D $ac_status" >&5
+   echo "$as_me:15893: \$? =3D $ac_status" >&5
    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
@@ -15345,13 +15937,6 @@
    mkdir out
    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
=20
-   # According to Tom Tromey, Ian Lance Taylor reported there are C compil=
ers
-   # that will create temporary files in the current directory regardless =
of
-   # the output directory.  Thus, making CWD read-only will cause this test
-   # to fail, enabling locking or at least warning the user not to do para=
llel
-   # builds.
-   chmod -w .
-
    lt_compiler_flag=3D"-o out/conftest2.$ac_objext"
    # Insert the option either (1) after the last *FLAGS variable, or
    # (2) before a word containing "conftest.", or (3) at the end.
@@ -15361,11 +15946,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15364: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15949: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=3D$?
    cat out/conftest.err >&5
-   echo "$as_me:15368: \$? =3D $ac_status" >&5
+   echo "$as_me:15953: \$? =3D $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15375,8 +15960,11 @@
      fi
    fi
    chmod u+w .
-   $rm conftest* out/*
-   rmdir out
+   $rm conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
+   $rm out/* && rmdir out
    cd ..
    rmdir conftest
    $rm conftest*
@@ -15535,7 +16123,7 @@
       fi
       ;;
=20
-    netbsd*)
+    netbsd* | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ=3D'$LD -Bshareable $libobjs $deplibs $linker_flags -o $l=
ib'
 	wlarc=3D
@@ -15573,6 +16161,31 @@
       hardcode_shlibpath_var_GCJ=3Dno
       ;;
=20
+  linux*)
+    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; t=
hen
+        tmp_archive_cmds=3D'$CC -shared $libobjs $deplibs $compiler_flags =
${wl}-soname $wl$soname -o $lib'
+	archive_cmds_GCJ=3D"$tmp_archive_cmds"
+      supports_anon_versioning=3Dno
+      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=3Dyes ;; # RH7.3 ...
+        *\ 2.11.92.0.12\ *) supports_anon_versioning=3Dyes ;; # Mandrake 8=
=2E2 ...
+        *\ 2.11.*) ;; # other 2.11 versions
+        *) supports_anon_versioning=3Dyes ;;
+      esac
+      if test $supports_anon_versioning =3D yes; then
+        archive_expsym_cmds_GCJ=3D'$echo "{ global:" > $output_objdir/$lib=
name.ver~
+cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ve=
r~
+$echo "local: *; };" >> $output_objdir/$libname.ver~
+        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$son=
ame ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+      else
+        archive_expsym_cmds_GCJ=3D"$tmp_archive_cmds"
+      fi
+    else
+      ld_shlibs_GCJ=3Dno
+    fi
+    ;;
+
     *)
       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; =
then
 	archive_cmds_GCJ=3D'$CC -shared $libobjs $deplibs $compiler_flags ${wl}-s=
oname $wl$soname -o $lib'
@@ -15701,7 +16314,6 @@
 	allow_undefined_flag_GCJ=3D'-berok'
        # Determine the default libpath from the value encoded in an empty =
executable.
        cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15718,11 +16330,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -15739,7 +16360,8 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
        hardcode_libdir_flag_spec_GCJ=3D'${wl}-blibpath:$libdir:'"$aix_libp=
ath"
@@ -15752,7 +16374,6 @@
 	else
 	 # Determine the default libpath from the value encoded in an empty execu=
table.
 	 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -15769,11 +16390,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -15790,7 +16420,8 @@
 sed 's/^/| /' conftest.$ac_ext >&5
=20
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 if test -z "$aix_libpath"; then aix_libpath=3D"/usr/lib:/lib"; fi
=20
 	 hardcode_libdir_flag_spec_GCJ=3D'${wl}-blibpath:$libdir:'"$aix_libpath"
@@ -15843,20 +16474,27 @@
       ;;
=20
     darwin* | rhapsody*)
-    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
+    if test "$GXX" =3D yes ; then
       archive_cmds_need_lc_GCJ=3Dno
       case "$host_os" in
       rhapsody* | darwin1.[012])
 	allow_undefined_flag_GCJ=3D'-undefined suppress'
 	;;
       *) # Darwin 1.3 on
-	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ=3D'-flat_nam=
espace -undefined suppress'
+      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+      	allow_undefined_flag_GCJ=3D'-flat_namespace -undefined suppress'
+      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag_GCJ=3D'-flat_namespace -undefined suppres=
s'
+            ;;
+          10.*)
+            allow_undefined_flag_GCJ=3D'-undefined dynamic_lookup'
+            ;;
+        esac
+      fi
 	;;
       esac
-      # FIXME: Relying on posixy $() will cause problems for
-      #        cross-compilation, but unfortunately the echo tests do not
-      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangl=
es
-      #	       `"' quotes if we put them in here... so don't!
     	lt_int_apple_cc_single_mod=3Dno
     	output_verbose_link_cmd=3D'echo'
     	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
@@ -15867,19 +16505,21 @@
     	else
         archive_cmds_GCJ=3D'$CC -r ${wl}-bind_at_load -keep_private_extern=
s -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_fl=
ag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$s=
oname $verstring'
       fi
-      module_cmds_GCJ=3D'$CC -bundle ${wl}-bind_at_load $allow_undefined_f=
lag -o $lib $libobjs $deplibs$compiler_flags'
+      module_cmds_GCJ=3D'$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 doe=
sn't exist in older darwin ld's
         if test "X$lt_int_apple_cc_single_mod" =3D Xyes ; then
           archive_expsym_cmds_GCJ=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e=
 "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.exp=
sym~$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
           archive_expsym_cmds_GCJ=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e=
 "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.exp=
sym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-mas=
ter.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
-          module_expsym_cmds_GCJ=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e =
"s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.exps=
ym~$CC -bundle $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_fl=
ags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+          module_expsym_cmds_GCJ=3D'sed -e "s,#.*,," -e "s,^[    ]*,," -e =
"s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.exps=
ym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_fl=
ags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
       hardcode_direct_GCJ=3Dno
       hardcode_automatic_GCJ=3Dyes
       hardcode_shlibpath_var_GCJ=3Dunsupported
       whole_archive_flag_spec_GCJ=3D'-all_load $convenience'
       link_all_deplibs_GCJ=3Dyes
+    else
+      ld_shlibs_GCJ=3Dno
     fi
       ;;
=20
@@ -15913,7 +16553,7 @@
       ;;
=20
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd*)
+    freebsd* | kfreebsd*-gnu)
       archive_cmds_GCJ=3D'$CC -shared -o $lib $libobjs $deplibs $compiler_=
flags'
       hardcode_libdir_flag_spec_GCJ=3D'-R$libdir'
       hardcode_direct_GCJ=3Dyes
@@ -16000,7 +16640,7 @@
       link_all_deplibs_GCJ=3Dyes
       ;;
=20
-    netbsd*)
+    netbsd* | knetbsd*-gnu)
       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 	archive_cmds_GCJ=3D'$LD -Bshareable -o $lib $libobjs $deplibs $linker_fla=
gs'  # a.out
       else
@@ -16273,72 +16913,6 @@
   ;;
 esac
=20
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs=
" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECH=
O_C" >&6
-hardcode_action_GCJ=3D
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var GCJ" || \
-   test "X$hardcode_automatic_GCJ"=3D"Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" !=3D no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" !=3D no &&
-     test "$hardcode_minus_L_GCJ" !=3D no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=3Drelink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=3Dimmediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=3Dunsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
-
-if test "$hardcode_action_GCJ" =3D relink; then
-  # Fast installation is not supported
-  enable_fast_install=3Dno
-elif test "$shlibpath_overrides_runpath" =3D yes ||
-     test "$enable_shared" =3D no; then
-  # Fast installation is not necessary
-  enable_fast_install=3Dneedless
-fi
-
-striplib=3D
-old_striplib=3D
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C"=
 >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib=3D"$STRIP --strip-debug"
-  test -z "$striplib" && striplib=3D"$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib=3D"$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
 echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=3D
@@ -16432,7 +17006,7 @@
 amigaos*)
   library_names_spec=3D'$libname.ixlibrary $libname.a'
   # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval=3D'for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libna=
me=3D`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; te=
st $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib=
 ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary=
=2Ea) || exit 1; done'
+  finish_eval=3D'for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libna=
me=3D`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; te=
st $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib =
${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a =
|| exit 1; done'
   ;;
=20
 beos*)
@@ -16479,7 +17053,7 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec=3D'`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${relea=
se} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=3D"/lib /lib/w32api /usr/lib /usr/local/lib"
+      sys_lib_search_path_spec=3D"/usr/lib /lib/w32api /lib /usr/local/lib"
       ;;
     mingw*)
       # MinGW DLLs use traditional 'lib' prefix
@@ -16518,17 +17092,16 @@
   version_type=3Ddarwin
   need_lib_prefix=3Dno
   need_version=3Dno
-  # FIXME: Relying on posixy $() will cause problems for
-  #        cross-compilation, but unfortunately the echo tests do not
-  #        yet detect zsh echo's removal of \ escapes.
   library_names_spec=3D'${libname}${release}${versuffix}$shared_ext ${libn=
ame}${release}${major}$shared_ext ${libname}$shared_ext'
   soname_spec=3D'${libname}${release}${major}$shared_ext'
   shlibpath_overrides_runpath=3Dyes
   shlibpath_var=3DDYLD_LIBRARY_PATH
   shrext=3D'$(test .$module =3D .yes && echo .so || echo .dylib)'
   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
-  sys_lib_search_path_spec=3D`$CC -print-search-dirs | tr "\n" "$PATH_SEPA=
RATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^librarie=
s:" | sed -e "s/^libraries://" -e "s,=3D/,/,g" -e "s,$PATH_SEPARATOR, ,g" -=
e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  if test "$GCC" =3D yes; then
+    sys_lib_search_path_spec=3D`$CC -print-search-dirs | tr "\n" "$PATH_SE=
PARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^librar=
ies:" | sed -e "s/^libraries://" -e "s,=3D/,/,g" -e "s,$PATH_SEPARATOR, ,g"=
 -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+  else
+    sys_lib_search_path_spec=3D'/lib /usr/lib /usr/local/lib'
   fi
   sys_lib_dlsearch_path_spec=3D'/usr/local/lib /lib /usr/lib'
   ;;
@@ -16546,6 +17119,18 @@
   dynamic_linker=3Dno
   ;;
=20
+kfreebsd*-gnu)
+  version_type=3Dlinux
+  need_lib_prefix=3Dno
+  need_version=3Dno
+  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec=3D'${libname}${release}${shared_ext}$major'
+  shlibpath_var=3DLD_LIBRARY_PATH
+  shlibpath_overrides_runpath=3Dno
+  hardcode_into_libs=3Dyes
+  dynamic_linker=3D'GNU ld.so'
+  ;;
+
 freebsd*)
   objformat=3D`test -x /usr/bin/objformat && /usr/bin/objformat || echo ao=
ut`
   version_type=3Dfreebsd-$objformat
@@ -16689,6 +17274,12 @@
   # before this can be enabled.
   hardcode_into_libs=3Dyes
=20
+  # Append ld.so.conf contents to the search path
+  if test -f /etc/ld.so.conf; then
+    ld_extra=3D`$SED -e 's/:,\t/ /g;s/=3D^=3D*$//;s/=3D^=3D * / /g' /etc/l=
d.so.conf`
+    sys_lib_dlsearch_path_spec=3D"/lib /usr/lib $ld_extra"
+  fi
+
   # We used to test for /lib/ld.so.1 and disable shared libraries on
   # powerpc, because MkLinux only supported shared libraries with the
   # GNU dynamic linker.  Since this was broken with cross compilers,
@@ -16698,6 +17289,18 @@
   dynamic_linker=3D'GNU/Linux ld.so'
   ;;
=20
+knetbsd*-gnu)
+  version_type=3Dlinux
+  need_lib_prefix=3Dno
+  need_version=3Dno
+  library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec=3D'${libname}${release}${shared_ext}$major'
+  shlibpath_var=3DLD_LIBRARY_PATH
+  shlibpath_overrides_runpath=3Dno
+  hardcode_into_libs=3Dyes
+  dynamic_linker=3D'GNU ld.so'
+  ;;
+
 netbsd*)
   version_type=3Dsunos
   need_lib_prefix=3Dno
@@ -16707,7 +17310,7 @@
     finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
     dynamic_linker=3D'NetBSD (a.out) ld.so'
   else
-    library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${lib=
name}${shared_ext}'
+    library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${li=
bname}${release}${shared_ext}$major ${libname}${shared_ext}'
     soname_spec=3D'${libname}${release}${shared_ext}$major'
     dynamic_linker=3D'NetBSD ld.elf_so'
   fi
@@ -16723,7 +17326,7 @@
   shlibpath_overrides_runpath=3Dyes
   ;;
=20
-nto-qnx)
+nto-qnx*)
   version_type=3Dlinux
   need_lib_prefix=3Dno
   need_version=3Dno
@@ -16736,7 +17339,7 @@
 openbsd*)
   version_type=3Dsunos
   need_lib_prefix=3Dno
-  need_version=3Dno
+  need_version=3Dyes
   library_names_spec=3D'${libname}${release}${shared_ext}$versuffix ${libn=
ame}${shared_ext}$versuffix'
   finish_cmds=3D'PATH=3D"\$PATH:/sbin" ldconfig -m $libdir'
   shlibpath_var=3DLD_LIBRARY_PATH
@@ -16854,6 +17457,72 @@
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" =3D no && can_build_shared=3Dno
=20
+echo "$as_me:$LINENO: checking how to hardcode library paths into programs=
" >&5
+echo $ECHO_N "checking how to hardcode library paths into programs... $ECH=
O_C" >&6
+hardcode_action_GCJ=3D
+if test -n "$hardcode_libdir_flag_spec_GCJ" || \
+   test -n "$runpath_var GCJ" || \
+   test "X$hardcode_automatic_GCJ"=3D"Xyes" ; then
+
+  # We can hardcode non-existant directories.
+  if test "$hardcode_direct_GCJ" !=3D no &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" !=3D no &&
+     test "$hardcode_minus_L_GCJ" !=3D no; then
+    # Linking always hardcodes the temporary library directory.
+    hardcode_action_GCJ=3Drelink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    hardcode_action_GCJ=3Dimmediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  hardcode_action_GCJ=3Dunsupported
+fi
+echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
+echo "${ECHO_T}$hardcode_action_GCJ" >&6
+
+if test "$hardcode_action_GCJ" =3D relink; then
+  # Fast installation is not supported
+  enable_fast_install=3Dno
+elif test "$shlibpath_overrides_runpath" =3D yes ||
+     test "$enable_shared" =3D no; then
+  # Fast installation is not necessary
+  enable_fast_install=3Dneedless
+fi
+
+striplib=3D
+old_striplib=3D
+echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C"=
 >&6
+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib=3D"$STRIP --strip-debug"
+  test -z "$striplib" && striplib=3D"$STRIP --strip-unneeded"
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+   darwin*)
+       if test -n "$STRIP" ; then
+         striplib=3D"$STRIP -x"
+         echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+       else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+       ;;
+   *)
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    ;;
+  esac
+fi
+
 if test "x$enable_dlopen" !=3D xyes; then
   enable_dlopen=3Dunknown
   enable_dlopen_self=3Dunknown
@@ -16889,7 +17558,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -16913,11 +17581,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -16930,7 +17607,8 @@
=20
 ac_cv_lib_dl_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -16954,21 +17632,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define shl_load to an innocuous variant, in case <limits.h> declares sh=
l_load.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define shl_load innocuous_shl_load
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef shl_load
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -16999,11 +17684,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -17016,7 +17710,8 @@
=20
 ac_cv_func_shl_load=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
 echo "${ECHO_T}$ac_cv_func_shl_load" >&6
@@ -17031,7 +17726,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17055,11 +17749,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
   ac_status=3D$?
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
-  (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -17072,7 +17775,8 @@
=20
 ac_cv_lib_dld_shl_load=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
@@ -17086,21 +17790,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define dlopen to an innocuous variant, in case <limits.h> declares dlop=
en.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define dlopen innocuous_dlopen
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef dlopen
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -17131,11 +17842,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -17148,7 +17868,8 @@
=20
 ac_cv_func_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
 echo "${ECHO_T}$ac_cv_func_dlopen" >&6
@@ -17163,7 +17884,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17187,11 +17907,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -17204,7 +17933,8 @@
=20
 ac_cv_lib_dl_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
@@ -17220,7 +17950,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-lsvld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17244,11 +17973,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -17261,7 +17999,8 @@
=20
 ac_cv_lib_svld_dlopen=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
@@ -17277,7 +18016,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -17301,11 +18039,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -17318,7 +18065,8 @@
=20
 ac_cv_lib_dld_dld_link=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
@@ -17373,7 +18121,7 @@
   lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
   lt_status=3D$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17376 "configure"
+#line 18124 "configure"
 #include "confdefs.h"
=20
 #if HAVE_DLFCN_H
@@ -17471,7 +18219,7 @@
   lt_dlunknown=3D0; lt_dlno_uscore=3D1; lt_dlneed_uscore=3D2
   lt_status=3D$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17474 "configure"
+#line 18222 "configure"
 #include "confdefs.h"
=20
 #if HAVE_DLFCN_H
@@ -17588,7 +18336,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM =
SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -17718,7 +18467,7 @@
 NM=3D$lt_NM
=20
 # A symbol stripping program
-STRIP=3D$STRIP
+STRIP=3D$lt_STRIP
=20
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=3D$MAGIC_CMD
@@ -17966,7 +18715,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=3D`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
=20
=20
@@ -18029,7 +18781,8 @@
   # Now quote all the things that may contain metacharacters while being
   # careful not to overquote the AC_SUBSTed values.  We take copies of the
   # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM =
SED SHELL \
+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
+    SED SHELL STRIP \
     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
     deplibs_check_method reload_flag reload_cmds need_locks \
@@ -18159,7 +18912,7 @@
 NM=3D$lt_NM
=20
 # A symbol stripping program
-STRIP=3D$STRIP
+STRIP=3D$lt_STRIP
=20
 # Used to examine libraries when file_magic_cmd begins "file"
 MAGIC_CMD=3D$MAGIC_CMD
@@ -18407,7 +19160,10 @@
   # If there is no Makefile yet, we rely on a make rule to execute
   # `config.status --recheck' to rerun these tests and create the
   # libtool script then.
-  test -f Makefile && make "$ltmain"
+  ltmain_in=3D`echo $ltmain | sed -e 's/\.sh$/.in/'`
+  if test -f "$ltmain_in"; then
+    test -f Makefile && make "$ltmain"
+  fi
 fi
=20
=20
@@ -18724,7 +19480,6 @@
   echo $ac_n "cross compiling; assumed OK... $ac_c"
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18823,7 +19578,7 @@
 ( exit $ac_status )
 no_glib=3Dyes
 fi
-rm -f core core.* *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_o=
bjext conftest.$ac_ext
+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext c=
onftest.$ac_ext
 fi
        CFLAGS=3D"$ac_save_CFLAGS"
        LIBS=3D"$ac_save_LIBS"
@@ -18849,7 +19604,6 @@
           CFLAGS=3D"$CFLAGS $GLIB_CFLAGS"
           LIBS=3D"$LIBS $GLIB_LIBS"
           cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -18869,11 +19623,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -18895,7 +19658,8 @@
  echo "*** The test program failed to compile or link. See the file config=
=2Elog for the"
           echo "*** exact error that occured. This usually means GLIB is i=
ncorrectly installed."
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
           CFLAGS=3D"$ac_save_CFLAGS"
           LIBS=3D"$ac_save_LIBS"
        fi
@@ -19052,7 +19816,6 @@
 echo "$as_me:$LINENO: checking $ac_header usability" >&5
 echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19063,11 +19826,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -19080,7 +19852,7 @@
=20
 ac_header_compiler=3Dno
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6
=20
@@ -19088,7 +19860,6 @@
 echo "$as_me:$LINENO: checking $ac_header presence" >&5
 echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19106,6 +19877,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=3D$ac_c_preproc_warn_flag
+    ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=3D
   fi
@@ -19125,33 +19897,32 @@
 echo "${ECHO_T}$ac_header_preproc" >&6
=20
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
     { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler,=
 rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by t=
he preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the prepr=
ocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's resu=
lt" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compi=
ler's result" >&5
+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" =
>&2;}
+    ac_header_preproc=3Dyes
     ;;
-  no:yes )
+  no:yes:* )
     { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be com=
piled" >&5
 echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequ=
isite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?=
" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing pre=
requisite headers?" >&5
+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite head=
ers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf document=
ation" >&5
+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But=
 Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Com=
piled\"" >&2;}
     { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the prepr=
ocessor's result" >&5
 echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's resu=
lt" >&2;}
+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compil=
er will take precedence" >&5
+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take p=
recedence" >&2;}
     (
       cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ------------------------------------------------------------------ ##
+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=3Datk ##
+## ------------------------------------------------------------------ ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -19162,7 +19933,7 @@
 if eval "test \"\${$as_ac_Header+set}\" =3D set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
-  eval "$as_ac_Header=3D$ac_header_preproc"
+  eval "$as_ac_Header=3D\$ac_header_preproc"
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
@@ -19184,7 +19955,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19201,11 +19971,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -19218,7 +19997,8 @@
=20
 am_cv_val_LC_MESSAGES=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
 echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6
@@ -19252,7 +20032,6 @@
 echo "$as_me:$LINENO: checking libintl.h usability" >&5
 echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19263,11 +20042,20 @@
 _ACEOF
 rm -f conftest.$ac_objext
 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
+  (eval $ac_compile) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest.$ac_objext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest.$ac_objext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -19280,7 +20068,7 @@
=20
 ac_header_compiler=3Dno
 fi
-rm -f conftest.$ac_objext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 echo "${ECHO_T}$ac_header_compiler" >&6
=20
@@ -19288,7 +20076,6 @@
 echo "$as_me:$LINENO: checking libintl.h presence" >&5
 echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19306,6 +20093,7 @@
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=3D$ac_c_preproc_warn_flag
+    ac_cpp_err=3D$ac_cpp_err$ac_c_werror_flag
   else
     ac_cpp_err=3D
   fi
@@ -19325,33 +20113,32 @@
 echo "${ECHO_T}$ac_header_preproc" >&6
=20
 # So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc in
-  yes:no )
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
     { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, =
rejected by the preprocessor!" >&5
 echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by th=
e preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the prepro=
cessor's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's resul=
t" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
+    { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compil=
er's result" >&5
+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >=
&2;}
+    ac_header_preproc=3Dyes
     ;;
-  no:yes )
+  no:yes:* )
     { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be comp=
iled" >&5
 echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequi=
site headers?" >&5
-echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?"=
 >&2;}
+    { echo "$as_me:$LINENO: WARNING: libintl.h:     check for missing prer=
equisite headers?" >&5
+echo "$as_me: WARNING: libintl.h:     check for missing prerequisite heade=
rs?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documenta=
tion" >&5
+echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libintl.h:     section \"Present But =
Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: libintl.h:     section \"Present But Cannot Be Comp=
iled\"" >&2;}
     { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the prepro=
cessor's result" >&5
 echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's resul=
t" >&2;}
+    { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compile=
r will take precedence" >&5
+echo "$as_me: WARNING: libintl.h: in the future, the compiler will take pr=
ecedence" >&2;}
     (
       cat <<\_ASBOX
-## ------------------------------------ ##
-## Report this to bug-autoconf@gnu.org. ##
-## ------------------------------------ ##
+## ------------------------------------------------------------------ ##
+## Report this to http://bugzilla.gnome.org/enter_bug.cgi?product=3Datk ##
+## ------------------------------------------------------------------ ##
 _ASBOX
     ) |
       sed "s/^/$as_me: WARNING:     /" >&2
@@ -19381,7 +20168,6 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19400,11 +20186,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -19417,7 +20212,8 @@
=20
 gt_cv_func_dgettext_libc=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
=20
 fi
 echo "$as_me:$LINENO: result: $gt_cv_func_dgettext_libc" >&5
@@ -19434,21 +20230,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $a=
c_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef $ac_func
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -19479,11 +20282,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -19496,7 +20308,8 @@
=20
 eval "$as_ac_var=3Dno"
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -19524,7 +20337,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-lintl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19548,11 +20360,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -19565,7 +20386,8 @@
=20
 ac_cv_lib_intl_bindtextdomain=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5
@@ -19579,7 +20401,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-lintl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19603,11 +20424,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -19620,7 +20450,8 @@
=20
 ac_cv_lib_intl_dgettext=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dgettext" >&5
@@ -19645,7 +20476,6 @@
   ac_check_lib_save_LIBS=3D$LIBS
 LIBS=3D"-lintl -liconv $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
@@ -19669,11 +20499,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -19686,7 +20525,8 @@
=20
 ac_cv_lib_intl_dcgettext=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 LIBS=3D$ac_check_lib_save_LIBS
 fi
 echo "$as_me:$LINENO: result: $ac_cv_lib_intl_dcgettext" >&5
@@ -19719,21 +20559,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $a=
c_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef $ac_func
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -19764,11 +20611,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -19781,7 +20637,8 @@
=20
 eval "$as_ac_var=3Dno"
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -19868,21 +20725,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $a=
c_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef $ac_func
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -19913,11 +20777,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -19930,7 +20803,8 @@
=20
 eval "$as_ac_var=3Dno"
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -20018,29 +20892,38 @@
 echo "${ECHO_T}no" >&6
 fi
=20
-	   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
+	  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
-#include <libintl.h>
+
 int
 main ()
 {
-return (int) bind_textdomain_codeset ("", "")
+extern int _nl_msg_cat_cntr;
+			 return _nl_msg_cat_cntr
   ;
   return 0;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -20060,21 +20943,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits=
=2Eh> declares bind_textdomain_codeset.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char bind_textdomain_codeset (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef bind_textdomain_codeset
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -20105,11 +20995,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -20122,7 +21021,8 @@
=20
 ac_cv_func_bind_textdomain_codeset=3Dno
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
 echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6
@@ -20141,7 +21041,8 @@
 	    ;;
 	    esac
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
           LIBS=3D"$glib_save_LIBS"
 	  INSTOBJEXT=3D.mo
 	else
@@ -20284,21 +21185,28 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
 cat confdefs.h >>conftest.$ac_ext
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $a=
c_func.
+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+#define $ac_func innocuous_$ac_func
+
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.
     Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
     <limits.h> exists even on freestanding compilers.  */
+
 #ifdef __STDC__
 # include <limits.h>
 #else
 # include <assert.h>
 #endif
+
+#undef $ac_func
+
 /* Override any gcc2 internal prototype to avoid an error.  */
 #ifdef __cplusplus
 extern "C"
@@ -20329,11 +21237,20 @@
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
+  (eval $ac_link) 2>conftest.er1
   ac_status=3D$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
   echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
   (exit $ac_status); } &&
-         { ac_try=3D'test -s conftest$ac_exeext'
+	 { ac_try=3D'test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=3D$?
+  echo "$as_me:$LINENO: \$? =3D $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try=3D'test -s conftest$ac_exeext'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=3D$?
@@ -20346,7 +21263,8 @@
=20
 eval "$as_ac_var=3Dno"
 fi
-rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
 fi
 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
@@ -20592,13 +21510,13 @@
       # `set' does not quote correctly, so add quotes (double-quote
       # substitution turns \\\\ into \\, and sed turns \\ into \).
       sed -n \
-        "s/'/'\\\\''/g;
-    	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D'\\2=
'/p"
+	"s/'/'\\\\''/g;
+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D'\\2'/p"
       ;;
     *)
       # `set' quotes correctly as required by POSIX, so do not add quotes.
       sed -n \
-        "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D\\=
2/p"
+	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=3D\\(.*\\)/\\1=3D\\2/p"
       ;;
     esac;
 } |
@@ -20628,13 +21546,13 @@
 # trailing colons and then remove the whole line if VPATH becomes empty
 # (actually we leave an empty line to preserve line numbers).
 if test "x$srcdir" =3D x.; then
-  ac_vpsub=3D'/^[ 	]*VPATH[ 	]*=3D/{
+  ac_vpsub=3D'/^[	 ]*VPATH[	 ]*=3D/{
 s/:*\$(srcdir):*/:/;
 s/:*\${srcdir}:*/:/;
 s/:*@srcdir@:*/:/;
-s/^\([^=3D]*=3D[ 	]*\):*/\1/;
+s/^\([^=3D]*=3D[	 ]*\):*/\1/;
 s/:*$//;
-s/^[^=3D]*=3D[ 	]*$//;
+s/^[^=3D]*=3D[	 ]*$//;
 }'
 fi
=20
@@ -20645,7 +21563,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" =3D x: && continue
   # 1. Remove the extension, and $U if already installed.
   ac_i=3D`echo "$ac_i" |
-         sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
+	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
   # 2. Add them.
   ac_libobjs=3D"$ac_libobjs $ac_i\$U.$ac_objext"
   ac_ltlibobjs=3D"$ac_ltlibobjs $ac_i"'$U.lo'
@@ -20745,9 +21663,10 @@
 elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
   set -o posix
 fi
+DUALCASE=3D1; export DUALCASE # for MKS sh
=20
 # Support unset when possible.
-if (FOO=3DFOO; unset FOO) >/dev/null 2>&1; then
+if ( (MAIL=3D60; unset MAIL) || exit) >/dev/null 2>&1; then
   as_unset=3Dunset
 else
   as_unset=3Dfalse
@@ -20766,7 +21685,7 @@
   LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   LC_TELEPHONE LC_TIME
 do
-  if (set +x; test -n "`(eval $as_var=3DC; export $as_var) 2>&1`"); then
+  if (set +x; test -z "`(eval $as_var=3DC; export $as_var) 2>&1`"); then
     eval $as_var=3DC; export $as_var
   else
     $as_unset $as_var
@@ -20945,16 +21864,17 @@
 if mkdir -p . 2>/dev/null; then
   as_mkdir_p=3D:
 else
+  test -d ./-p && rmdir ./-p
   as_mkdir_p=3Dfalse
 fi
=20
 as_executable_p=3D"test -f"
=20
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp=3D"sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g"
+as_tr_cpp=3D"eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnu=
m]%_%g'"
=20
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh=3D"sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g"
+as_tr_sh=3D"eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
=20
=20
 # IFS
@@ -20981,7 +21901,7 @@
 cat >&5 <<_CSEOF
=20
 This file was extended by atk $as_me 1.6.1, which was
-generated by GNU Autoconf 2.57.  Invocation command line was
+generated by GNU Autoconf 2.59.  Invocation command line was
=20
   CONFIG_FILES    =3D $CONFIG_FILES
   CONFIG_HEADERS  =3D $CONFIG_HEADERS
@@ -21025,9 +21945,9 @@
   -d, --debug      don't remove temporary files
       --recheck    update $as_me by reconfiguring in the same conditions
   --file=3DFILE[:TEMPLATE]
-                   instantiate the configuration file FILE
+		   instantiate the configuration file FILE
   --header=3DFILE[:TEMPLATE]
-                   instantiate the configuration header FILE
+		   instantiate the configuration header FILE
=20
 Configuration files:
 $config_files
@@ -21044,11 +21964,10 @@
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version=3D"\\
 atk config.status 1.6.1
-configured by $0, generated by GNU Autoconf 2.57,
+configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`=
\\"
=20
-Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001
-Free Software Foundation, Inc.
+Copyright (C) 2003 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 srcdir=3D$srcdir
@@ -21272,6 +22191,7 @@
 s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
 s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
+s,@am__leading_dot@,$am__leading_dot,;t t
 s,@GLIB_REQUIRED_VERSION@,$GLIB_REQUIRED_VERSION,;t t
 s,@ATK_MAJOR_VERSION@,$ATK_MAJOR_VERSION,;t t
 s,@ATK_MINOR_VERSION@,$ATK_MINOR_VERSION,;t t
@@ -21401,9 +22321,9 @@
       (echo ':t
   /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_=
frag.sed
       if test -z "$ac_sed_cmds"; then
-  	ac_sed_cmds=3D"sed -f $tmp/subs-$ac_sed_frag.sed"
+	ac_sed_cmds=3D"sed -f $tmp/subs-$ac_sed_frag.sed"
       else
-  	ac_sed_cmds=3D"$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
+	ac_sed_cmds=3D"$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
       fi
       ac_sed_frag=3D`expr $ac_sed_frag + 1`
       ac_beg=3D$ac_end
@@ -21421,21 +22341,21 @@
   # Support "outfile[:infile[:infile...]]", defaulting infile=3D"outfile.i=
n".
   case $ac_file in
   - | *:- | *:-:* ) # input from stdin
-        cat >$tmp/stdin
-        ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
+	cat >$tmp/stdin
+	ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
   *:* ) ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
+	ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
   * )   ac_file_in=3D$ac_file.in ;;
   esac
=20
   # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
   ac_dir=3D`(dirname "$ac_file") 2>/dev/null ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$ac_file" : 'X\(//\)[^/]' \| \
-         X"$ac_file" : 'X\(//\)$' \| \
-         X"$ac_file" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21451,10 +22371,10 @@
       as_dirs=3D"$as_dir $as_dirs"
       as_dir=3D`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$as_dir" : 'X\(//\)[^/]' \| \
-         X"$as_dir" : 'X\(//\)$' \| \
-         X"$as_dir" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21492,12 +22412,45 @@
     ac_srcdir=3D$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=3D$ac_top_builddir$srcdir ;;
 esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can =
be
-# absolute.
-ac_abs_builddir=3D`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=3D`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=3D`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=3D`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir=3D"$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=3D`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir=3D"$ac_dir";;
+  *) ac_abs_builddir=3D`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=3D$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=3D$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=3D$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=3D$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=3D$ac_srcdir;;
+  *) ac_abs_srcdir=3D$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=3D$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=3D$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
=20
=20
   case $INSTALL in
@@ -21505,11 +22458,6 @@
   *) ac_INSTALL=3D$ac_top_builddir$INSTALL ;;
   esac
=20
-  if test x"$ac_file" !=3D x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -21519,7 +22467,7 @@
     configure_input=3D"$ac_file.  "
   fi
   configure_input=3D$configure_input"Generated from `echo $ac_file_in |
-                                     sed 's,.*/,,'` by configure."
+				     sed 's,.*/,,'` by configure."
=20
   # First look for the input files in the build tree, otherwise in the
   # src tree.
@@ -21528,26 +22476,32 @@
       case $f in
       -) echo $tmp/stdin ;;
       [\\/$]*)
-         # Absolute (can't be DOS-style, as IFS=3D:)
-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find inpu=
t file: $f" >&5
+	 # Absolute (can't be DOS-style, as IFS=3D:)
+	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file:=
 $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-         echo $f;;
+	 echo "$f";;
       *) # Relative
-         if test -f "$f"; then
-           # Build tree
-           echo $f
-         elif test -f "$srcdir/$f"; then
-           # Source tree
-           echo $srcdir/$f
-         else
-           # /dev/null tree
-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+	 if test -f "$f"; then
+	   # Build tree
+	   echo "$f"
+	 elif test -f "$srcdir/$f"; then
+	   # Source tree
+	   echo "$srcdir/$f"
+	 else
+	   # /dev/null tree
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-         fi;;
+	 fi;;
       esac
     done` || { (exit 1); exit 1; }
+
+  if test x"$ac_file" !=3D x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
@@ -21587,12 +22541,12 @@
 # NAME is the cpp macro being defined and VALUE is the value it is being g=
iven.
 #
 # ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA=3D's,^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB=3D'[ 	].*$,\1#\2'
+ac_dA=3D's,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
+ac_dB=3D'[	 ].*$,\1#\2'
 ac_dC=3D' '
 ac_dD=3D',;t'
 # ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALU=
E".
-ac_uA=3D's,^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+ac_uA=3D's,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
 ac_uB=3D'$,\1#\2define\3'
 ac_uC=3D' '
 ac_uD=3D',;t'
@@ -21601,11 +22555,11 @@
   # Support "outfile[:infile[:infile...]]", defaulting infile=3D"outfile.i=
n".
   case $ac_file in
   - | *:- | *:-:* ) # input from stdin
-        cat >$tmp/stdin
-        ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
+	cat >$tmp/stdin
+	ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
+	ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
   *:* ) ac_file_in=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
-        ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
+	ac_file=3D`echo "$ac_file" | sed 's,:.*,,'` ;;
   * )   ac_file_in=3D$ac_file.in ;;
   esac
=20
@@ -21619,28 +22573,29 @@
       case $f in
       -) echo $tmp/stdin ;;
       [\\/$]*)
-         # Absolute (can't be DOS-style, as IFS=3D:)
-         test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find inpu=
t file: $f" >&5
+	 # Absolute (can't be DOS-style, as IFS=3D:)
+	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file:=
 $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-         echo $f;;
+	 # Do quote $f, to prevent DOS paths from being IFS'd.
+	 echo "$f";;
       *) # Relative
-         if test -f "$f"; then
-           # Build tree
-           echo $f
-         elif test -f "$srcdir/$f"; then
-           # Source tree
-           echo $srcdir/$f
-         else
-           # /dev/null tree
-           { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
+	 if test -f "$f"; then
+	   # Build tree
+	   echo "$f"
+	 elif test -f "$srcdir/$f"; then
+	   # Source tree
+	   echo "$srcdir/$f"
+	 else
+	   # /dev/null tree
+	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
-         fi;;
+	 fi;;
       esac
     done` || { (exit 1); exit 1; }
   # Remove the trailing spaces.
-  sed 's/[ 	]*$//' $ac_file_inputs >$tmp/in
+  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
=20
 _ACEOF
=20
@@ -21663,9 +22618,9 @@
 s,[\\$`],\\&,g
 t clear
 : clear
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*\)\(([^)]*)\)[ 	]*\(.*\)$,${ac=
_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac=
_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
 t end
-s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\)$,${ac_dA}\1${ac_dB=
}\1${ac_dC}\2${ac_dD},gp
+s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB=
}\1${ac_dC}\2${ac_dD},gp
 : end
 _ACEOF
 # If some macros were called several times there might be several times
@@ -21679,13 +22634,13 @@
 # example, in the case of _POSIX_SOURCE, which is predefined and required
 # on some systems where configure will not decide to define it.
 cat >>conftest.undefs <<\_ACEOF
-s,^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
+s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
 _ACEOF
=20
 # Break up conftest.defines because some shells have a limit on the size
 # of here documents, and old seds have small limits too (100 cmds).
 echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_S=
TATUS
-echo '  if grep "^[ 	]*#[ 	]*define" $tmp/in >/dev/null; then' >>$CONFIG_S=
TATUS
+echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_S=
TATUS
 echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_S=
TATUS
 echo '  :' >>$CONFIG_STATUS
 rm -f conftest.tail
@@ -21694,7 +22649,7 @@
   # Write a limited-size here document to $tmp/defines.sed.
   echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
   # Speed up: don't consider the non `#define' lines.
-  echo '/^[ 	]*#[ 	]*define/!b' >>$CONFIG_STATUS
+  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
   # Work around the forget-to-reset-the-flag bug.
   echo 't clr' >>$CONFIG_STATUS
   echo ': clr' >>$CONFIG_STATUS
@@ -21721,7 +22676,7 @@
   # Write a limited-size here document to $tmp/undefs.sed.
   echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
   # Speed up: don't consider the non `#undef'
-  echo '/^[ 	]*#[ 	]*undef/!b' >>$CONFIG_STATUS
+  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
   # Work around the forget-to-reset-the-flag bug.
   echo 't clr' >>$CONFIG_STATUS
   echo ': clr' >>$CONFIG_STATUS
@@ -21755,10 +22710,10 @@
     else
       ac_dir=3D`(dirname "$ac_file") 2>/dev/null ||
 $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$ac_file" : 'X\(//\)[^/]' \| \
-         X"$ac_file" : 'X\(//\)$' \| \
-         X"$ac_file" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$ac_file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21774,10 +22729,10 @@
       as_dirs=3D"$as_dir $as_dirs"
       as_dir=3D`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$as_dir" : 'X\(//\)[^/]' \| \
-         X"$as_dir" : 'X\(//\)$' \| \
-         X"$as_dir" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21797,13 +22752,22 @@
     cat $tmp/config.h
     rm -f $tmp/config.h
   fi
-_am_stamp_count=3D`expr ${_am_stamp_count-0} + 1`
+# Compute $ac_file's index in $config_headers.
+_am_stamp_count=3D1
+for _am_header in $config_headers :; do
+  case $_am_header in
+    $ac_file | $ac_file:* )
+      break ;;
+    * )
+      _am_stamp_count=3D`expr $_am_stamp_count + 1` ;;
+  esac
+done
 echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
 $as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X$ac_file : 'X\(//\)[^/]' \| \
-         X$ac_file : 'X\(//\)$' \| \
-         X$ac_file : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X$ac_file : 'X\(//\)[^/]' \| \
+	 X$ac_file : 'X\(//\)$' \| \
+	 X$ac_file : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X$ac_file |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21822,16 +22786,41 @@
   ac_source=3D`echo "$ac_file" | sed 's,[^:]*:,,'`
   ac_dir=3D`(dirname "$ac_dest") 2>/dev/null ||
 $as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$ac_dest" : 'X\(//\)[^/]' \| \
-         X"$ac_dest" : 'X\(//\)$' \| \
-         X"$ac_dest" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$ac_dest" : 'X\(//\)[^/]' \| \
+	 X"$ac_dest" : 'X\(//\)$' \| \
+	 X"$ac_dest" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$ac_dest" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
   	  /^X\(\/\/\)$/{ s//\1/; q; }
   	  /^X\(\/\).*/{ s//\1/; q; }
   	  s/.*/./; q'`
+  { if $as_mkdir_p; then
+    mkdir -p "$ac_dir"
+  else
+    as_dir=3D"$ac_dir"
+    as_dirs=3D
+    while test ! -d "$as_dir"; do
+      as_dirs=3D"$as_dir $as_dirs"
+      as_dir=3D`(dirname "$as_dir") 2>/dev/null ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
+echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    done
+    test ! -n "$as_dirs" || mkdir $as_dirs
+  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir=
\"" >&5
+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+   { (exit 1); exit 1; }; }; }
+
   ac_builddir=3D.
=20
 if test "$ac_dir" !=3D .; then
@@ -21857,12 +22846,45 @@
     ac_srcdir=3D$ac_top_builddir$srcdir$ac_dir_suffix
     ac_top_srcdir=3D$ac_top_builddir$srcdir ;;
 esac
-# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can =
be
-# absolute.
-ac_abs_builddir=3D`cd "$ac_dir" && cd $ac_builddir && pwd`
-ac_abs_top_builddir=3D`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
-ac_abs_srcdir=3D`cd "$ac_dir" && cd $ac_srcdir && pwd`
-ac_abs_top_srcdir=3D`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
+
+# Do not use `cd foo && pwd` to compute absolute paths, because
+# the directories may not exist.
+case `pwd` in
+.) ac_abs_builddir=3D"$ac_dir";;
+*)
+  case "$ac_dir" in
+  .) ac_abs_builddir=3D`pwd`;;
+  [\\/]* | ?:[\\/]* ) ac_abs_builddir=3D"$ac_dir";;
+  *) ac_abs_builddir=3D`pwd`/"$ac_dir";;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+*)
+  case ${ac_top_builddir}. in
+  .) ac_abs_top_builddir=3D$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=3D${ac_top_builddir}.;;
+  *) ac_abs_top_builddir=3D$ac_abs_builddir/${ac_top_builddir}.;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_srcdir=3D$ac_srcdir;;
+*)
+  case $ac_srcdir in
+  .) ac_abs_srcdir=3D$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=3D$ac_srcdir;;
+  *) ac_abs_srcdir=3D$ac_abs_builddir/$ac_srcdir;;
+  esac;;
+esac
+case $ac_abs_builddir in
+.) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+*)
+  case $ac_top_srcdir in
+  .) ac_abs_top_srcdir=3D$ac_abs_builddir;;
+  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=3D$ac_top_srcdir;;
+  *) ac_abs_top_srcdir=3D$ac_abs_builddir/$ac_top_srcdir;;
+  esac;;
+esac
=20
=20
   { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
@@ -21880,10 +22902,10 @@
   if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
     dirpart=3D`(dirname "$mf") 2>/dev/null ||
 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$mf" : 'X\(//\)[^/]' \| \
-         X"$mf" : 'X\(//\)$' \| \
-         X"$mf" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$mf" : 'X\(//\)[^/]' \| \
+	 X"$mf" : 'X\(//\)$' \| \
+	 X"$mf" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$mf" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21919,10 +22941,10 @@
     test -f "$dirpart/$file" && continue
     fdir=3D`(dirname "$file") 2>/dev/null ||
 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$file" : 'X\(//\)[^/]' \| \
-         X"$file" : 'X\(//\)$' \| \
-         X"$file" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$file" : 'X\(//\)[^/]' \| \
+	 X"$file" : 'X\(//\)$' \| \
+	 X"$file" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$file" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
@@ -21938,10 +22960,10 @@
       as_dirs=3D"$as_dir $as_dirs"
       as_dir=3D`(dirname "$as_dir") 2>/dev/null ||
 $as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X"$as_dir" : 'X\(//\)[^/]' \| \
-         X"$as_dir" : 'X\(//\)$' \| \
-         X"$as_dir" : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| \
+	 .     : '\(.\)' 2>/dev/null ||
 echo X"$as_dir" |
     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
   	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
diff -ur atk-1.6.1.old/ltmain.sh atk-1.6.1/ltmain.sh
--- atk-1.6.1.old/ltmain.sh	2003-05-23 10:59:21.000000000 +0200
+++ atk-1.6.1/ltmain.sh	2004-07-21 16:09:31.000000000 +0200
@@ -55,8 +55,8 @@
 # Constants.
 PROGRAM=3Dltmain.sh
 PACKAGE=3Dlibtool
-VERSION=3D1.5
-TIMESTAMP=3D" (1.1220 2003/04/05 19:32:58)"
+VERSION=3D1.5.2
+TIMESTAMP=3D" (1.1220.2.60 2004/01/25 12:25:08) Debian$Rev: 192 $"
=20
 default_mode=3D
 help=3D"Try \`$progname --help' for more information."
@@ -70,8 +70,8 @@
 Xsed=3D"${SED}"' -e 1s/^X//'
 sed_quote_subst=3D's/\([\\`\\"$\\\\]\)/\\\1/g'
 # test EBCDIC or ASCII
-case `echo A|od -x` in
- *[Cc]1*) # EBCDIC based system
+case `echo A|tr A '\301'` in
+ A) # EBCDIC based system
   SP2NL=3D"tr '\100' '\n'"
   NL2SP=3D"tr '\r\n' '\100\100'"
   ;;
@@ -94,7 +94,8 @@
 fi
=20
 # Make sure IFS has a sensible default
-: ${IFS=3D" 	"}
+: ${IFS=3D" =09
+"}
=20
 if test "$build_libtool_libs" !=3D yes && test "$build_old_libs" !=3D yes;=
 then
   $echo "$modename: not configured to build any kind of library" 1>&2
@@ -176,6 +177,7 @@
       ;;
     tag)
       tagname=3D"$arg"
+      preserve_args=3D"${preserve_args}=3D$arg"
=20
       # Check whether tagname contains only valid characters
       case $tagname in
@@ -238,6 +240,7 @@
   --debug)
     $echo "$progname: enabling shell trace mode"
     set -x
+    preserve_args=3D"$preserve_args $arg"
     ;;
=20
   --dry-run | -n)
@@ -268,6 +271,7 @@
=20
   --quiet | --silent)
     show=3D:
+    preserve_args=3D"$preserve_args $arg"
     ;;
=20
   --tag) prevopt=3D"--tag" prev=3Dtag ;;
@@ -275,6 +279,7 @@
     set tag "$optarg" ${1+"$@"}
     shift
     prev=3Dtag
+    preserve_args=3D"$preserve_args --tag"
     ;;
=20
   -dlopen)
@@ -369,9 +374,11 @@
     # Get the compilation command and the source file.
     base_compile=3D
     srcfile=3D"$nonopt"  #  always keep a non-empty value in "srcfile"
+    suppress_opt=3Dyes
     suppress_output=3D
     arg_mode=3Dnormal
     libobj=3D
+    later=3D
=20
     for arg
     do
@@ -400,18 +407,13 @@
 	  continue
 	  ;;
=20
-	-static)
-	  build_old_libs=3Dyes
+	-static | -prefer-pic | -prefer-non-pic)
+	  later=3D"$later $arg"
 	  continue
 	  ;;
=20
-	-prefer-pic)
-	  pic_mode=3Dyes
-	  continue
-	  ;;
-
-	-prefer-non-pic)
-	  pic_mode=3Dno
+	-no-suppress)
+	  suppress_opt=3Dno
 	  continue
 	  ;;
=20
@@ -556,6 +558,25 @@
       esac
     fi
=20
+    for arg in $later; do
+      case $arg in
+      -static)
+	build_old_libs=3Dyes
+	continue
+	;;
+
+      -prefer-pic)
+	pic_mode=3Dyes
+	continue
+	;;
+
+      -prefer-non-pic)
+	pic_mode=3Dno
+	continue
+	;;
+      esac
+    done
+
     objname=3D`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
     xdir=3D`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
     if test "X$xdir" =3D "X$obj"; then
@@ -722,7 +743,9 @@
 EOF
=20
       # Allow error messages only from the first compilation.
-      suppress_output=3D' >/dev/null 2>&1'
+      if test "$suppress_opt" =3D yes; then
+        suppress_output=3D' >/dev/null 2>&1'
+      fi
     else
       # No PIC object so indicate it doesn't exist in the libtool
       # object file.
@@ -835,7 +858,7 @@
       ;;
     esac
     libtool_args=3D"$nonopt"
-    base_compile=3D"$nonopt"
+    base_compile=3D"$nonopt $@"
     compile_command=3D"$nonopt"
     finalize_command=3D"$nonopt"
=20
@@ -867,6 +890,7 @@
     no_install=3Dno
     objs=3D
     non_pic_objects=3D
+    precious_files_regex=3D
     prefer_static_libs=3Dno
     preload=3Dno
     prev=3D
@@ -880,6 +904,47 @@
     vinfo=3D
     vinfo_number=3Dno
=20
+    # Infer tagged configuration to use if any are available and
+    # if one wasn't chosen via the "--tag" command line option.
+    # Only attempt this if the compiler in the base link
+    # command doesn't match the default compiler.
+    if test -n "$available_tags" && test -z "$tagname"; then
+      case $base_compile in
+      # Blanks in the command may have been stripped by the calling shell,
+      # but not from the CC environment variable when configure was run.
+      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+      # Blanks at the start of $base_compile will cause this to fail
+      # if we don't check for them as well.
+      *)
+	for z in $available_tags; do
+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+	    # Evaluate the configuration.
+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ###=
 END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+	    case $base_compile in
+	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+	      # The compiler in $compile_command matches
+	      # the one in the tagged configuration.
+	      # Assume this is the tagged configuration we want.
+	      tagname=3D$z
+	      break
+	      ;;
+	    esac
+	  fi
+	done
+	# If $tagname still isn't set, then no tagged configuration
+	# was found and let the user know that the "--tag" command
+	# line option must be used.
+	if test -z "$tagname"; then
+	  $echo "$modename: unable to infer tagged configuration"
+	  $echo "$modename: specify a tag with \`--tag'" 1>&2
+	  exit 1
+#       else
+#         $echo "$modename: using $tagname tagged configuration"
+	fi
+	;;
+      esac
+    fi
+
     # We need to know -static, to get the right output filenames.
     for arg
     do
@@ -911,7 +976,6 @@
     # Go through the arguments, transforming them on the way.
     while test "$#" -gt 0; do
       arg=3D"$1"
-      base_compile=3D"$base_compile $arg"
       shift
       case $arg in
       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
@@ -990,6 +1054,11 @@
 	  prev=3D
 	  continue
 	  ;;
+	precious_regex)
+	  precious_files_regex=3D"$arg"
+	  prev=3D
+	  continue
+	  ;;
 	release)
 	  release=3D"-$arg"
 	  prev=3D
@@ -1287,6 +1356,11 @@
 	continue
 	;;
=20
+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	deplibs=3D"$deplibs $arg"
+	continue
+	;;
+
       -module)
 	module=3Dyes
 	continue
@@ -1351,6 +1425,11 @@
=20
       -o) prev=3Doutput ;;
=20
+      -precious-files-regex)
+	prev=3Dprecious_regex
+	continue
+	;;
+
       -release)
 	prev=3Drelease
 	continue
@@ -1619,47 +1698,6 @@
       exit 1
     fi
=20
-    # Infer tagged configuration to use if any are available and
-    # if one wasn't chosen via the "--tag" command line option.
-    # Only attempt this if the compiler in the base link
-    # command doesn't match the default compiler.
-    if test -n "$available_tags" && test -z "$tagname"; then
-      case $base_compile in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ###=
 END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
-	    case $base_compile in
-	    "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
-	      # The compiler in $compile_command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=3D$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit 1
-#       else
-#         $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-
     if test "$export_dynamic" =3D yes && test -n "$export_dynamic_flag_spe=
c"; then
       eval arg=3D\"$export_dynamic_flag_spec\"
       compile_command=3D"$compile_command $arg"
@@ -1802,6 +1840,15 @@
 	lib=3D
 	found=3Dno
 	case $deplib in
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+	  if test "$linkmode,$pass" =3D "prog,link"; then
+	    compile_deplibs=3D"$deplib $compile_deplibs"
+	    finalize_deplibs=3D"$deplib $finalize_deplibs"
+	  else
+	    deplibs=3D"$deplib $deplibs"
+	  fi
+	  continue
+	  ;;
 	-l*)
 	  if test "$linkmode" !=3D lib && test "$linkmode" !=3D prog; then
 	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
@@ -1813,12 +1860,18 @@
 	  fi
 	  name=3D`$echo "X$deplib" | $Xsed -e 's/^-l//'`
 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_p=
ath $shlib_search_path; do
-	    # Search the libtool library
-	    lib=3D"$searchdir/lib${name}.la"
-	    if test -f "$lib"; then
-	      found=3Dyes
-	      break
-	    fi
+	    for search_ext in .la $shrext .so .a; do
+	      # Search the libtool library
+	      lib=3D"$searchdir/lib${name}${search_ext}"
+	      if test -f "$lib"; then
+		if test "$search_ext" =3D ".la"; then
+		  found=3Dyes
+		else
+		  found=3Dno
+		fi
+		break 2
+	      fi
+	    done
 	  done
 	  if test "$found" !=3D yes; then
 	    # deplib doesn't seem to be a libtool library
@@ -2279,9 +2332,10 @@
 	    else
 	      $show "extracting exported symbol list from \`$soname'"
 	      save_ifs=3D"$IFS"; IFS=3D'~'
-	      eval cmds=3D\"$extract_expsyms_cmds\"
+	      cmds=3D$extract_expsyms_cmds
 	      for cmd in $cmds; do
 		IFS=3D"$save_ifs"
+		eval cmd=3D\"$cmd\"
 		$show "$cmd"
 		$run eval "$cmd" || exit $?
 	      done
@@ -2292,9 +2346,10 @@
 	    if test -f "$output_objdir/$newlib"; then :; else
 	      $show "generating import library for \`$soname'"
 	      save_ifs=3D"$IFS"; IFS=3D'~'
-	      eval cmds=3D\"$old_archive_from_expsyms_cmds\"
+	      cmds=3D$old_archive_from_expsyms_cmds
 	      for cmd in $cmds; do
 		IFS=3D"$save_ifs"
+		eval cmd=3D\"$cmd\"
 		$show "$cmd"
 		$run eval "$cmd" || exit $?
 	      done
@@ -2352,7 +2407,7 @@
 		if test -n "$inst_prefix_dir"; then
 		  case "$libdir" in
 		    [\\/]*)
-		      add_dir=3D"-L$inst_prefix_dir$libdir $add_dir"
+		      add_dir=3D"$add_dir -L$inst_prefix_dir$libdir"
 		      ;;
 		  esac
 		fi
@@ -2424,7 +2479,7 @@
 	      if test -n "$inst_prefix_dir"; then
 		case "$libdir" in
 		  [\\/]*)
-		    add_dir=3D"-L$inst_prefix_dir$libdir $add_dir"
+		    add_dir=3D"$add_dir -L$inst_prefix_dir$libdir"
 		    ;;
 		esac
 	      fi
@@ -2568,9 +2623,13 @@
 		    if test -f "$path/$depdepl" ; then
 		      depdepl=3D"$path/$depdepl"
 		   fi
-		    newlib_search_path=3D"$newlib_search_path $path"
-		    path=3D""
+		    # do not add paths which are already there
+		    case " $newlib_search_path " in
+		    *" $path "*) ;;
+		    *) newlib_search_path=3D"$newlib_search_path $path";;
+		    esac
 		  fi
+		  path=3D""
 		  ;;
 		*)
 		path=3D"-L$path"
@@ -3038,6 +3097,10 @@
 	    *.$objext)
 	       ;;
 	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objd=
ir/${libname}${release}.*)
+	       if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+	       then
+		 continue
+	       fi
 	       removelist=3D"$removelist $p"
 	       ;;
 	    *) ;;
@@ -3547,10 +3610,11 @@
 	    $show "generating symbol list for \`$libname.la'"
 	    export_symbols=3D"$output_objdir/$libname.exp"
 	    $run $rm $export_symbols
-	    eval cmds=3D\"$export_symbols_cmds\"
+	    cmds=3D$export_symbols_cmds
 	    save_ifs=3D"$IFS"; IFS=3D'~'
 	    for cmd in $cmds; do
 	      IFS=3D"$save_ifs"
+	      eval cmd=3D\"$cmd\"
 	      if len=3D`expr "X$cmd" : ".*"` &&
 	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	        $show "$cmd"
@@ -3667,19 +3731,23 @@
 	# Do each of the archive commands.
 	if test "$module" =3D yes && test -n "$module_cmds" ; then
 	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval cmds=3D\"$module_expsym_cmds\"
+	    eval test_cmds=3D\"$module_expsym_cmds\"
+	    cmds=3D$module_expsym_cmds
 	  else
-	    eval cmds=3D\"$module_cmds\"
+	    eval test_cmds=3D\"$module_cmds\"
+	    cmds=3D$module_cmds
 	  fi
 	else
 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval cmds=3D\"$archive_expsym_cmds\"
+	  eval test_cmds=3D\"$archive_expsym_cmds\"
+	  cmds=3D$archive_expsym_cmds
 	else
-	  eval cmds=3D\"$archive_cmds\"
+	  eval test_cmds=3D\"$archive_cmds\"
+	  cmds=3D$archive_cmds
 	  fi
 	fi
=20
-	if test "X$skipped_export" !=3D "X:" && len=3D`expr "X$cmds" : ".*"` &&
+	if test "X$skipped_export" !=3D "X:" && len=3D`expr "X$test_cmds" : ".*"`=
 &&
 	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  :
 	else
@@ -3764,6 +3832,7 @@
 	  save_ifs=3D"$IFS"; IFS=3D'~'
 	  for cmd in $concat_cmds; do
 	    IFS=3D"$save_ifs"
+	    eval cmd=3D\"$cmd\"
 	    $show "$cmd"
 	    $run eval "$cmd" || exit $?
 	  done
@@ -3780,19 +3849,28 @@
 	  # value of $libobjs for piecewise linking.
=20
 	  # Do each of the archive commands.
+	  if test "$module" =3D yes && test -n "$module_cmds" ; then
+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+	      cmds=3D$module_expsym_cmds
+	    else
+	      cmds=3D$module_cmds
+	    fi
+	  else
 	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    eval cmds=3D\"$archive_expsym_cmds\"
+	    cmds=3D$archive_expsym_cmds
 	  else
-	    eval cmds=3D\"$archive_cmds\"
+	    cmds=3D$archive_cmds
+	    fi
 	  fi
=20
 	  # Append the command to remove the reloadable object files
 	  # to the just-reset $cmds.
-	  eval cmds=3D\"\$cmds~$rm $delfiles\"
+	  eval cmds=3D\"\$cmds~\$rm $delfiles\"
 	fi
 	save_ifs=3D"$IFS"; IFS=3D'~'
 	for cmd in $cmds; do
 	  IFS=3D"$save_ifs"
+	  eval cmd=3D\"$cmd\"
 	  $show "$cmd"
 	  $run eval "$cmd" || exit $?
 	done
@@ -3943,10 +4021,11 @@
       reload_objs=3D"$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xse=
d -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_=
objs" ### testsuite: skip nested quoting test
=20
       output=3D"$obj"
-      eval cmds=3D\"$reload_cmds\"
+      cmds=3D$reload_cmds
       save_ifs=3D"$IFS"; IFS=3D'~'
       for cmd in $cmds; do
 	IFS=3D"$save_ifs"
+	eval cmd=3D\"$cmd\"
 	$show "$cmd"
 	$run eval "$cmd" || exit $?
       done
@@ -3979,10 +4058,11 @@
 	# Only do commands if we really have different PIC objects.
 	reload_objs=3D"$libobjs $reload_conv_objs"
 	output=3D"$libobj"
-	eval cmds=3D\"$reload_cmds\"
+	cmds=3D$reload_cmds
 	save_ifs=3D"$IFS"; IFS=3D'~'
 	for cmd in $cmds; do
 	  IFS=3D"$save_ifs"
+	  eval cmd=3D\"$cmd\"
 	  $show "$cmd"
 	  $run eval "$cmd" || exit $?
 	done
@@ -4954,13 +5034,13 @@
=20
       # Do each command in the archive commands.
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs=
" =3D yes; then
-	eval cmds=3D\"$old_archive_from_new_cmds\"
+       cmds=3D$old_archive_from_new_cmds
       else
 	eval cmds=3D\"$old_archive_cmds\"
=20
 	if len=3D`expr "X$cmds" : ".*"` &&
 	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
+	  cmds=3D$old_archive_cmds
 	else
 	  # the command line is too long to link in one step, link in parts
 	  $echo "using piecewise archive linking..."
@@ -5012,12 +5092,13 @@
 	  if test "X$oldobjs" =3D "X" ; then
 	    eval cmds=3D\"\$concat_cmds\"
 	  else
-	    eval cmds=3D\"\$concat_cmds~$old_archive_cmds\"
+	    eval cmds=3D\"\$concat_cmds~\$old_archive_cmds\"
 	  fi
 	fi
       fi
       save_ifs=3D"$IFS"; IFS=3D'~'
       for cmd in $cmds; do
+        eval cmd=3D\"$cmd\"
 	IFS=3D"$save_ifs"
 	$show "$cmd"
 	$run eval "$cmd" || exit $?
@@ -5049,9 +5130,11 @@
 	fi
       done
       # Quote the link command for shipping.
-      relink_command=3D"(cd `pwd`; $SHELL $0 --mode=3Drelink $libtool_args=
 @inst_prefix_dir@)"
+      relink_command=3D"(cd `pwd`; $SHELL $0 $preserve_args --mode=3Drelin=
k $libtool_args @inst_prefix_dir@)"
       relink_command=3D`$echo "X$relink_command" | $Xsed -e "$sed_quote_su=
bst"`
-
+      if test "$hardcode_automatic" =3D yes ; then
+        relink_command=3D
+      fi =20
       # Only create the output if not a dry run.
       if test -z "$run"; then
 	for installed in no yes; do
@@ -5099,6 +5182,25 @@
 	      newdlprefiles=3D"$newdlprefiles $libdir/$name"
 	    done
 	    dlprefiles=3D"$newdlprefiles"
+	  else
+	    newdlfiles=3D
+	    for lib in $dlfiles; do
+	      case $lib in=20
+		[\\/]* | [A-Za-z]:[\\/]*) abs=3D"$lib" ;;
+		*) abs=3D`pwd`"/$lib" ;;
+	      esac
+	      newdlfiles=3D"$newdlfiles $abs"
+	    done
+	    dlfiles=3D"$newdlfiles"
+	    newdlprefiles=3D
+	    for lib in $dlprefiles; do
+	      case $lib in=20
+		[\\/]* | [A-Za-z]:[\\/]*) abs=3D"$lib" ;;
+		*) abs=3D`pwd`"/$lib" ;;
+	      esac
+	      newdlprefiles=3D"$newdlprefiles $abs"
+	    done
+	    dlprefiles=3D"$newdlprefiles"
 	  fi
 	  $rm $output
 	  # place dlname in correct position for cygwin
@@ -5414,10 +5516,11 @@
=20
 	  # Do each command in the postinstall commands.
 	  lib=3D"$destdir/$realname"
-	  eval cmds=3D\"$postinstall_cmds\"
+	  cmds=3D$postinstall_cmds
 	  save_ifs=3D"$IFS"; IFS=3D'~'
 	  for cmd in $cmds; do
 	    IFS=3D"$save_ifs"
+	    eval cmd=3D\"$cmd\"
 	    $show "$cmd"
 	    $run eval "$cmd" || exit $?
 	  done
@@ -5570,7 +5673,7 @@
 	      tmpdir=3D"/tmp"
 	      test -n "$TMPDIR" && tmpdir=3D"$TMPDIR"
 	      tmpdir=3D"$tmpdir/libtool-$$"
-	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
+	      if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
 	      else
 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1=
>&2
 		continue
@@ -5630,16 +5733,17 @@
       $show "$install_prog $file $oldlib"
       $run eval "$install_prog \$file \$oldlib" || exit $?
=20
-      if test -n "$stripme" && test -n "$striplib"; then
+      if test -n "$stripme" && test -n "$old_striplib"; then
 	$show "$old_striplib $oldlib"
 	$run eval "$old_striplib $oldlib" || exit $?
       fi
=20
       # Do each command in the postinstall commands.
-      eval cmds=3D\"$old_postinstall_cmds\"
+      cmds=3D$old_postinstall_cmds
       save_ifs=3D"$IFS"; IFS=3D'~'
       for cmd in $cmds; do
 	IFS=3D"$save_ifs"
+	eval cmd=3D\"$cmd\"
 	$show "$cmd"
 	$run eval "$cmd" || exit $?
       done
@@ -5653,7 +5757,7 @@
     if test -n "$current_libdirs"; then
       # Maybe just do a dry run.
       test -n "$run" && current_libdirs=3D" -n$current_libdirs"
-      exec_cmd=3D'$SHELL $0 --finish$current_libdirs'
+      exec_cmd=3D'$SHELL $0 $preserve_args --finish$current_libdirs'
     else
       exit 0
     fi
@@ -5674,10 +5778,11 @@
       for libdir in $libdirs; do
 	if test -n "$finish_cmds"; then
 	  # Do each command in the finish commands.
-	  eval cmds=3D\"$finish_cmds\"
+	  cmds=3D$finish_cmds
 	  save_ifs=3D"$IFS"; IFS=3D'~'
 	  for cmd in $cmds; do
 	    IFS=3D"$save_ifs"
+	    eval cmd=3D\"$cmd\"
 	    $show "$cmd"
 	    $run eval "$cmd" || admincmds=3D"$admincmds
        $cmd"
@@ -5951,10 +6056,11 @@
 	  if test "$mode" =3D uninstall; then
 	    if test -n "$library_names"; then
 	      # Do each command in the postuninstall commands.
-	      eval cmds=3D\"$postuninstall_cmds\"
+	      cmds=3D$postuninstall_cmds
 	      save_ifs=3D"$IFS"; IFS=3D'~'
 	      for cmd in $cmds; do
 		IFS=3D"$save_ifs"
+		eval cmd=3D\"$cmd\"
 		$show "$cmd"
 		$run eval "$cmd"
 		if test "$?" -ne 0 && test "$rmforce" !=3D yes; then
@@ -5966,10 +6072,11 @@
=20
 	    if test -n "$old_library"; then
 	      # Do each command in the old_postuninstall commands.
-	      eval cmds=3D\"$old_postuninstall_cmds\"
+	      cmds=3D$old_postuninstall_cmds
 	      save_ifs=3D"$IFS"; IFS=3D'~'
 	      for cmd in $cmds; do
 		IFS=3D"$save_ifs"
+		eval cmd=3D\"$cmd\"
 		$show "$cmd"
 		$run eval "$cmd"
 		if test "$?" -ne 0 && test "$rmforce" !=3D yes; then
@@ -6214,6 +6321,8 @@
   -no-undefined     declare that a library does not refer to external symb=
ols
   -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
   -objectlist FILE  Use a list of object files found in FILE to specify ob=
jects
+  -precious-files-regex REGEX
+                    don't remove output files matching REGEX
   -release RELEASE  specify package release information
   -rpath LIBDIR     the created library will eventually be installed in LI=
BDIR
   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and librari=
es

--zhXaljGHf11kAtnf--

--IiVenqGWf+H9Y6IX
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFA/n4+C19io6rUCv8RAiwYAJ0SP6F0YHFkFpGoXHJe2mzG7H8sEACfd4qL
M62k/W+j6hJ2kU0TjmMb1TI=
=tAlm
-----END PGP SIGNATURE-----

--IiVenqGWf+H9Y6IX--