[Pkg-sdl-commits] r159 - in unstable/libparagui1.0/debian: . patches

aurel32 at alioth.debian.org aurel32 at alioth.debian.org
Fri Dec 21 23:28:09 UTC 2007


Author: aurel32
Date: 2007-12-21 23:27:51 +0000 (Fri, 21 Dec 2007)
New Revision: 159

Added:
   unstable/libparagui1.0/debian/patches/001_autotools.diff
Modified:
   unstable/libparagui1.0/debian/changelog
   unstable/libparagui1.0/debian/patches/000_freetype_linkage.diff
   unstable/libparagui1.0/debian/patches/010_rebootstrap.diff
   unstable/libparagui1.0/debian/patches/series
   unstable/libparagui1.0/debian/rules
Log:
  * debian/rules:
    + remove distclean call to subdirs.
    + only call make distclean if Makefile exists.
  * debian/patches/001_autotools.diff:
    + Remove physfs from SUBDIRS.
    + Remove empty distclean rules from Makefile.am.



Modified: unstable/libparagui1.0/debian/changelog
===================================================================
--- unstable/libparagui1.0/debian/changelog	2007-12-21 21:07:16 UTC (rev 158)
+++ unstable/libparagui1.0/debian/changelog	2007-12-21 23:27:51 UTC (rev 159)
@@ -6,13 +6,20 @@
 
   [ Aurelien Jarno ]
   * Make the package binNMU safe.
-  * debian/patches/020_stl_map.diff:
-    + Always use #include <map>.  Closes: bug#455340.
   * debian/control:
     + Set policy to 3.7.3.
     + Change Homepage: into a header.
+  * debian/rules:
+    + remove .pc/ on clean.
+    + remove distclean call to subdirs.
+    + only call make distclean if Makefile exists.
+  * debian/patches/001_autotools.diff:
+    + Remove physfs from SUBDIRS.
+    + Remove empty distclean rules from Makefile.am.
+  * debian/patches/020_stl_map.diff:
+    + Always use #include <map>.  Closes: bug#455340.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Tue, 18 Dec 2007 09:10:49 +0100
+ -- Aurelien Jarno <aurel32 at debian.org>  Sat, 22 Dec 2007 00:26:22 +0100
 
 libparagui1.0 (1.0.4-12) unstable; urgency=low
 

Modified: unstable/libparagui1.0/debian/patches/000_freetype_linkage.diff
===================================================================
--- unstable/libparagui1.0/debian/patches/000_freetype_linkage.diff	2007-12-21 21:07:16 UTC (rev 158)
+++ unstable/libparagui1.0/debian/patches/000_freetype_linkage.diff	2007-12-21 23:27:51 UTC (rev 159)
@@ -1,65 +1,6 @@
-#! /bin/sh -e
 ## freetype_linkage.dpatch
 ## Steve Langasek <vorlon at debian.org>
 
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -ne 1 ]; then
-    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-    exit 1
-fi
-case "$1" in
-        -patch) patch $patch_opts -p1 < $0;;
-        -unpatch) patch $patch_opts -R -p1 < $0;;
-        *)
-                echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
-                exit 1;;
-esac
-
-exit 0
-
- at DPATCH@
-only in patch2:
-unchanged:
---- libparagui1.0-1.0.4.orig/Makefile.am
-+++ libparagui1.0-1.0.4/Makefile.am
-@@ -62,6 +62,10 @@
- install-hook:
- 	-ldconfig
- 
-+distclean-local:
-+	make -C sdk distclean
-+	make -C doc distclean
-+
- rpm: $(PACKAGE)-$(VERSION).tar.gz
- 	cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
- 	rpm -ba $(PACKAGE).spec
-only in patch2:
-unchanged:
---- libparagui1.0-1.0.4.orig/configure.in
-+++ libparagui1.0-1.0.4/configure.in
-@@ -50,6 +50,7 @@
- 
- dnl Setup for automake
- AM_INIT_AUTOMAKE(paragui, $PARAGUI_VERSION)
-+AM_MAINTAINER_MODE
- 
- dnl Check for tools
- 
-@@ -356,10 +357,9 @@
-     PHYSFS_LIB="./physfs/libphysfs.la"
-     PHYSFS_SUBDIR="physfs"
-     LIBPHYSFS=""
-+    AC_CONFIG_SUBDIRS(src/physfs)
- fi
- 
--AC_CONFIG_SUBDIRS(src/physfs)
--
- AC_SUBST(PHYSFS_INCLUDE)
- AC_SUBST(PHYSFS_LIB)
- AC_SUBST(PHYSFS_SUBDIR)
-only in patch2:
-unchanged:
 --- libparagui1.0-1.0.4.orig/src/font/Makefile.am
 +++ libparagui1.0-1.0.4/src/font/Makefile.am
 @@ -4,6 +4,9 @@
@@ -72,5 +13,3 @@
  EXTRA_DIST = \
  	facecache.h
  
-only in patch2:
-unchanged:

Added: unstable/libparagui1.0/debian/patches/001_autotools.diff
===================================================================
--- unstable/libparagui1.0/debian/patches/001_autotools.diff	                        (rev 0)
+++ unstable/libparagui1.0/debian/patches/001_autotools.diff	2007-12-21 23:27:51 UTC (rev 159)
@@ -0,0 +1,51 @@
+--- libparagui1.0-1.0.4.orig/configure.in
++++ libparagui1.0-1.0.4/configure.in
+@@ -50,6 +50,7 @@
+ 
+ dnl Setup for automake
+ AM_INIT_AUTOMAKE(paragui, $PARAGUI_VERSION)
++AM_MAINTAINER_MODE
+ 
+ dnl Check for tools
+ 
+@@ -356,10 +357,9 @@
+     PHYSFS_LIB="./physfs/libphysfs.la"
+     PHYSFS_SUBDIR="physfs"
+     LIBPHYSFS=""
++    AC_CONFIG_SUBDIRS(src/physfs)
+ fi
+ 
+-AC_CONFIG_SUBDIRS(src/physfs)
+-
+ AC_SUBST(PHYSFS_INCLUDE)
+ AC_SUBST(PHYSFS_LIB)
+ AC_SUBST(PHYSFS_SUBDIR)
+--- libparagui1.0-1.0.4.orig/data/Makefile.am	2007-12-21 22:14:37.000000000 +0100
++++ libparagui1.0-1.0.4/data/Makefile.am	2007-12-21 22:14:41.000000000 +0100
+@@ -36,5 +36,3 @@
+ #	qnx.zip
+ 
+ clean:
+-
+-distclean: clean
+--- libparagui1.0-1.0.4.orig/bindings/python/Makefile.am
++++ libparagui1.0-1.0.4/bindings/python/Makefile.am
+@@ -40,8 +40,6 @@
+ paraguic_wrap.o: paraguic_wrap.cpp
+ 	$(COMPILE) $(INCLUDES) -c $<
+ 
+-distclean: clean
+-
+ clean:
+ 	rm -f *.so *.c *.o *~ *. *.cpp *.py?
+ 
+--- libparagui1.0-1.0.4.orig/src/Makefile.am
++++ libparagui1.0-1.0.4/src/Makefile.am
+@@ -1,6 +1,6 @@
+ SUBDIRS = $(PHYSFS_SUBDIR) $(EXPAT_SUBDIR) draw font themes core widgets
+ 
+-DIST_SUBDIRS = draw font themes core widgets expat physfs
++DIST_SUBDIRS = draw font themes core widgets expat
+ 
+ lib_LTLIBRARIES = libparagui.la
+ 

Modified: unstable/libparagui1.0/debian/patches/010_rebootstrap.diff
===================================================================
--- unstable/libparagui1.0/debian/patches/010_rebootstrap.diff	2007-12-21 21:07:16 UTC (rev 158)
+++ unstable/libparagui1.0/debian/patches/010_rebootstrap.diff	2007-12-21 23:27:51 UTC (rev 159)
@@ -1,1037 +1,9873 @@
-Index: libparagui1.0-1.0.4/Makefile.in
-===================================================================
---- libparagui1.0-1.0.4.orig/Makefile.in	2003-07-07 11:05:59.000000000 +0200
-+++ libparagui1.0-1.0.4/Makefile.in	2006-06-15 22:26:31.000000000 +0200
-@@ -1,6 +1,8 @@
--# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
-+# @configure_input@
+diff -Nurd libparagui1.0-1.0.4.orig/aclocal.m4 libparagui1.0-1.0.4/aclocal.m4
+--- libparagui1.0-1.0.4.orig/aclocal.m4	2003-06-27 10:34:28.000000000 +0200
++++ libparagui1.0-1.0.4/aclocal.m4	2007-12-21 23:58:30.000000000 +0100
+@@ -1,166 +1,73 @@
+-dnl aclocal.m4 generated automatically by aclocal 1.4-p6
+-
+-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+-dnl This file is free software; the Free Software Foundation
+-dnl gives unlimited permission to copy and/or distribute it,
+-dnl with or without modifications, as long as this notice is preserved.
+-
+-dnl This program is distributed in the hope that it will be useful,
+-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+-dnl PARTICULAR PURPOSE.
+-
+-# Like AC_CONFIG_HEADER, but automatically create stamp file.
+-
+-AC_DEFUN([AM_CONFIG_HEADER],
+-[AC_PREREQ([2.12])
+-AC_CONFIG_HEADER([$1])
+-dnl When config.status generates a header, we must update the stamp-h file.
+-dnl This file resides in the same directory as the config header
+-dnl that is generated.  We must strip everything past the first ":",
+-dnl and everything past the last "/".
+-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
+-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
+-<<am_indx=1
+-for am_file in <<$1>>; do
+-  case " <<$>>CONFIG_HEADERS " in
+-  *" <<$>>am_file "*<<)>>
+-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+-    ;;
+-  esac
+-  am_indx=`expr "<<$>>am_indx" + 1`
+-done<<>>dnl>>)
+-changequote([,]))])
+-
+-# Do all the work for Automake.  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.
+-
+-# serial 1
+-
+-dnl Usage:
+-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+-
+-AC_DEFUN([AM_INIT_AUTOMAKE],
+-[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+-AC_REQUIRE([AC_PROG_INSTALL])
+-PACKAGE=[$1]
+-AC_SUBST(PACKAGE)
+-VERSION=[$2]
+-AC_SUBST(VERSION)
+-dnl test to see if srcdir already configured
+-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+-fi
+-ifelse([$3],,
+-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
+-AC_REQUIRE([AM_SANITY_CHECK])
+-AC_REQUIRE([AC_ARG_PROGRAM])
+-dnl FIXME This is truly gross.
+-missing_dir=`cd $ac_aux_dir && pwd`
+-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
+-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
+-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+-AC_REQUIRE([AC_PROG_MAKE_SET])])
+-
+-# Copyright 2002  Free Software Foundation, Inc.
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
  
--# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -10,83 +12,148 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
+-# 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.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005  Free Software Foundation, Inc.
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
  
-+ at SET_MAKE@
+ # 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
+-
+-# AM_AUTOMAKE_VERSION(VERSION)
+-# ----------------------------
+-# Automake X.Y traces this macro to ensure aclocal.m4 has been
+-# generated from the m4 files accompanying Automake X.Y.
+-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
  
--SHELL = @SHELL@
+-# AM_SET_CURRENT_AUTOMAKE_VERSION
+-# -------------------------------
+-# 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.4-p6])])
++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
  
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
--prefix = @prefix@
--exec_prefix = @exec_prefix@
+-#
+-# Check to make sure that the build environment is sane.
+-#
++# serial 51 Debian 1.5.24-2 AC_PROG_LIBTOOL
+ 
+-AC_DEFUN([AM_SANITY_CHECK],
+-[AC_MSG_CHECKING([whether build environment is sane])
+-# Just in case
+-sleep 1
+-echo timestamp > conftestfile
+-# Do `set' in a subshell so we don't clobber the current shell's
+-# arguments.  Must try -L first in case configure is actually a
+-# symlink; some systems play weird games with the mod time of symlinks
+-# (eg FreeBSD returns the mod time of the symlink's containing
+-# directory).
+-if (
+-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+-   if test "[$]*" = "X"; then
+-      # -L didn't work.
+-      set X `ls -t $srcdir/configure conftestfile`
+-   fi
+-   if test "[$]*" != "X $srcdir/configure conftestfile" \
+-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+ 
+-      # If neither matched, then we have a broken ls.  This can happen
+-      # if, for instance, CONFIG_SHELL is bash and it inherits a
+-      # broken ls alias from the environment.  This has actually
+-      # happened.  Such a system could not be considered "sane".
+-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+-alias in your environment])
+-   fi
++# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
++# -----------------------------------------------------------
++# If this macro is not defined by Autoconf, define it here.
++m4_ifdef([AC_PROVIDE_IFELSE],
++         [],
++         [m4_define([AC_PROVIDE_IFELSE],
++	         [m4_ifdef([AC_PROVIDE_$1],
++		           [$2], [$3])])])
+ 
+-   test "[$]2" = conftestfile
+-   )
+-then
+-   # Ok.
+-   :
+-else
+-   AC_MSG_ERROR([newly created file is older than distributed files!
+-Check your system clock])
+-fi
+-rm -f conftest*
+-AC_MSG_RESULT(yes)])
+ 
+-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+-dnl The program must properly implement --version.
+-AC_DEFUN([AM_MISSING_PROG],
+-[AC_MSG_CHECKING(for working $2)
+-# Run test in a subshell; some versions of sh will print an error if
+-# an executable is not found, even if stderr is redirected.
+-# Redirect stdin to placate older versions of autoconf.  Sigh.
+-if ($2 --version) < /dev/null > /dev/null 2>&1; then
+-   $1=$2
+-   AC_MSG_RESULT(found)
+-else
+-   $1="$3/missing $2"
+-   AC_MSG_RESULT(missing)
+-fi
+-AC_SUBST($1)])
++# AC_PROG_LIBTOOL
++# ---------------
++AC_DEFUN([AC_PROG_LIBTOOL],
++[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
++dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
++dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
++  AC_PROVIDE_IFELSE([AC_PROG_CXX],
++    [AC_LIBTOOL_CXX],
++    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
++  ])])
++dnl And a similar setup for Fortran 77 support
++  AC_PROVIDE_IFELSE([AC_PROG_F77],
++    [AC_LIBTOOL_F77],
++    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
++])])
+ 
+-# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
++dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
++dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
++dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
++  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
++    [AC_LIBTOOL_GCJ],
++    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
++      [AC_LIBTOOL_GCJ],
++      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
++	[AC_LIBTOOL_GCJ],
++      [ifdef([AC_PROG_GCJ],
++	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([A][M_PROG_GCJ],
++	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
++       ifdef([LT_AC_PROG_GCJ],
++	     [define([LT_AC_PROG_GCJ],
++		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
++])])# AC_PROG_LIBTOOL
+ 
+-# serial 46 AC_PROG_LIBTOOL
+ 
+-AC_DEFUN([AC_PROG_LIBTOOL],
++# _AC_PROG_LIBTOOL
++# ----------------
++AC_DEFUN([_AC_PROG_LIBTOOL],
+ [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
++AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+@@ -171,10 +78,13 @@
+ 
+ # Prevent multiple expansion
+ define([AC_PROG_LIBTOOL], [])
+-])
++])# _AC_PROG_LIBTOOL
++
+ 
++# AC_LIBTOOL_SETUP
++# ----------------
+ AC_DEFUN([AC_LIBTOOL_SETUP],
+-[AC_PREREQ(2.13)dnl
++[AC_PREREQ(2.50)dnl
+ AC_REQUIRE([AC_ENABLE_SHARED])dnl
+ AC_REQUIRE([AC_ENABLE_STATIC])dnl
+ AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+@@ -184,359 +94,242 @@
+ AC_REQUIRE([AC_PROG_LD])dnl
+ AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+ AC_REQUIRE([AC_PROG_NM])dnl
+-AC_REQUIRE([LT_AC_PROG_SED])dnl
+ 
+ AC_REQUIRE([AC_PROG_LN_S])dnl
+ AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
++# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+ AC_REQUIRE([AC_OBJEXT])dnl
+ AC_REQUIRE([AC_EXEEXT])dnl
+ dnl
+ 
++AC_LIBTOOL_SYS_MAX_CMD_LEN
++AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++AC_LIBTOOL_OBJDIR
++
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ _LT_AC_PROG_ECHO_BACKSLASH
+-# Only perform the check for file, if the check method requires it
+-case $deplibs_check_method in
+-file_magic*)
+-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    AC_PATH_MAGIC
++
++case $host_os in
++aix3*)
++  # AIX sometimes has problems with the GCC collect2 program.  For some
++  # reason, if we set the COLLECT_NAMES environment variable, the problems
++  # vanish in a puff of smoke.
++  if test "X${COLLECT_NAMES+set}" != Xset; then
++    COLLECT_NAMES=
++    export COLLECT_NAMES
+   fi
+   ;;
+ esac
+ 
+-AC_CHECK_TOOL(RANLIB, ranlib, :)
+-AC_CHECK_TOOL(STRIP, strip, :)
++# Sed substitution that helps us do robust quoting.  It backslashifies
++# metacharacters that are still active within double-quoted strings.
++Xsed='sed -e 1s/^X//'
++[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+ 
+-ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-enable_win32_dll=yes, enable_win32_dll=no)
++# Same as above, but do not quote variable references.
++[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+ 
+-AC_ARG_ENABLE(libtool-lock,
+-  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
+-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++# Sed substitution to delay expansion of an escaped shell variable in a
++# double_quote_subst'ed string.
++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+ 
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
++# Sed substitution to avoid accidental globbing in evaled expressions
++no_glob_subst='s/\*/\\\*/g'
+ 
+-*-*-linux*)
+-  # Test if the compiler is 64bit
+-  echo 'int i;' > conftest.$ac_ext
+-  lt_cv_cc_64bit_output=no
+-  if AC_TRY_EVAL(ac_compile); then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *"ELF 64"*)
+-      lt_cv_cc_64bit_output=yes
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+-  
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+-    [AC_LANG_SAVE
+-     AC_LANG_C
+-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+-     AC_LANG_RESTORE])
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
++# Constants:
++rm="rm -f"
+ 
+-ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
+-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+-  AC_CHECK_TOOL(AS, as, false)
+-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++# Global variables:
++default_ofile=libtool
++can_build_shared=yes
+ 
+-  # recent cygwin and mingw systems supply a stub DllMain which the user
+-  # can override, but on older systems we have to supply one
+-  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
+-    [AC_TRY_LINK([],
+-      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
+-      DllMain (0, 0, 0);],
+-      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
++# All known linkers require a `.a' archive for static linking (except MSVC,
++# which needs '.lib').
++libext=a
++ltmain="$ac_aux_dir/ltmain.sh"
++ofile="$default_ofile"
++with_gnu_ld="$lt_cv_prog_gnu_ld"
+ 
+-  case $host/$CC in
+-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
+-    # old mingw systems require "-dll" to link a DLL, while more recent ones
+-    # require "-mdll"
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS -mdll"
+-    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
+-      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
+-    CFLAGS="$SAVE_CFLAGS" ;;
+-  *-*-cygwin* | *-*-pw32*)
+-    # cygwin systems need to pass --dll to the linker, and not link
+-    # crt.o which will require a WinMain at 16 definition.
+-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
+-  esac
+-  ;;
+-  ])
+-esac
++AC_CHECK_TOOL(AR, ar, false)
++AC_CHECK_TOOL(RANLIB, ranlib, :)
++AC_CHECK_TOOL(STRIP, strip, :)
+ 
+-_LT_AC_LTCONFIG_HACK
++old_CC="$CC"
++old_CFLAGS="$CFLAGS"
+ 
+-])
++# Set sane defaults for various variables
++test -z "$AR" && AR=ar
++test -z "$AR_FLAGS" && AR_FLAGS=cru
++test -z "$AS" && AS=as
++test -z "$CC" && CC=cc
++test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
++test -z "$DLLTOOL" && DLLTOOL=dlltool
++test -z "$LD" && LD=ld
++test -z "$LN_S" && LN_S="ln -s"
++test -z "$MAGIC_CMD" && MAGIC_CMD=file
++test -z "$NM" && NM=nm
++test -z "$SED" && SED=sed
++test -z "$OBJDUMP" && OBJDUMP=objdump
++test -z "$RANLIB" && RANLIB=:
++test -z "$STRIP" && STRIP=:
++test -z "$ac_objext" && ac_objext=o
+ 
+-# AC_LIBTOOL_HEADER_ASSERT
+-# ------------------------
+-AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
+-[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
+-    [lt_cv_func_assert_works],
+-    [case $host in
+-    *-*-solaris*)
+-      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
+-        case `$CC --version 2>/dev/null` in
+-        [[12]].*) lt_cv_func_assert_works=no ;;
+-        *)        lt_cv_func_assert_works=yes ;;
+-        esac
+-      fi
+-      ;;
+-    esac])
++# Determine commands to create old-style static archives.
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
++old_postinstall_cmds='chmod 644 $oldlib'
++old_postuninstall_cmds=
+ 
+-if test "x$lt_cv_func_assert_works" = xyes; then
+-  AC_CHECK_HEADERS(assert.h)
++if test -n "$RANLIB"; then
++  case $host_os in
++  openbsd*)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
++    ;;
++  *)
++    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
++    ;;
++  esac
++  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+-])# AC_LIBTOOL_HEADER_ASSERT
+ 
+-# _LT_AC_CHECK_DLFCN
+-# --------------------
+-AC_DEFUN([_LT_AC_CHECK_DLFCN],
+-[AC_CHECK_HEADERS(dlfcn.h)
+-])# _LT_AC_CHECK_DLFCN
++_LT_CC_BASENAME([$compiler])
+ 
+-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+-# ---------------------------------
+-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+-[AC_REQUIRE([AC_CANONICAL_HOST])
+-AC_REQUIRE([AC_PROG_NM])
+-AC_REQUIRE([AC_OBJEXT])
+-# Check for command to grab the raw symbol name followed by C symbol from nm.
+-AC_MSG_CHECKING([command to parse $NM output])
+-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
++# Only perform the check for file, if the check method requires it
++case $deplibs_check_method in
++file_magic*)
++  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
++    AC_PATH_MAGIC
++  fi
++  ;;
++esac
+ 
+-# These are sane defaults that work on at least a few old systems.
+-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
++AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++enable_win32_dll=yes, enable_win32_dll=no)
+ 
+-# Character class describing NM global symbol codes.
+-symcode='[[BCDEGRST]]'
++AC_ARG_ENABLE([libtool-lock],
++    [AC_HELP_STRING([--disable-libtool-lock],
++	[avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+-# Regexp to match symbols that can be accessed directly from C.
+-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
++AC_ARG_WITH([pic],
++    [AC_HELP_STRING([--with-pic],
++	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
++    [pic_mode="$withval"],
++    [pic_mode=default])
++test -z "$pic_mode" && pic_mode=default
+ 
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
++# Use C for the default configuration in the libtool script
++tagname=
++AC_LIBTOOL_LANG_C_CONFIG
++_LT_AC_TAGCONFIG
++])# AC_LIBTOOL_SETUP
+ 
+-# Transform an extracted symbol line into a proper C declaration
+-lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
+ 
+-# Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++# _LT_AC_SYS_COMPILER
++# -------------------
++AC_DEFUN([_LT_AC_SYS_COMPILER],
++[AC_REQUIRE([AC_PROG_CC])dnl
+ 
+-# Define system-specific variables.
+-case $host_os in
+-aix*)
+-  symcode='[[BCDT]]'
+-  ;;
+-cygwin* | mingw* | pw32*)
+-  symcode='[[ABCDGISTW]]'
+-  ;;
+-hpux*) # Its linker distinguishes data from code symbols
+-  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+-  ;;
+-irix* | nonstopux*)
+-  symcode='[[BCDEGRST]]'
+-  ;;
+-osf*)
+-  symcode='[[BCDEGQRST]]'
+-  ;;
+-solaris* | sysv5*)
+-  symcode='[[BDT]]'
+-  ;;
+-sysv4)
+-  symcode='[[DFNSTU]]'
+-  ;;
+-esac
++# If no C compiler was specified, use CC.
++LTCC=${LTCC-"$CC"}
+ 
+-# Handle CRLF in mingw tool chain
+-opt_cr=
+-case $host_os in
+-mingw*)
+-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+-  ;;
+-esac
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+ 
+-# If we're using GNU nm, then use its standard symbol codes.
+-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+-  symcode='[[ABCDGISTW]]'
+-fi
++# Allow CC to be a program name with arguments.
++compiler=$CC
++])# _LT_AC_SYS_COMPILER
+ 
+-# Try without a prefix undercore, then with it.
+-for ac_symprfx in "" "_"; do
+ 
+-  # Write the raw and C identifiers.
+-lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++  case $cc_temp in
++    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++    \-*) ;;
++    *) break;;
++  esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
+ 
+-  # Check to see that the pipe works correctly.
+-  pipe_works=no
+-  rm -f conftest*
+-  cat > conftest.$ac_ext <<EOF
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+-char nm_test_var;
+-void nm_test_func(){}
+-#ifdef __cplusplus
+-}
+-#endif
+-int main(){nm_test_var='a';nm_test_func();return(0);}
+-EOF
+ 
+-  if AC_TRY_EVAL(ac_compile); then
+-    # Now try to grab the symbols.
+-    nlist=conftest.nm
+-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+-      # Try sorting and uniquifying the output.
+-      if sort "$nlist" | uniq > "$nlist"T; then
+-	mv -f "$nlist"T "$nlist"
+-      else
+-	rm -f "$nlist"T
+-      fi
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
+ 
+-      # Make sure that we snagged all the symbols we need.
+-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
+-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
+-	  cat <<EOF > conftest.$ac_ext
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
+ 
+-EOF
+-	  # Now generate the symbol file.
+-	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
+ 
+-	  cat <<EOF >> conftest.$ac_ext
+-#if defined (__STDC__) && __STDC__
+-# define lt_ptr void *
+-#else
+-# define lt_ptr char *
+-# define const
+-#endif
+ 
+-/* The mapping between symbol names and symbols. */
+-const struct {
+-  const char *name;
+-  lt_ptr address;
+-}
+-lt_preloaded_symbols[[]] =
+-{
+-EOF
+-	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
+-	  cat <<\EOF >> conftest.$ac_ext
+-  {0, (lt_ptr) 0}
+-};
++# _LT_AC_SYS_LIBPATH_AIX
++# ----------------------
++# Links a minimal program and checks the executable
++# for the system default hardcoded library path. In most cases,
++# this is /usr/lib:/lib, but when the MPI compilers are used
++# the location of the communication and MPI libs are included too.
++# If we don't find anything, use the default library path according
++# to the aix ld manual.
++AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++# Check for a 64-bit object if we didn't find anything.
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
++])# _LT_AC_SYS_LIBPATH_AIX
+ 
+-#ifdef __cplusplus
+-}
+-#endif
+-EOF
+-	  # Now try linking the two files.
+-	  mv conftest.$ac_objext conftstm.$ac_objext
+-	  save_LIBS="$LIBS"
+-	  save_CFLAGS="$CFLAGS"
+-	  LIBS="conftstm.$ac_objext"
+-	  CFLAGS="$CFLAGS$no_builtin_flag"
+-	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+-	    pipe_works=yes
+-	  fi
+-	  LIBS="$save_LIBS"
+-	  CFLAGS="$save_CFLAGS"
+-	else
+-	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
+-	fi
+-      else
+-	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
+-      fi
+-    else
+-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
+-    fi
+-  else
+-    echo "$progname: failed program was:" >&AC_FD_CC
+-    cat conftest.$ac_ext >&5
+-  fi
+-  rm -f conftest* conftst*
+ 
+-  # Do not use the global_symbol_pipe unless it works.
+-  if test "$pipe_works" = yes; then
+-    break
+-  else
+-    lt_cv_sys_global_symbol_pipe=
+-  fi
+-done
+-])
+-global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
+-if test -z "$lt_cv_sys_global_symbol_pipe"; then
+-  global_symbol_to_cdecl=
+-  global_symbol_to_c_name_address=
+-else
+-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+-  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
+-fi
+-if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
+-then
+-  AC_MSG_RESULT(failed)
+-else
+-  AC_MSG_RESULT(ok)
+-fi
+-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++# _LT_AC_SHELL_INIT(ARG)
++# ----------------------
++AC_DEFUN([_LT_AC_SHELL_INIT],
++[ifdef([AC_DIVERSION_NOTICE],
++	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
++	 [AC_DIVERT_PUSH(NOTICE)])
++$1
++AC_DIVERT_POP
++])# _LT_AC_SHELL_INIT
+ 
+-# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
+-# ---------------------------------
+-AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
+-[# Find the correct PATH separator.  Usually this is `:', but
+-# DJGPP uses `;' like DOS.
+-if test "X${PATH_SEPARATOR+set}" != Xset; then
+-  UNAME=${UNAME-`uname 2>/dev/null`}
+-  case X$UNAME in
+-    *-DOS) lt_cv_sys_path_separator=';' ;;
+-    *)     lt_cv_sys_path_separator=':' ;;
+-  esac
+-  PATH_SEPARATOR=$lt_cv_sys_path_separator
+-fi
+-])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
+ 
+ # _LT_AC_PROG_ECHO_BACKSLASH
+ # --------------------------
+ # Add some code to the start of the generated configure script which
+ # will find an echo command which doesn't interpret backslashes.
+ AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
+-[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
+-			      [AC_DIVERT_PUSH(NOTICE)])
+-_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
 -
--bindir = @bindir@
--sbindir = @sbindir@
--libexecdir = @libexecdir@
--datadir = @datadir@
--sysconfdir = @sysconfdir@
--sharedstatedir = @sharedstatedir@
--localstatedir = @localstatedir@
--libdir = @libdir@
--infodir = @infodir@
--mandir = @mandir@
--includedir = @includedir@
--oldincludedir = /usr/include
++[_LT_AC_SHELL_INIT([
+ # Check that we are running under the correct shell.
+ SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+@@ -554,7 +347,7 @@
+ elif test "X[$]1" = X--fallback-echo; then
+   # Avoid inline document here, it may be left over
+   :
+-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
++elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
+   # Yippee, $echo works!
+   :
+ else
+@@ -566,22 +359,22 @@
+   # used as fallback echo
+   shift
+   cat <<EOF
+-$*
++[$]*
+ EOF
+   exit 0
+ fi
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+-       echo_test_string="`eval $cmd`" &&
++    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++       echo_test_string=`eval $cmd` &&
+        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+     then
+       break
+@@ -600,8 +393,9 @@
+   #
+   # So, first we look for a working echo in the user's PATH.
+ 
+-  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+   for dir in $PATH /usr/ucb; do
++    IFS="$lt_save_ifs"
+     if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
+        test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
+        echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
+@@ -610,7 +404,7 @@
+       break
+     fi
+   done
+-  IFS="$save_ifs"
++  IFS="$lt_save_ifs"
+ 
+   if test "X$echo" = Xecho; then
+     # We didn't find a better echo, so look for alternatives.
+@@ -683,17 +477,376 @@
+ fi
+ 
+ AC_SUBST(ECHO)
+-AC_DIVERT_POP
+-])# _LT_AC_PROG_ECHO_BACKSLASH
++])])# _LT_AC_PROG_ECHO_BACKSLASH
++
++
++# _LT_AC_LOCK
++# -----------
++AC_DEFUN([_LT_AC_LOCK],
++[AC_ARG_ENABLE([libtool-lock],
++    [AC_HELP_STRING([--disable-libtool-lock],
++	[avoid locking (might break parallel builds)])])
++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++# Some flags need to be propagated to the compiler or linker for good
++# libtool support.
++case $host in
++ia64-*-hpux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *ELF-32*)
++      HPUX_IA64_MODE="32"
++      ;;
++    *ELF-64*)
++      HPUX_IA64_MODE="64"
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++*-*-irix6*)
++  # Find out which ABI we are using.
++  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++   if test "$lt_cv_prog_gnu_ld" = yes; then
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -melf32bsmip"
++      ;;
++    *N32*)
++      LD="${LD-ld} -melf32bmipn32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -melf64bmip"
++      ;;
++    esac
++   else
++    case `/usr/bin/file conftest.$ac_objext` in
++    *32-bit*)
++      LD="${LD-ld} -32"
++      ;;
++    *N32*)
++      LD="${LD-ld} -n32"
++      ;;
++    *64-bit*)
++      LD="${LD-ld} -64"
++      ;;
++    esac
++   fi
++  fi
++  rm -rf conftest*
++  ;;
++
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++    *32-bit*)
++      case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_i386"
++          ;;
++        ppc64-*linux*|powerpc64-*linux*)
++          LD="${LD-ld} -m elf32ppclinux"
++          ;;
++        s390x-*linux*)
++          LD="${LD-ld} -m elf_s390"
++          ;;
++        sparc64-*linux*)
++          LD="${LD-ld} -m elf32_sparc"
++          ;;
++      esac
++      ;;
++    *64-bit*)
++      case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
++        x86_64-*linux*)
++          LD="${LD-ld} -m elf_x86_64"
++          ;;
++        ppc*-*linux*|powerpc*-*linux*)
++          LD="${LD-ld} -m elf64ppc"
++          ;;
++        s390*-*linux*)
++          LD="${LD-ld} -m elf64_s390"
++          ;;
++        sparc*-*linux*)
++          LD="${LD-ld} -m elf64_sparc"
++          ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++*-*-sco3.2v5*)
++  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
++  SAVE_CFLAGS="$CFLAGS"
++  CFLAGS="$CFLAGS -belf"
++  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
++    [AC_LANG_PUSH(C)
++     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
++     AC_LANG_POP])
++  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
++    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
++    CFLAGS="$SAVE_CFLAGS"
++  fi
++  ;;
++sparc*-*solaris*)
++  # Find out which ABI we are using.
++  echo 'int i;' > conftest.$ac_ext
++  if AC_TRY_EVAL(ac_compile); then
++    case `/usr/bin/file conftest.o` in
++    *64-bit*)
++      case $lt_cv_prog_gnu_ld in
++      yes*) LD="${LD-ld} -m elf64_sparc" ;;
++      *)    LD="${LD-ld} -64" ;;
++      esac
++      ;;
++    esac
++  fi
++  rm -rf conftest*
++  ;;
++
++AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
++[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
++  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
++  AC_CHECK_TOOL(AS, as, false)
++  AC_CHECK_TOOL(OBJDUMP, objdump, false)
++  ;;
++  ])
++esac
++
++need_locks="$enable_libtool_lock"
++
++])# _LT_AC_LOCK
++
++
++# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
++# ----------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
++[AC_REQUIRE([LT_AC_PROG_SED])
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++   lt_compiler_flag="$3"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   # The option is referenced via a variable to avoid confusing sed.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>conftest.err)
++   ac_status=$?
++   cat conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s "$ac_outfile"; then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings other than the usual output.
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
++       $2=yes
++     fi
++   fi
++   $rm conftest*
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$5], , :, [$5])
++else
++    ifelse([$6], , :, [$6])
++fi
++])# AC_LIBTOOL_COMPILER_OPTION
++
++
++# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
++#                          [ACTION-SUCCESS], [ACTION-FAILURE])
++# ------------------------------------------------------------
++# Check whether the given compiler option works
++AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
++  [$2=no
++   save_LDFLAGS="$LDFLAGS"
++   LDFLAGS="$LDFLAGS $3"
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
++   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
++     # The linker can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     if test -s conftest.err; then
++       # Append any errors to the config.log.
++       cat conftest.err 1>&AS_MESSAGE_LOG_FD
++       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++       if diff conftest.exp conftest.er2 >/dev/null; then
++         $2=yes
++       fi
++     else
++       $2=yes
++     fi
++   fi
++   $rm conftest*
++   LDFLAGS="$save_LDFLAGS"
++])
++
++if test x"[$]$2" = xyes; then
++    ifelse([$4], , :, [$4])
++else
++    ifelse([$5], , :, [$5])
++fi
++])# AC_LIBTOOL_LINKER_OPTION
++
++
++# AC_LIBTOOL_SYS_MAX_CMD_LEN
++# --------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
++[# find the maximum length of command line arguments
++AC_MSG_CHECKING([the maximum length of command line arguments])
++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
++  i=0
++  teststring="ABCD"
++
++  case $build_os in
++  msdosdjgpp*)
++    # On DJGPP, this test can blow up pretty badly due to problems in libc
++    # (any single argument exceeding 2000 bytes causes a buffer overrun
++    # during glob expansion).  Even if it were fixed, the result of this
++    # check would be larger than it should be.
++    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
++    ;;
++
++  gnu*)
++    # Under GNU Hurd, this test is not required because there is
++    # no limit to the length of command line arguments.
++    # Libtool will interpret -1 as no limit whatsoever
++    lt_cv_sys_max_cmd_len=-1;
++    ;;
++
++  cygwin* | mingw*)
++    # On Win9x/ME, this test blows up -- it succeeds, but takes
++    # about 5 minutes as the teststring grows exponentially.
++    # Worse, since 9x/ME are not pre-emptively multitasking,
++    # you end up with a "frozen" computer, even though with patience
++    # the test eventually succeeds (with a max line length of 256k).
++    # Instead, let's just punt: use the minimum linelength reported by
++    # all of the supported platforms: 8192 (on NT/2K/XP).
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  amigaos*)
++    # On AmigaOS with pdksh, this test takes hours, literally.
++    # So we just punt and use a minimum line length of 8192.
++    lt_cv_sys_max_cmd_len=8192;
++    ;;
++
++  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++    # This has been around since 386BSD, at least.  Likely further.
++    if test -x /sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++    elif test -x /usr/sbin/sysctl; then
++      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++    else
++      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
++    fi
++    # And add a safety zone
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    ;;
++
++  interix*)
++    # We know the value 262144 and hardcode it with a safety zone (like BSD)
++    lt_cv_sys_max_cmd_len=196608
++    ;;
++
++  osf*)
++    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++    # nice to cause kernel panics so lets avoid the loop below.
++    # First set a reasonable default.
++    lt_cv_sys_max_cmd_len=16384
++    #
++    if test -x /sbin/sysconfig; then
++      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++        *1*) lt_cv_sys_max_cmd_len=-1 ;;
++      esac
++    fi
++    ;;
++  sco3.2v5*)
++    lt_cv_sys_max_cmd_len=102400
++    ;;
++  sysv5* | sco5v6* | sysv4.2uw2*)
++    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++    if test -n "$kargmax"; then
++      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
++    else
++      lt_cv_sys_max_cmd_len=32768
++    fi
++    ;;
++  *)
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    else
++      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++	       = "XX$teststring") >/dev/null 2>&1 &&
++	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	      lt_cv_sys_max_cmd_len=$new_result &&
++	      test $i != 17 # 1/2 MB should be enough
++      do
++        i=`expr $i + 1`
++        teststring=$teststring$teststring
++      done
++      teststring=
++      # Add a significant safety factor because C++ compilers can tack on massive
++      # amounts of additional arguments before passing them to the linker.
++      # It appears as though 1/2 is a usable value.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
++    ;;
++  esac
++])
++if test -n $lt_cv_sys_max_cmd_len ; then
++  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
++else
++  AC_MSG_RESULT(none)
++fi
++])# AC_LIBTOOL_SYS_MAX_CMD_LEN
++
++
++# _LT_AC_CHECK_DLFCN
++# ------------------
++AC_DEFUN([_LT_AC_CHECK_DLFCN],
++[AC_CHECK_HEADERS(dlfcn.h)dnl
++])# _LT_AC_CHECK_DLFCN
++
+ 
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ #                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
++# ---------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+-[if test "$cross_compiling" = yes; then :
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "$cross_compiling" = yes; then :
+   [$4]
+ else
+-  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+@@ -754,17 +907,19 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
++  else
++    puts (dlerror ());
+ 
+     exit (status);
+ }]
+ EOF
+   if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
++    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) $1 ;;
+       x$lt_dlneed_uscore) $2 ;;
+-      x$lt_unknown|x*) $3 ;;
++      x$lt_dlunknown|x*) $3 ;;
+     esac
+   else :
+     # compilation failed
+@@ -774,10 +929,12 @@
+ rm -fr conftest*
+ ])# _LT_AC_TRY_DLOPEN_SELF
+ 
++
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
++# ----------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+-[if test "x$enable_dlopen" != xyes; then
++[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
++if test "x$enable_dlopen" != xyes; then
+   enable_dlopen=unknown
+   enable_dlopen_self=unknown
+   enable_dlopen_self_static=unknown
+@@ -792,24 +949,39 @@
+     lt_cv_dlopen_self=yes
+     ;;
+ 
+-  cygwin* | mingw* | pw32*)
++  mingw* | pw32*)
+     lt_cv_dlopen="LoadLibrary"
+     lt_cv_dlopen_libs=
+    ;;
+ 
++  cygwin*)
++    lt_cv_dlopen="dlopen"
++    lt_cv_dlopen_libs=
++   ;;
++
++  darwin*)
++  # if libdl is installed we need to link against it
++    AC_CHECK_LIB([dl], [dlopen],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
++    lt_cv_dlopen="dyld"
++    lt_cv_dlopen_libs=
++    lt_cv_dlopen_self=yes
++    ])
++   ;;
++
+   *)
+     AC_CHECK_FUNC([shl_load],
+-          [lt_cv_dlopen="shl_load"],
++	  [lt_cv_dlopen="shl_load"],
+       [AC_CHECK_LIB([dld], [shl_load],
+-            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
++	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
+ 	[AC_CHECK_FUNC([dlopen],
+ 	      [lt_cv_dlopen="dlopen"],
+ 	  [AC_CHECK_LIB([dl], [dlopen],
+-	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
++		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ 	    [AC_CHECK_LIB([svld], [dlopen],
+-	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
++		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ 	      [AC_CHECK_LIB([dld], [dld_link],
+-	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
++		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
+ 	      ])
+ 	    ])
+ 	  ])
+@@ -827,11 +999,10 @@
+   case $lt_cv_dlopen in
+   dlopen)
+     save_CPPFLAGS="$CPPFLAGS"
+-    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -844,7 +1015,7 @@
+     ])
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
++      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+     	  lt_cv_dlopen_self_static, [dnl
+ 	  _LT_AC_TRY_DLOPEN_SELF(
+@@ -871,400 +1042,67 @@
+ fi
+ ])# AC_LIBTOOL_DLOPEN_SELF
+ 
+-AC_DEFUN([_LT_AC_LTCONFIG_HACK],
+-[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
+-sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
 -
--DESTDIR =
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
 -
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 -
- top_builddir = .
+-# Constants:
+-rm="rm -f"
 -
--ACLOCAL = @ACLOCAL@
--AUTOCONF = @AUTOCONF@
--AUTOMAKE = @AUTOMAKE@
--AUTOHEADER = @AUTOHEADER@
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
 -
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
--INSTALL_DATA = @INSTALL_DATA@
--INSTALL_SCRIPT = @INSTALL_SCRIPT@
--transform = @program_transform_name@
+-# All known linkers require a `.a' archive for static linking (except M$VC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
+-need_locks="$enable_libtool_lock"
 -
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
- NORMAL_INSTALL = :
- PRE_INSTALL = :
- POST_INSTALL = :
- NORMAL_UNINSTALL = :
- PRE_UNINSTALL = :
- POST_UNINSTALL = :
--host_alias = @host_alias@
-+build_triplet = @build@
- host_triplet = @host@
-+target_triplet = @target@
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in $(srcdir)/paragui-config.in \
-+	$(srcdir)/paragui.pc.in $(srcdir)/paragui.spec.in \
-+	$(top_srcdir)/configure AUTHORS COPYING INSTALL TODO \
-+	config.guess config.sub depcomp install-sh ltmain.sh missing
-+subdir = .
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno configure.status.lineno
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/include/paraconfig_gnu.h
-+CONFIG_CLEAN_FILES = paragui.spec paragui-config paragui.pc
-+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)" \
-+	"$(DESTDIR)$(pkgconfigdir)"
-+binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-+SCRIPTS = $(bin_SCRIPTS)
-+SOURCES =
-+DIST_SOURCES =
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+m4dataDATA_INSTALL = $(INSTALL_DATA)
-+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-+DATA = $(m4data_DATA) $(pkgconfig_DATA)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  { test ! -d $(distdir) \
-+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr $(distdir); }; }
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+ACLOCAL = @ACLOCAL@
-+AMDEP_FALSE = @AMDEP_FALSE@
-+AMDEP_TRUE = @AMDEP_TRUE@
-+AMTAR = @AMTAR@
-+AR = @AR@
- AS = @AS@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AWK = @AWK@
- BINDINGS = @BINDINGS@
- CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
- CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
- DLLTOOL = @DLLTOOL@
- ECHO = @ECHO@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
- EXEEXT = @EXEEXT@
- EXPAT_INCLUDE = @EXPAT_INCLUDE@
- EXPAT_LIB = @EXPAT_LIB@
- EXPAT_SUBDIR = @EXPAT_SUBDIR@
-+F77 = @F77@
-+FFLAGS = @FFLAGS@
-+GREP = @GREP@
- IMAGE_INCLUDE = @IMAGE_INCLUDE@
- IMAGE_LIBS = @IMAGE_LIBS@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+LDFLAGS = @LDFLAGS@
- LIBEXPAT = @LIBEXPAT@
-+LIBOBJS = @LIBOBJS@
- LIBPHYSFS = @LIBPHYSFS@
-+LIBS = @LIBS@
- LIBSTDCPP = @LIBSTDCPP@
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
-+LTLIBOBJS = @LTLIBOBJS@
- LT_AGE = @LT_AGE@
- LT_CURRENT = @LT_CURRENT@
- LT_RELEASE = @LT_RELEASE@
- LT_REVISION = @LT_REVISION@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- OBJDUMP = @OBJDUMP@
- OBJEXT = @OBJEXT@
- PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_VERSION = @PACKAGE_VERSION@
- PARAGUI_BINARY_AGE = @PARAGUI_BINARY_AGE@
- PARAGUI_CFLAGS = @PARAGUI_CFLAGS@
- PARAGUI_INTERFACE_AGE = @PARAGUI_INTERFACE_AGE@
-@@ -95,6 +162,7 @@
- PARAGUI_MICRO_VERSION = @PARAGUI_MICRO_VERSION@
- PARAGUI_MINOR_VERSION = @PARAGUI_MINOR_VERSION@
- PARAGUI_VERSION = @PARAGUI_VERSION@
-+PATH_SEPARATOR = @PATH_SEPARATOR@
- PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
- PHYSFS_LIB = @PHYSFS_LIB@
- PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,153 +178,193 @@
- SDL_CONFIG = @SDL_CONFIG@
- SDL_LIBS = @SDL_LIBS@
- SDL_PREFIX = @SDL_PREFIX@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
- STRIP = @STRIP@
- SWIG = @SWIG@
- SYSTEM_LIBS = @SYSTEM_LIBS@
- TOP_BUILDDIR = @TOP_BUILDDIR@
- VERSION = @VERSION@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+ac_ct_F77 = @ac_ct_F77@
-+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
- freetype_config = @freetype_config@
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
 -
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+subdirs = @subdirs@
-+sysconfdir = @sysconfdir@
-+target = @target@
-+target_alias = @target_alias@
-+target_cpu = @target_cpu@
-+target_os = @target_os@
-+target_vendor = @target_vendor@
- DISTCHECK_CONFIGURE_FLAGS = --enable-internalexpat --enable-internalphysfs
+-# Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+-test -z "$CC" && CC=cc
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+-test -z "$ac_objext" && ac_objext=o
 -
- SUBDIRS = include src data bindings test
+-if test x"$host" != x"$build"; then
+-  ac_tool_prefix=${host_alias}-
+-else
+-  ac_tool_prefix=
+-fi
 -
- DIST_SUBDIRS = $(SUBDIRS) sdk doc
+-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+-case $host_os in
+-linux-gnu*) ;;
+-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+-esac
 -
- bin_SCRIPTS = paragui-config
+-case $host_os in
+-aix3*)
+-  # AIX sometimes has problems with the GCC collect2 program.  For some
+-  # reason, if we set the COLLECT_NAMES environment variable, the problems
+-  # vanish in a puff of smoke.
+-  if test "X${COLLECT_NAMES+set}" != Xset; then
+-    COLLECT_NAMES=
+-    export COLLECT_NAMES
+-  fi
+-  ;;
+-esac
 -
--EXTRA_DIST =  	paragui.m4 	paragui.spec.in 	paragui.pc.in 	paragui.dev 	README 	README-ParaGUI.txt 	COPYING 	INSTALL 	TODO 	VisualC.zip 	mkdist-beos.sh 	CWparagui.txt 	CWProject.zip
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
 -
-+EXTRA_DIST = \
-+	paragui.m4 \
-+	paragui.spec.in \
-+	paragui.pc.in \
-+	paragui.dev \
-+	README \
-+	README-ParaGUI.txt \
-+	COPYING \
-+	INSTALL \
-+	TODO \
-+	VisualC.zip \
-+	mkdist-beos.sh \
-+	CWparagui.txt \
-+	CWProject.zip
+-if test -n "$RANLIB"; then
+-  case $host_os in
+-  openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-fi
+-
+-# Allow CC to be a program name with arguments.
+-set dummy $CC
+-compiler="[$]2"
+-
+-AC_MSG_CHECKING([for objdir])
+-rm -f .libs 2>/dev/null
+-mkdir .libs 2>/dev/null
+-if test -d .libs; then
+-  objdir=.libs
+-else
+-  # MS-DOS does not allow filenames that begin with a dot.
+-  objdir=_libs
+-fi
+-rmdir .libs 2>/dev/null
+-AC_MSG_RESULT($objdir)
+-
+-
+-AC_ARG_WITH(pic,
+-[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
+-pic_mode="$withval", pic_mode=default)
+-test -z "$pic_mode" && pic_mode=default
+-
+-# We assume here that the value for lt_cv_prog_cc_pic will not be cached
+-# in isolation, and that seeing it set (from the cache) indicates that
+-# the associated values are set (in the cache) correctly too.
+-AC_MSG_CHECKING([for $compiler option to produce PIC])
+-AC_CACHE_VAL(lt_cv_prog_cc_pic,
+-[ lt_cv_prog_cc_pic=
+-  lt_cv_prog_cc_shlib=
+-  lt_cv_prog_cc_wl=
+-  lt_cv_prog_cc_static=
+-  lt_cv_prog_cc_no_builtin=
+-  lt_cv_prog_cc_can_build_shared=$can_build_shared
+-
+-  if test "$GCC" = yes; then
+-    lt_cv_prog_cc_wl='-Wl,'
+-    lt_cv_prog_cc_static='-static'
+-
+-    case $host_os in
+-    aix*)
+-      # Below there is a dirty hack to force normal static linking with -ldl
+-      # The problem is because libdl dynamically linked with both libc and
+-      # libC (AIX C++ library), which obviously doesn't included in libraries
+-      # list by gcc. This cause undefined symbols with -static flags.
+-      # This hack allows C programs to be linked with "-static -ldl", but
+-      # not sure about C++ programs.
+-      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
+-      ;;
+-    amigaos*)
+-      # FIXME: we need at least 68020 code to build shared libraries, but
+-      # adding the `-m68020' flag to GCC prevents building anything better,
+-      # like `-m68040'.
+-      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
+-      ;;
+-    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+-      # PIC is the default for these OSes.
+-      ;;
+-    darwin* | rhapsody*)
+-      # PIC is the default on this platform
+-      # Common symbols not allowed in MH_DYLIB files
+-      lt_cv_prog_cc_pic='-fno-common'
+-      ;;
+-    cygwin* | mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+-      ;;
+-    sysv4*MP*)
+-      if test -d /usr/nec; then
+-	 lt_cv_prog_cc_pic=-Kconform_pic
+-      fi
+-      ;;
+-    *)
+-      lt_cv_prog_cc_pic='-fPIC'
+-      ;;
+-    esac
+-  else
+-    # PORTME Check for PIC flags for the system compiler.
+-    case $host_os in
+-    aix3* | aix4* | aix5*)
+-      lt_cv_prog_cc_wl='-Wl,'
+-      # All AIX code is PIC.
+-      if test "$host_cpu" = ia64; then
+-	# AIX 5 now supports IA64 processor
+-	lt_cv_prog_cc_static='-Bstatic'
+-      else
+-	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
+-      fi
+-      ;;
+-
+-    hpux9* | hpux10* | hpux11*)
+-      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
+-      lt_cv_prog_cc_pic='+Z'
+-      ;;
+-
+-    irix5* | irix6* | nonstopux*)
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static='-non_shared'
+-      # PIC (with -KPIC) is the default.
+-      ;;
+-
+-    cygwin* | mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
+-      ;;
+-
+-    newsos6)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      ;;
+-
+-    osf3* | osf4* | osf5*)
+-      # All OSF/1 code is PIC.
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static='-non_shared'
+-      ;;
+-
+-    sco3.2v5*)
+-      lt_cv_prog_cc_pic='-Kpic'
+-      lt_cv_prog_cc_static='-dn'
+-      lt_cv_prog_cc_shlib='-belf'
+-      ;;
+-
+-    solaris*)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      lt_cv_prog_cc_wl='-Wl,'
+-      ;;
+-
+-    sunos4*)
+-      lt_cv_prog_cc_pic='-PIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      lt_cv_prog_cc_wl='-Qoption ld '
+-      ;;
+-
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      lt_cv_prog_cc_wl='-Wl,'
+-      ;;
+-
+-    uts4*)
+-      lt_cv_prog_cc_pic='-pic'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      ;;
+-
+-    sysv4*MP*)
+-      if test -d /usr/nec ;then
+-	lt_cv_prog_cc_pic='-Kconform_pic'
+-	lt_cv_prog_cc_static='-Bstatic'
+-      fi
+-      ;;
+-
+-    *)
+-      lt_cv_prog_cc_can_build_shared=no
+-      ;;
+-    esac
+-  fi
+-])
+-if test -z "$lt_cv_prog_cc_pic"; then
+-  AC_MSG_RESULT([none])
+-else
+-  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
  
- m4datadir = $(datadir)/aclocal
- m4data_DATA = paragui.m4
+-  # Check to make sure the pic_flag actually works.
+-  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
+-  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
+-    save_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
+-    AC_TRY_COMPILE([], [], [dnl
+-      case $host_os in
+-      hpux9* | hpux10* | hpux11*)
+-	# On HP-UX, both CC and GCC only warn that PIC is supported... then
+-	# they create non-PIC objects.  So, if there were any warnings, we
+-	# assume that PIC is not supported.
+-	if test -s conftest.err; then
+-	  lt_cv_prog_cc_pic_works=no
+-	else
+-	  lt_cv_prog_cc_pic_works=yes
+-	fi
+-	;;
+-      *)
+-	lt_cv_prog_cc_pic_works=yes
+-	;;
+-      esac
+-    ], [dnl
+-      lt_cv_prog_cc_pic_works=no
+-    ])
+-    CFLAGS="$save_CFLAGS"
+-  ])
 -
- pkgconfigdir = $(prefix)/lib/pkgconfig
- pkgconfig_DATA = paragui.pc
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = ./include/paraconfig_gnu.h
--CONFIG_CLEAN_FILES =  paragui.spec paragui-config paragui.pc
--SCRIPTS =  $(bin_SCRIPTS)
-+all: all-recursive
+-  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
+-    lt_cv_prog_cc_pic=
+-    lt_cv_prog_cc_can_build_shared=no
+-  else
+-    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
+-  fi
+-
+-  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
+-fi
+-
+-# Check for any special shared library compilation flags.
+-if test -n "$lt_cv_prog_cc_shlib"; then
+-  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
+-  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
+-  else
+-   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
+-    lt_cv_prog_cc_can_build_shared=no
+-  fi
+-fi
++# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
++# ---------------------------------
++# Check to see if options -c and -o are simultaneously supported by compiler
++AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
++  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
++  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
++   $rm -r conftest 2>/dev/null
++   mkdir conftest
++   cd conftest
++   mkdir out
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  
--DATA =  $(m4data_DATA) $(pkgconfig_DATA)
+-AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
+-AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
+-  lt_cv_prog_cc_static_works=no
+-  save_LDFLAGS="$LDFLAGS"
+-  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
+-  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
+-  LDFLAGS="$save_LDFLAGS"
++   lt_compiler_flag="-o out/conftest2.$ac_objext"
++   # Insert the option either (1) after the last *FLAGS variable, or
++   # (2) before a word containing "conftest.", or (3) at the end.
++   # Note that $ac_compile itself does not contain backslashes and begins
++   # with a dollar sign (not a hyphen), so the echo should work correctly.
++   lt_compile=`echo "$ac_compile" | $SED \
++   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
++   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
++   -e 's:$: $lt_compiler_flag:'`
++   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
++   (eval "$lt_compile" 2>out/conftest.err)
++   ac_status=$?
++   cat out/conftest.err >&AS_MESSAGE_LOG_FD
++   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
++   if (exit $ac_status) && test -s out/conftest2.$ac_objext
++   then
++     # The compiler can only warn and ignore the option if not recognized
++     # So say no if there are warnings
++     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
++       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++     fi
++   fi
++   chmod u+w . 2>&AS_MESSAGE_LOG_FD
++   $rm conftest*
++   # SGI C++ compiler will create directory out/ii_files/ for
++   # template instantiation
++   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++   $rm out/* && rmdir out
++   cd ..
++   rmdir conftest
++   $rm conftest*
+ ])
++])# AC_LIBTOOL_PROG_CC_C_O
+ 
+-# Belt *and* braces to stop my trousers falling down:
+-test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
+-AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
 -
--DIST_COMMON =  README AUTHORS COPYING INSTALL Makefile.am Makefile.in \
--TODO aclocal.m4 config.guess config.sub configure configure.in \
--include/paraconfig_gnu.h.in include/stamp-h.in install-sh ltmain.sh \
--missing mkinstalldirs paragui-config.in paragui.pc.in paragui.spec.in
+-pic_flag="$lt_cv_prog_cc_pic"
+-special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
+-wl="$lt_cv_prog_cc_wl"
+-link_static_flag="$lt_cv_prog_cc_static"
+-no_builtin_flag="$lt_cv_prog_cc_no_builtin"
+-can_build_shared="$lt_cv_prog_cc_can_build_shared"
 -
 -
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-# Check to see if options -o and -c are simultaneously supported by compiler
+-AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
+-AC_CACHE_VAL([lt_cv_compiler_c_o], [
+-$rm -r conftest 2>/dev/null
+-mkdir conftest
+-cd conftest
+-echo "int some_variable = 0;" > conftest.$ac_ext
+-mkdir out
+-# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-# that will create temporary files in the current directory regardless of
+-# the output directory.  Thus, making CWD read-only will cause this test
+-# to fail, enabling locking or at least warning the user not to do parallel
+-# builds.
+-chmod -w .
+-save_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+-compiler_c_o=no
+-if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+-  # The compiler can only warn and ignore the option if not recognized
+-  # So say no if there are warnings
+-  if test -s out/conftest.err; then
+-    lt_cv_compiler_c_o=no
+-  else
+-    lt_cv_compiler_c_o=yes
+-  fi
+-else
+-  # Append any errors to the config.log.
+-  cat out/conftest.err 1>&AC_FD_CC
+-  lt_cv_compiler_c_o=no
+-fi
+-CFLAGS="$save_CFLAGS"
+-chmod u+w .
+-$rm conftest* out/*
+-rmdir out
+-cd ..
+-rmdir conftest
+-$rm -r conftest 2>/dev/null
+-])
+-compiler_c_o=$lt_cv_compiler_c_o
+-AC_MSG_RESULT([$compiler_c_o])
 -
--TAR = gtar
--GZIP_ENV = --best
--all: all-redirect
- .SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
+-if test x"$compiler_c_o" = x"yes"; then
+-  # Check to see if we can write to a .lo
+-  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
+-  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
+-  lt_cv_compiler_o_lo=no
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -c -o conftest.lo"
+-  save_objext="$ac_objext"
+-  ac_objext=lo
+-  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
+-    # The compiler can only warn and ignore the option if not recognized
+-    # So say no if there are warnings
+-    if test -s conftest.err; then
+-      lt_cv_compiler_o_lo=no
+-    else
+-      lt_cv_compiler_o_lo=yes
+-    fi
+-  ])
+-  ac_objext="$save_objext"
+-  CFLAGS="$save_CFLAGS"
+-  ])
+-  compiler_o_lo=$lt_cv_compiler_o_lo
+-  AC_MSG_RESULT([$compiler_o_lo])
+-else
+-  compiler_o_lo=no
+-fi
+ 
++# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
++# -----------------------------------------
+ # Check to see if we can do hard links to lock some files if needed
++AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
++[AC_REQUIRE([_LT_AC_LOCK])dnl
++
+ hard_links="nottested"
+-if test "$compiler_c_o" = no && test "$need_locks" != no; then
++if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+   # do not overwrite the value of need_locks provided by the user
+   AC_MSG_CHECKING([if we can lock with hard links])
+   hard_links=yes
+@@ -1275,764 +1113,77 @@
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   AC_MSG_RESULT([$hard_links])
+   if test "$hard_links" = no; then
+-    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
++    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+     need_locks=warn
+   fi
+ else
+   need_locks=no
+ fi
++])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
+ 
+-if test "$GCC" = yes; then
+-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
+-  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
+-  echo "int some_variable = 0;" > conftest.$ac_ext
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
+-  compiler_rtti_exceptions=no
+-  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
+-    # The compiler can only warn and ignore the option if not recognized
+-    # So say no if there are warnings
+-    if test -s conftest.err; then
+-      compiler_rtti_exceptions=no
+-    else
+-      compiler_rtti_exceptions=yes
+-    fi
+-  ])
+-  CFLAGS="$save_CFLAGS"
+-  AC_MSG_RESULT([$compiler_rtti_exceptions])
 -
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-  if test "$compiler_rtti_exceptions" = "yes"; then
+-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
+-  else
+-    no_builtin_flag=' -fno-builtin'
+-  fi
+-fi
 -
--$(ACLOCAL_M4):  configure.in 
--	cd $(srcdir) && $(ACLOCAL)
-+am--refresh:
-+	@:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-+	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+	esac;
+-# See if the linker supports building shared libraries.
+-AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
+-
+-allow_undefined_flag=
+-no_undefined_flag=
+-need_lib_prefix=unknown
+-need_version=unknown
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-archive_cmds=
+-archive_expsym_cmds=
+-old_archive_from_new_cmds=
+-old_archive_from_expsyms_cmds=
+-export_dynamic_flag_spec=
+-whole_archive_flag_spec=
+-thread_safe_flag_spec=
+-hardcode_into_libs=no
+-hardcode_libdir_flag_spec=
+-hardcode_libdir_separator=
+-hardcode_direct=no
+-hardcode_minus_L=no
+-hardcode_shlibpath_var=unsupported
+-runpath_var=
+-link_all_deplibs=unknown
+-always_export_symbols=no
+-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-# include_expsyms should be a list of space-separated symbols to be *always*
+-# included in the symbol list
+-include_expsyms=
+-# exclude_expsyms can be an egrep regular expression of symbols to exclude
+-# it will be wrapped by ` (' and `)$', so one must not match beginning or
+-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-# as well as any symbol that contains `d'.
+-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-# platforms (ab)use it in PIC code, but their linkers get confused if
+-# the symbol is explicitly referenced.  Since portable code cannot
+-# rely on this symbol name, it's probably fine to never include it in
+-# preloaded symbol tables.
+-extract_expsyms_cmds=
+-
+-case $host_os in
+-cygwin* | mingw* | pw32*)
+-  # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-  # When not using gcc, we currently assume that we are using
+-  # Microsoft Visual C++.
+-  if test "$GCC" != yes; then
+-    with_gnu_ld=no
+-  fi
+-  ;;
+-openbsd*)
+-  with_gnu_ld=no
+-  ;;
+-esac
+-
+-ld_shlibs=yes
+-if test "$with_gnu_ld" = yes; then
+-  # If archive_cmds runs LD, not CC, wlarc should be empty
+-  wlarc='${wl}'
+-
+-  # See if GNU ld supports shared libraries.
+-  case $host_os in
+-  aix3* | aix4* | aix5*)
+-    # On AIX, the GNU linker is very broken
+-    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
+-    ld_shlibs=no
+-    cat <<EOF 1>&2
+-
+-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+-*** to be unable to reliably create shared libraries on AIX.
+-*** Therefore, libtool is disabling shared libraries support.  If you
+-*** really care for shared libraries, you may want to modify your PATH
+-*** so that a non-GNU linker is found, and then restart.
+-
+-EOF
+-    ;;
+-
+-  amigaos*)
+-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
+-
+-    # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+-    # that the semantics of dynamic libraries on AmigaOS, at least up
+-    # to version 4, is to share data among multiple programs linked
+-    # with the same dynamic library.  Since this doesn't match the
+-    # behavior of shared libraries on other platforms, we can use
+-    # them.
+-    ld_shlibs=no
+-    ;;
+-
+-  beos*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      allow_undefined_flag=unsupported
+-      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+-      # support --undefined.  This deserves some investigation.  FIXME
+-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
+-
+-  cygwin* | mingw* | pw32*)
+-    # hardcode_libdir_flag_spec is actually meaningless, as there is
+-    # no search path for DLLs.
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    allow_undefined_flag=unsupported
+-    always_export_symbols=yes
+-
+-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
+-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
+-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
+-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
+-      else $CC -o impgen impgen.c ; fi)~
+-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
+-
+-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
+-
+-    # cygwin and mingw dlls have different entry points and sets of symbols
+-    # to exclude.
+-    # FIXME: what about values for MSVC?
+-    dll_entry=__cygwin_dll_entry at 12
+-    dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12~
+-    case $host_os in
+-    mingw*)
+-      # mingw values
+-      dll_entry=_DllMainCRTStartup at 12
+-      dll_exclude_symbols=DllMain at 12,DllMainCRTStartup at 12,DllEntryPoint at 12~
+-      ;;
+-    esac
+-
+-    # mingw and cygwin differ, and it's simplest to just exclude the union
+-    # of the two symbol sets.
+-    dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12,DllMainCRTStartup at 12,DllEntryPoint at 12
+-
+-    # recent cygwin and mingw systems supply a stub DllMain which the user
+-    # can override, but on older systems we have to supply one (in ltdll.c)
+-    if test "x$lt_cv_need_dllmain" = "xyes"; then
+-      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
+-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
+-	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
+-    else
+-      ltdll_obj=
+-      ltdll_cmds=
+-    fi
+-
+-    # Extract the symbol export list from an `--export-all' def file,
+-    # then regenerate the def file from the symbol export list, so that
+-    # the compiled dll only exports the symbol export list.
+-    # Be careful not to strip the DATA tag left be newer dlltools.
+-    export_symbols_cmds="$ltdll_cmds"'
+-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
+-      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
+-
+-    # If the export-symbols file already is a .def file (1st line
+-    # is EXPORTS), use it as is.
+-    # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
+-	cp $export_symbols $output_objdir/$soname-def;
+-      else
+-	echo EXPORTS > $output_objdir/$soname-def;
+-	_lt_hint=1;
+-	cat $export_symbols | while read symbol; do
+-	 set dummy \$symbol;
+-	 case \[$]# in
+-	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+-	   4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
+-	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
+-	 esac;
+-	 _lt_hint=`expr 1 + \$_lt_hint`;
+-	done;
+-      fi~
+-      '"$ltdll_cmds"'
+-      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
+-      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
+-      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
+-    ;;
+-
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-      wlarc=
+-    else
+-      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-    fi
+-    ;;
+-
+-  solaris* | sysv5*)
+-    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+-      ld_shlibs=no
+-      cat <<EOF 1>&2
+-
+-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+-*** create shared libraries on Solaris systems.  Therefore, libtool
+-*** is disabling shared libraries support.  We urge you to upgrade GNU
+-*** binutils to release 2.9.1 or newer.  Another option is to modify
+-*** your PATH or compiler configuration so that the native linker is
+-*** used, and then restart.
+-
+-EOF
+-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
+-
+-  sunos4*)
+-    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    wlarc=
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  *)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
+-  esac
  
--config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- 	$(SHELL) ./config.status --recheck
--$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
--	cd $(srcdir) && $(AUTOCONF)
+-  if test "$ld_shlibs" = yes; then
+-    runpath_var=LD_RUN_PATH
+-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+-    export_dynamic_flag_spec='${wl}--export-dynamic'
+-    case $host_os in
+-    cygwin* | mingw* | pw32*)
+-      # dlltool doesn't understand --whole-archive et. al.
+-      whole_archive_flag_spec=
+-      ;;
+-    *)
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+-      else
+-	whole_archive_flag_spec=
+-      fi
+-      ;;
+-    esac
+-  fi
++# AC_LIBTOOL_OBJDIR
++# -----------------
++AC_DEFUN([AC_LIBTOOL_OBJDIR],
++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
++[rm -f .libs 2>/dev/null
++mkdir .libs 2>/dev/null
++if test -d .libs; then
++  lt_cv_objdir=.libs
+ else
+-  # PORTME fill in a description of your system's linker (not GNU ld)
+-  case $host_os in
+-  aix3*)
+-    allow_undefined_flag=unsupported
+-    always_export_symbols=yes
+-    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-    # Note: this linker hardcodes the directories in LIBPATH if there
+-    # are no directories specified by -L.
+-    hardcode_minus_L=yes
+-    if test "$GCC" = yes && test -z "$link_static_flag"; then
+-      # Neither direct hardcoding nor static linking is supported with a
+-      # broken collect2.
+-      hardcode_direct=unsupported
+-    fi
+-    ;;
 -
--include/paraconfig_gnu.h: include/stamp-h
--	@if test ! -f $@; then \
--		rm -f include/stamp-h; \
--		$(MAKE) include/stamp-h; \
--	else :; fi
--include/stamp-h: $(srcdir)/include/paraconfig_gnu.h.in $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES= CONFIG_HEADERS=include/paraconfig_gnu.h:include/paraconfig_gnu.h.in \
--	     $(SHELL) ./config.status
--	@echo timestamp > include/stamp-h 2> /dev/null
--$(srcdir)/include/paraconfig_gnu.h.in: $(srcdir)/include/stamp-h.in
--	@if test ! -f $@; then \
--		rm -f $(srcdir)/include/stamp-h.in; \
--		$(MAKE) $(srcdir)/include/stamp-h.in; \
--	else :; fi
--$(srcdir)/include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOHEADER)
--	@echo timestamp > $(srcdir)/include/stamp-h.in 2> /dev/null
+-  aix4* | aix5*)
+-    if test "$host_cpu" = ia64; then
+-      # On IA64, the linker does run time linking by default, so we don't
+-      # have to do anything special.
+-      aix_use_runtimelinking=no
+-      exp_sym_flag='-Bexport'
+-      no_entry_flag=""
+-    else
+-      aix_use_runtimelinking=no
 -
--mostlyclean-hdr:
+-      # Test if we are trying to use run time linking or normal
+-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-      # need to do runtime linking.
+-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
+-	for ld_flag in $LDFLAGS; do
+-	  case $ld_flag in
+-	  *-brtl*)
+-	    aix_use_runtimelinking=yes
+-	    break
+-	  ;;
+-	  esac
+-	done
+-      esac
 -
--clean-hdr:
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    fi
 -
--distclean-hdr:
--	-rm -f include/paraconfig_gnu.h
+-    # When large executables or shared objects are built, AIX ld can
+-    # have problems creating the table of contents.  If linking a library
+-    # or program results in "error TOC overflow" add -mminimal-toc to
+-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 -
--maintainer-clean-hdr:
--paragui.spec: $(top_builddir)/config.status paragui.spec.in
--	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
--paragui-config: $(top_builddir)/config.status paragui-config.in
--	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
--paragui.pc: $(top_builddir)/config.status paragui.pc.in
--	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-    hardcode_direct=yes
+-    archive_cmds=''
+-    hardcode_libdir_separator=':'
+-    if test "$GCC" = yes; then
+-      case $host_os in aix4.[[012]]|aix4.[[012]].*)
+-	collect2name=`${CC} -print-prog-name=collect2`
+-	if test -f "$collect2name" && \
+-	  strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	then
+-	  # We have reworked collect2
+-	  hardcode_direct=yes
+-	else
+-	  # We have old collect2
+-	  hardcode_direct=unsupported
+-	  # It fails to find uninstalled libraries when the uninstalled
+-	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-	  # to unsupported forces relinking
+-	  hardcode_minus_L=yes
+-	  hardcode_libdir_flag_spec='-L$libdir'
+-	  hardcode_libdir_separator=
+-	fi
+-      esac
+-
+-      shared_flag='-shared'
+-    else
+-      # not using gcc
+-      if test "$host_cpu" = ia64; then
+-	shared_flag='${wl}-G'
+-      else
+-	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='${wl}-G'
+-	else
+-	  shared_flag='${wl}-bM:SRE'
+-	fi
+-      fi
+-    fi
+-
+-    # It seems that -bexpall can do strange things, so it is better to
+-    # generate a list of symbols to export.
+-    always_export_symbols=yes
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # Warning - without using the other runtime loading flags (-brtl),
+-      # -berok will link without error, but may produce a broken library.
+-      allow_undefined_flag='-berok'
+-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+-      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-    else
+-      if test "$host_cpu" = ia64; then
+-	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+-	allow_undefined_flag="-z nodefs"
+-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-      else
+-	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+-	# Warning - without using the other run time loading flags,
+-	# -berok will link without error, but may produce a broken library.
+-	allow_undefined_flag='${wl}-berok'
+-	# This is a bit strange, but is similar to how AIX traditionally builds
+-	# it's shared libraries.
+-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
+-      fi
+-    fi
+-    ;;
+-
+-  amigaos*)
+-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
+-    # see comment about different semantics on the GNU ld section
+-    ld_shlibs=no
+-    ;;
+-
+-  cygwin* | mingw* | pw32*)
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    # hardcode_libdir_flag_spec is actually meaningless, as there is
+-    # no search path for DLLs.
+-    hardcode_libdir_flag_spec=' '
+-    allow_undefined_flag=unsupported
+-    # Tell ltmain to make .lib files, not .a files.
+-    libext=lib
+-    # FIXME: Setting linknames here is a bad hack.
+-    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-    # The linker will automatically build a .lib file if we build a DLL.
+-    old_archive_from_new_cmds='true'
+-    # FIXME: Should let the user specify the lib program.
+-    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-    fix_srcfile_path='`cygpath -w "$srcfile"`'
+-    ;;
+-
+-  darwin* | rhapsody*)
+-    case "$host_os" in
+-    rhapsody* | darwin1.[[012]])
+-      allow_undefined_flag='-undefined suppress'
+-      ;;
+-    *) # Darwin 1.3 on
+-      allow_undefined_flag='-flat_namespace -undefined suppress'
+-      ;;
+-    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!
+-    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
+-    # We need to add '_' to the symbols in $export_symbols first
+-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    whole_archive_flag_spec='-all_load $convenience'
+-    ;;
+-
+-  freebsd1*)
+-    ld_shlibs=no
+-    ;;
+-
+-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-  # support.  Future versions do this automatically, but an explicit c++rt0.o
+-  # does not break anything, and helps significantly (at the cost of a little
+-  # extra space).
+-  freebsd2.2*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-  freebsd2*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-  freebsd*)
+-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  hpux9* | hpux10* | hpux11*)
+-    case $host_os in
+-    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
+-    esac
+-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes # Not in the search PATH, but as the default
+-			 # location of the library.
+-    export_dynamic_flag_spec='${wl}-E'
+-    ;;
+-
+-  irix5* | irix6* | nonstopux*)
+-    if test "$GCC" = yes; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    else
+-      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      hardcode_libdir_flag_spec='-rpath $libdir'
+-    fi
+-    hardcode_libdir_separator=:
+-    link_all_deplibs=yes
+-    ;;
+-
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-    else
+-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-    fi
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  newsos6)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  openbsd*)
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-      export_dynamic_flag_spec='${wl}-E'
+-    else
+-      case "$host_os" in
+-      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	hardcode_libdir_flag_spec='-R$libdir'
+-        ;;
+-      *)
+-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-        ;;
+-      esac
+-    fi
+-    ;;
+-
+-  os2*)
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
+-    allow_undefined_flag=unsupported
+-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-    ;;
+-
+-  osf3*)
+-    if test "$GCC" = yes; then
+-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-    else
+-      allow_undefined_flag=' -expect_unresolved \*'
+-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-    fi
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    ;;
+-
+-  osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-    if test "$GCC" = yes; then
+-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    else
+-      allow_undefined_flag=' -expect_unresolved \*'
+-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
+-
+-      #Both c and cxx compiler support -rpath directly
+-      hardcode_libdir_flag_spec='-rpath $libdir'
+-    fi
+-    hardcode_libdir_separator=:
+-    ;;
+-
+-  sco3.2v5*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_shlibpath_var=no
+-    runpath_var=LD_RUN_PATH
+-    hardcode_runpath_var=yes
+-    export_dynamic_flag_spec='${wl}-Bexport'
+-    ;;
+-
+-  solaris*)
+-    # gcc --version < 3.0 without binutils cannot create self contained
+-    # shared libraries reliably, requiring libgcc.a to resolve some of
+-    # the object symbols generated in some cases.  Libraries that use
+-    # assert need libgcc.a to resolve __eprintf, for example.  Linking
+-    # a copy of libgcc.a into every shared library to guarantee resolving
+-    # such symbols causes other problems:  According to Tim Van Holder
+-    # <tim.van.holder at pandora.be>, C++ libraries end up with a separate
+-    # (to the application) exception stack for one thing.
+-    no_undefined_flag=' -z defs'
+-    if test "$GCC" = yes; then
+-      case `$CC --version 2>/dev/null` in
+-      [[12]].*)
+-	cat <<EOF 1>&2
+-
+-*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
+-*** create self contained shared libraries on Solaris systems, without
+-*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
+-*** -no-undefined support, which will at least allow you to build shared
+-*** libraries.  However, you may find that when you link such libraries
+-*** into an application without using GCC, you have to manually add
+-*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
+-*** upgrade to a newer version of GCC.  Another option is to rebuild your
+-*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
+-
+-EOF
+-        no_undefined_flag=
+-	;;
+-      esac
+-    fi
+-    # $CC -shared without GNU ld will not create a library from C++
+-    # object files and a static libstdc++, better avoid it by now
+-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_shlibpath_var=no
+-    case $host_os in
+-    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+-    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+-    esac
+-    link_all_deplibs=yes
+-    ;;
+-
+-  sunos4*)
+-    if test "x$host_vendor" = xsequent; then
+-      # Use $CC to link under sequent, because it throws in some extra .o
+-      # files that make .init and .fini sections work.
+-      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-    else
+-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-    fi
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  sysv4)
+-    case $host_vendor in
+-      sni)
+-        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-        hardcode_direct=yes # is this really true???
+-        ;;
+-      siemens)
+-        ## LD is ld it makes a PLAMLIB
+-        ## CC just makes a GrossModule.
+-        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-        reload_cmds='$CC -r -o $output$reload_objs'
+-        hardcode_direct=no
+-        ;;
+-      motorola)
+-        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
+-        ;;
+-    esac
+-    runpath_var='LD_RUN_PATH'
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  sysv4.3*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_shlibpath_var=no
+-    export_dynamic_flag_spec='-Bexport'
+-    ;;
+-
+-  sysv5*)
+-    no_undefined_flag=' -z text'
+-    # $CC -shared without GNU ld will not create a library from C++
+-    # object files and a static libstdc++, better avoid it by now
+-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-    hardcode_libdir_flag_spec=
+-    hardcode_shlibpath_var=no
+-    runpath_var='LD_RUN_PATH'
+-    ;;
+-
+-  uts4*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  dgux*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  sysv4*MP*)
+-    if test -d /usr/nec; then
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-      hardcode_shlibpath_var=no
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ld_shlibs=yes
+-    fi
+-    ;;
+-
+-  sysv4.2uw2*)
+-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_minus_L=no
+-    hardcode_shlibpath_var=no
+-    hardcode_runpath_var=yes
+-    runpath_var=LD_RUN_PATH
+-    ;;
+-
+-  sysv5uw7* | unixware7*)
+-    no_undefined_flag='${wl}-z ${wl}text'
+-    if test "$GCC" = yes; then
+-      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-    else
+-      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-    fi
+-    runpath_var='LD_RUN_PATH'
+-    hardcode_shlibpath_var=no
+-    ;;
+-
+-  *)
+-    ld_shlibs=no
+-    ;;
+-  esac
++  # MS-DOS does not allow filenames that begin with a dot.
++  lt_cv_objdir=_libs
+ fi
+-AC_MSG_RESULT([$ld_shlibs])
+-test "$ld_shlibs" = no && can_build_shared=no
++rmdir .libs 2>/dev/null])
++objdir=$lt_cv_objdir
++])# AC_LIBTOOL_OBJDIR
  
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+paragui.spec: $(top_builddir)/config.status $(srcdir)/paragui.spec.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+paragui-config: $(top_builddir)/config.status $(srcdir)/paragui-config.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+paragui.pc: $(top_builddir)/config.status $(srcdir)/paragui.pc.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
- install-binSCRIPTS: $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(bindir)
-+	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
- 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
--	  if test -f $$p; then \
--	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
--	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
--	  else if test -f $(srcdir)/$$p; then \
--	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
--	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
--	  else :; fi; fi; \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  if test -f $$d$$p; then \
-+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-+	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-+	  else :; fi; \
- 	done
++
++# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
++# ----------------------------------------------
+ # Check hardcoding attributes.
+-AC_MSG_CHECKING([how to hardcode library paths into programs])
+-hardcode_action=
+-if test -n "$hardcode_libdir_flag_spec" || \
+-   test -n "$runpath_var"; then
++AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
++[AC_MSG_CHECKING([how to hardcode library paths into programs])
++_LT_AC_TAGVAR(hardcode_action, $1)=
++if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
++   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
  
- uninstall-binSCRIPTS:
- 	@$(NORMAL_UNINSTALL)
--	list='$(bin_SCRIPTS)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
-+	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-+	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
- 	done
+   # We can hardcode non-existant directories.
+-  if test "$hardcode_direct" != no &&
++  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != 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 "$hardcode_shlibpath_var" != no &&
+-     test "$hardcode_minus_L" != no; then
++     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
++     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
+     # Linking always hardcodes the temporary library directory.
+-    hardcode_action=relink
++    _LT_AC_TAGVAR(hardcode_action, $1)=relink
+   else
+     # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    hardcode_action=immediate
++    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
+   fi
+ else
+   # We cannot hardcode anything, or else we can only hardcode existing
+   # directories.
+-  hardcode_action=unsupported
++  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
+ fi
+-AC_MSG_RESULT([$hardcode_action])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
  
-+mostlyclean-libtool:
-+	-rm -f *.lo
+-striplib=
++if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
++  # Fast installation is not supported
++  enable_fast_install=no
++elif test "$shlibpath_overrides_runpath" = yes ||
++     test "$enable_shared" = no; then
++  # Fast installation is not necessary
++  enable_fast_install=needless
++fi
++])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
 +
-+clean-libtool:
-+	-rm -rf .libs _libs
 +
-+distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- install-m4dataDATA: $(m4data_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
-+	test -z "$(m4datadir)" || $(mkdir_p) "$(DESTDIR)$(m4datadir)"
- 	@list='$(m4data_DATA)'; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p; \
--	  else if test -f $$p; then \
--	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p; \
--	  fi; fi; \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \
-+	  $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \
- 	done
++# AC_LIBTOOL_SYS_LIB_STRIP
++# ------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
++[striplib=
+ old_striplib=
+ AC_MSG_CHECKING([whether stripping libraries is possible])
+ if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+@@ -2040,17 +1191,35 @@
+   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+   AC_MSG_RESULT([yes])
+ else
++# FIXME - insert some real tests, host_os isn't really good enough
++  case $host_os in
++   darwin*)
++       if test -n "$STRIP" ; then
++         striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
++         AC_MSG_RESULT([yes])
++       else
+   AC_MSG_RESULT([no])
+ fi
++       ;;
++   *)
++  AC_MSG_RESULT([no])
++    ;;
++  esac
++fi
++])# AC_LIBTOOL_SYS_LIB_STRIP
  
- uninstall-m4dataDATA:
- 	@$(NORMAL_UNINSTALL)
--	list='$(m4data_DATA)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(m4datadir)/$$p; \
-+	@list='$(m4data_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(m4datadir)/$$f"; \
- 	done
--
- install-pkgconfigDATA: $(pkgconfig_DATA)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
-+	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
- 	@list='$(pkgconfig_DATA)'; for p in $$list; do \
--	  if test -f $(srcdir)/$$p; then \
--	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
--	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \
--	  else if test -f $$p; then \
--	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
--	    $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \
--	  fi; fi; \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f=$(am__strip_dir) \
-+	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-+	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- 	done
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
  
- uninstall-pkgconfigDATA:
- 	@$(NORMAL_UNINSTALL)
--	list='$(pkgconfig_DATA)'; for p in $$list; do \
--	  rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \
-+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-+	  f=$(am__strip_dir) \
-+	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
- 	done
++# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++# -----------------------------
+ # PORTME Fill in your ld.so characteristics
++AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
+ AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -2059,17 +1228,74 @@
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib /usr/X11R6/lib"
++sys_lib_dlsearch_path_spec="/lib /usr/lib"
++m4_if($1,[],[
++if test "$GCC" = yes; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
++    # if the path contains ";" then we assume it to be the separator
++    # otherwise default to the standard path separator (i.e. ":") - it is
++    # assumed that no part of a normal pathname contains ";" but that should
++    # okay in the real world where ";" in dirpaths is itself problematic.
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++  else
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++  fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`echo $lt_search_path_spec`
++else
++  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
++need_lib_prefix=unknown
++hardcode_into_libs=no
++
++# when you set need_version to no, make sure it does not cause -set_version
++# flags to be left without arguments
++need_version=unknown
  
- # This directory's subdirectories are mostly independent; you can cd
-@@ -265,13 +373,14 @@
- # (1) if the variable is set in `config.status', edit `config.status'
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
--
-- at SET_MAKE@
--
--all-recursive install-data-recursive install-exec-recursive \
--installdirs-recursive install-recursive uninstall-recursive  \
--check-recursive installcheck-recursive info-recursive dvi-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+$(RECURSIVE_TARGETS):
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -283,7 +392,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -291,13 +400,24 @@
+ case $host_os in
+ aix3*)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+   shlibpath_var=LIBPATH
  
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
--	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
--	  rev="$$subdir $$rev"; \
--	  test "$$subdir" != "." || dot_seen=yes; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
- 	done; \
--	test "$$dot_seen" = "no" && rev=". $$rev"; \
-+	rev="$$rev ."; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	for subdir in $$rev; do \
- 	  echo "Making $$target in $$subdir"; \
-@@ -307,181 +427,325 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- 	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
+-  # AIX has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}.so$major'
++  # AIX 3 has no versioning support, so we append a major version to the name.
++  soname_spec='${libname}${release}${shared_ext}$major'
+   ;;
  
--tags: TAGS
--
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
-+	mkid -fID $$unique
-+tags: TAGS
+ aix4* | aix5*)
+@@ -2079,7 +1305,7 @@
+   hardcode_into_libs=yes
+   if test "$host_cpu" = ia64; then
+     # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
++    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+     shlibpath_var=LD_LIBRARY_PATH
+   else
+     # With GCC up to 2.95.x, collect2 would create an import file
+@@ -2089,57 +1315,54 @@
+     # development snapshots of GCC prior to 3.0.
+     case $host_os in
+       aix4 | aix4.[[01]] | aix4.[[01]].*)
+-	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	     echo ' yes '
+-	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	  :
+-	else
+-	  can_build_shared=no
+-	fi
+-	;;
++      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
++	   echo ' yes '
++	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
++	:
++      else
++	can_build_shared=no
++      fi
++      ;;
+     esac
+-    # AIX (on Power*) has no versioning support, so currently we can
+-    # not hardcode correct soname into executable. Probably we can
+-    # add versioning support to collect2, so additional links can
+-    # be useful in future.
++    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
++    # soname into executable. Probably we can add versioning support to
++    # collect2, so additional links can be useful in future.
+     if test "$aix_use_runtimelinking" = yes; then
+       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+       # instead of lib<name>.a to let people know that these are not
+       # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+     else
+       # We preserve .a as extension for shared libraries through AIX4.2
+       # and later when we are not doing run time linking.
+       library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}.so$major'
++      soname_spec='${libname}${release}${shared_ext}$major'
+     fi
+     shlibpath_var=LIBPATH
+   fi
+-  hardcode_into_libs=yes
+   ;;
  
--TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--   if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
--   fi; \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
- 	done; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
--
--mostlyclean-tags:
--
--clean-tags:
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+   ;;
+ 
+ beos*)
+-  library_names_spec='${libname}.so'
++  library_names_spec='${libname}${shared_ext}'
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
++bsdi[[45]]*)
+   version_type=linux
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+   sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  export_dynamic_flag_spec=-rdynamic
+   # the default ld.so.conf also contains /usr/contrib/lib and
+   # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+   # libtool to hard-code these into programs
+@@ -2147,29 +1370,56 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
++  shrext_cmds=".dll"
+   need_version=no
+   need_lib_prefix=no
++
+   case $GCC,$host_os in
+-  yes,cygwin*)
++  yes,cygwin* | yes,mingw* | yes,pw32*)
+     library_names_spec='$libname.dll.a'
+-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
+-    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
++    # DLL is installed to $(libdir)/../bin by postinstall_cmds
++    postinstall_cmds='base_file=`basename \${file}`~
++      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog .libs/$dlname \$dldir/$dlname'
+-    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      $install_prog $dir/$dlname \$dldir/$dlname~
++      chmod a+x \$dldir/$dlname'
++    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
++    shlibpath_overrides_runpath=yes
++
++    case $host_os in
++    cygwin*)
++      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
++      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
++      ;;
++    mingw*)
++      # MinGW DLLs use traditional 'lib' prefix
++      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
++        # It is most probably a Windows format PATH printed by
++        # mingw gcc, but we are running on Cygwin. Gcc prints its search
++        # path with ; separators, and with drive letters. We can handle the
++        # drive letters (cygwin fileutils understands them), so leave them,
++        # especially as we might pass files found there to a mingw objdump,
++        # which wouldn't understand a cygwinified path. Ahh.
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++      else
++        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++      fi
++      ;;
++    pw32*)
++      # pw32 DLLs use 'pw' prefix rather than 'lib'
++      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
++      ;;
++    esac
+     ;;
+-  yes,mingw*)
+-    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
+-    ;;
+-  yes,pw32*)
+-    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+-    ;;
++
+   *)
+-    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
++    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+     ;;
+   esac
+   dynamic_linker='Win32 ld.exe'
+@@ -2182,30 +1432,49 @@
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
+-  # 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='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
+-  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
++  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
++  soname_spec='${libname}${release}${major}$shared_ext'
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
++  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++  m4_if([$1], [],[
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) 
++  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
++  ;;
++
++dgux*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++  # DragonFly does not have aout.  When/if they implement a new
++  # versioning mechanism, adjust this.
++  if test -x /usr/bin/objformat; then
++    objformat=`/usr/bin/objformat`
++  else
++    case $host_os in
++    freebsd[[123]]*) objformat=aout ;;
++    *) objformat=elf ;;
++    esac
++  fi
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+       need_version=no
+       need_lib_prefix=no
+       ;;
+     freebsd-*)
+-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+       need_version=yes
+       ;;
+   esac
+@@ -2214,10 +1483,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  *)
++  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
++  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  *) # from 4.6 on, and DragonFly
++    shlibpath_overrides_runpath=yes
++    hardcode_into_libs=yes
++    ;;
+   esac
+   ;;
+ 
+@@ -2225,8 +1503,8 @@
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
+-  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   hardcode_into_libs=yes
+   ;;
+@@ -2234,36 +1512,87 @@
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+-  dynamic_linker="$host_os dld.sl"
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  shlibpath_var=SHLIB_PATH
+-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+-  soname_spec='${libname}${release}.sl$major'
++  case $host_cpu in
++  ia64*)
++    shrext_cmds='.so'
++    hardcode_into_libs=yes
++    dynamic_linker="$host_os dld.so"
++    shlibpath_var=LD_LIBRARY_PATH
++    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    if test "X$HPUX_IA64_MODE" = X32; then
++      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
++    else
++      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
++    fi
++    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++    ;;
++   hppa*64*)
++     shrext_cmds='.sl'
++     hardcode_into_libs=yes
++     dynamic_linker="$host_os dld.sl"
++     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
++     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
++     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++     soname_spec='${libname}${release}${shared_ext}$major'
++     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
++     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
++     ;;
++   *)
++    shrext_cmds='.sl'
++    dynamic_linker="$host_os dld.sl"
++    shlibpath_var=SHLIB_PATH
++    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
++    ;;
++  esac
+   # HP-UX runs *really* slowly unless shared libraries are mode 555.
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix[[3-9]]*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  ;;
++
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+-    *)          version_type=irix ;;
++    *)
++	if test "$lt_cv_prog_gnu_ld" = yes; then
++		version_type=linux
++	else
++		version_type=irix
++	fi ;;
+   esac
+   need_lib_prefix=no
+   need_version=no
+-  soname_spec='${libname}${release}.so$major'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+   case $host_os in
+   irix5* | nonstopux*)
+     libsuff= shlibsuff=
+     ;;
+   *)
+     case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
++      libsuff= shlibsuff= libmagic=32-bit;;
++    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
++      libsuff=32 shlibsuff=N32 libmagic=N32;;
++    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
++      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+     *) libsuff= shlibsuff= libmagic=never-match;;
+     esac
+     ;;
+@@ -2272,20 +1601,21 @@
+   shlibpath_overrides_runpath=no
+   sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+   sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++  hardcode_into_libs=yes
+   ;;
+ 
+ # No shared lib support for Linux oldld, aout, or coff.
+-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++linux*oldld* | linux*aout* | linux*coff*)
+   dynamic_linker=no
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux* | k*bsd*-gnu)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+@@ -2294,12 +1624,11 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  case $host_cpu:$lt_cv_cc_64bit_output in
+-  powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+-    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
+-    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
+-    ;;
+-  esac
++  # Append ld.so.conf contents to the search path
++  if test -f /etc/ld.so.conf; then
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++  fi
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+@@ -2310,17 +1639,29 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++netbsdelf*-gnu)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  hardcode_into_libs=yes
++  dynamic_linker='NetBSD ld.elf_so'
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+-    soname_spec='${libname}${release}.so$major'
++    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++    soname_spec='${libname}${release}${shared_ext}$major'
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -2330,64 +1671,77 @@
+ 
+ newsos6)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++nto-qnx*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   ;;
+ 
+ openbsd*)
+   version_type=sunos
++  sys_lib_dlsearch_path_spec="/usr/lib"
+   need_lib_prefix=no
+-  need_version=no
++  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++  case $host_os in
++    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++    *)                         need_version=no  ;;
++  esac
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case "$host_os" in
+-    openbsd2.[[89]] | openbsd2.[[89]].*)
+-      shlibpath_overrides_runpath=no
+-      ;;
+-    *)
+-      shlibpath_overrides_runpath=yes
+-      ;;
+-    esac
++    case $host_os in
++      openbsd2.[[89]] | openbsd2.[[89]].*)
++	shlibpath_overrides_runpath=no
++	;;
++      *)
++	shlibpath_overrides_runpath=yes
++	;;
++      esac
+   else
+     shlibpath_overrides_runpath=yes
+   fi
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ os2*)
+   libname_spec='$name'
++  shrext_cmds=".dll"
+   need_lib_prefix=no
+-  library_names_spec='$libname.dll $libname.a'
++  library_names_spec='$libname${shared_ext} $libname.a'
+   dynamic_linker='OS/2 ld.exe'
+   shlibpath_var=LIBPATH
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+   version_type=osf
++  need_lib_prefix=no
+   need_version=no
+-  soname_spec='${libname}${release}.so$major'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+   shlibpath_var=LD_LIBRARY_PATH
+   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  hardcode_into_libs=yes
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}.so$major'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  shlibpath_var=LD_LIBRARY_PATH
++rdos*)
++  dynamic_linker=no
+   ;;
+ 
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+@@ -2397,7 +1751,7 @@
+ 
+ sunos4*)
+   version_type=sunos
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+@@ -2407,10 +1761,10 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_vendor in
+     sni)
+@@ -2431,29 +1785,43 @@
+   esac
+   ;;
+ 
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
+-  shlibpath_var=LD_LIBRARY_PATH
++sysv4*MP*)
++  if test -d /usr/nec ;then
++    version_type=linux
++    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
++    soname_spec='$libname${shared_ext}.$major'
++    shlibpath_var=LD_LIBRARY_PATH
++  fi
+   ;;
+ 
+-dgux*)
+-  version_type=linux
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  version_type=freebsd-elf
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
+   shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  if test "$with_gnu_ld" = yes; then
++    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++    shlibpath_overrides_runpath=no
++  else
++    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++    shlibpath_overrides_runpath=yes
++    case $host_os in
++      sco3.2v5*)
++        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++	;;
++    esac
++  fi
++  sys_lib_dlsearch_path_spec='/usr/lib'
+   ;;
+ 
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
+-    soname_spec='$libname.so.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
++uts4*)
++  version_type=linux
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ *)
+@@ -2463,7 +1831,924 @@
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
+-# Report the final consequences.
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
++])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
++
++
++# _LT_AC_TAGCONFIG
++# ----------------
++AC_DEFUN([_LT_AC_TAGCONFIG],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
++    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
++        [include additional configurations @<:@automatic@:>@])],
++    [tagnames="$withval"])
++
++if test -f "$ltmain" && test -n "$tagnames"; then
++  if test ! -f "${ofile}"; then
++    AC_MSG_WARN([output file `$ofile' does not exist])
++  fi
++
++  if test -z "$LTCC"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
++    if test -z "$LTCC"; then
++      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
++    else
++      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
++    fi
++  fi
++  if test -z "$LTCFLAGS"; then
++    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++  fi
++
++  # Extract list of available tagged configurations in $ofile.
++  # Note that this assumes the entire list is on one line.
++  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
++
++  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++  for tagname in $tagnames; do
++    IFS="$lt_save_ifs"
++    # Check whether tagname contains only valid characters
++    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
++    "") ;;
++    *)  AC_MSG_ERROR([invalid tag name: $tagname])
++	;;
++    esac
++
++    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
++    then
++      AC_MSG_ERROR([tag name \"$tagname\" already exists])
++    fi
++
++    # Update the list of available tags.
++    if test -n "$tagname"; then
++      echo appending configuration tag \"$tagname\" to $ofile
++
++      case $tagname in
++      CXX)
++	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++	    (test "X$CXX" != "Xg++"))) ; then
++	  AC_LIBTOOL_LANG_CXX_CONFIG
++	else
++	  tagname=""
 +	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
-+	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$tags $$unique
++	;;
 +
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && cd $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) $$here
++      F77)
++	if test -n "$F77" && test "X$F77" != "Xno"; then
++	  AC_LIBTOOL_LANG_F77_CONFIG
++	else
++	  tagname=""
++	fi
++	;;
++
++      GCJ)
++	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
++	  AC_LIBTOOL_LANG_GCJ_CONFIG
++	else
++	  tagname=""
++	fi
++	;;
++
++      RC)
++	AC_LIBTOOL_LANG_RC_CONFIG
++	;;
++
++      *)
++	AC_MSG_ERROR([Unsupported tag name: $tagname])
++	;;
++      esac
++
++      # Append the new tag name to the list of available tags.
++      if test -n "$tagname" ; then
++      available_tags="$available_tags $tagname"
++    fi
++    fi
++  done
++  IFS="$lt_save_ifs"
++
++  # Now substitute the updated list of available tags.
++  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
++    mv "${ofile}T" "$ofile"
++    chmod +x "$ofile"
++  else
++    rm -f "${ofile}T"
++    AC_MSG_ERROR([unable to update list of available tagged configurations.])
++  fi
++fi
++])# _LT_AC_TAGCONFIG
++
++
++# AC_LIBTOOL_DLOPEN
++# -----------------
++# enable checks for dlopen support
++AC_DEFUN([AC_LIBTOOL_DLOPEN],
++ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_DLOPEN
++
++
++# AC_LIBTOOL_WIN32_DLL
++# --------------------
++# declare package support for building win32 DLLs
++AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
++[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
++])# AC_LIBTOOL_WIN32_DLL
++
++
++# AC_ENABLE_SHARED([DEFAULT])
++# ---------------------------
++# implement the --enable-shared flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_SHARED],
++[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([shared],
++    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
++	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_shared=yes ;;
++    no) enable_shared=no ;;
++    *)
++      enable_shared=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_shared=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
++])# AC_ENABLE_SHARED
++
++
++# AC_DISABLE_SHARED
++# -----------------
++# set the default shared flag to --disable-shared
++AC_DEFUN([AC_DISABLE_SHARED],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_SHARED(no)
++])# AC_DISABLE_SHARED
++
++
++# AC_ENABLE_STATIC([DEFAULT])
++# ---------------------------
++# implement the --enable-static flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_STATIC],
++[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([static],
++    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
++	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_static=yes ;;
++    no) enable_static=no ;;
++    *)
++     enable_static=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_static=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
++])# AC_ENABLE_STATIC
++
++
++# AC_DISABLE_STATIC
++# -----------------
++# set the default static flag to --disable-static
++AC_DEFUN([AC_DISABLE_STATIC],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_STATIC(no)
++])# AC_DISABLE_STATIC
++
++
++# AC_ENABLE_FAST_INSTALL([DEFAULT])
++# ---------------------------------
++# implement the --enable-fast-install flag
++# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
++AC_DEFUN([AC_ENABLE_FAST_INSTALL],
++[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
++AC_ARG_ENABLE([fast-install],
++    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
++    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
++    [p=${PACKAGE-default}
++    case $enableval in
++    yes) enable_fast_install=yes ;;
++    no) enable_fast_install=no ;;
++    *)
++      enable_fast_install=no
++      # Look at the argument we got.  We use all the common list separators.
++      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
++      for pkg in $enableval; do
++	IFS="$lt_save_ifs"
++	if test "X$pkg" = "X$p"; then
++	  enable_fast_install=yes
++	fi
++      done
++      IFS="$lt_save_ifs"
++      ;;
++    esac],
++    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
++])# AC_ENABLE_FAST_INSTALL
++
++
++# AC_DISABLE_FAST_INSTALL
++# -----------------------
++# set the default to --disable-fast-install
++AC_DEFUN([AC_DISABLE_FAST_INSTALL],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++AC_ENABLE_FAST_INSTALL(no)
++])# AC_DISABLE_FAST_INSTALL
++
++
++# AC_LIBTOOL_PICMODE([MODE])
++# --------------------------
++# implement the --with-pic flag
++# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
++AC_DEFUN([AC_LIBTOOL_PICMODE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++pic_mode=ifelse($#,1,$1,default)
++])# AC_LIBTOOL_PICMODE
++
++
++# AC_PROG_EGREP
++# -------------
++# This is predefined starting with Autoconf 2.54, so this conditional
++# definition can be removed once we require Autoconf 2.54 or later.
++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
++[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
++   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
++    then ac_cv_prog_egrep='grep -E'
++    else ac_cv_prog_egrep='egrep'
++    fi])
++ EGREP=$ac_cv_prog_egrep
++ AC_SUBST([EGREP])
++])])
++
++
++# AC_PATH_TOOL_PREFIX
++# -------------------
++# find a file program which can recognize shared library
++AC_DEFUN([AC_PATH_TOOL_PREFIX],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_MSG_CHECKING([for $1])
++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
++[case $MAGIC_CMD in
++[[\\/*] |  ?:[\\/]*])
++  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++  ;;
++*)
++  lt_save_MAGIC_CMD="$MAGIC_CMD"
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++dnl $ac_dummy forces splitting on constant user-supplied paths.
++dnl POSIX.2 word splitting is done only on the output of word expansions,
++dnl not every word.  This closes a longstanding sh security hole.
++  ac_dummy="ifelse([$2], , $PATH, [$2])"
++  for ac_dir in $ac_dummy; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f $ac_dir/$1; then
++      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
++      if test -n "$file_magic_test_file"; then
++	case $deplibs_check_method in
++	"file_magic "*)
++	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
++	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
++	    $EGREP "$file_magic_regex" > /dev/null; then
++	    :
++	  else
++	    cat <<EOF 1>&2
++
++*** Warning: the command libtool uses to detect shared libraries,
++*** $file_magic_cmd, produces output that libtool cannot recognize.
++*** The result is that libtool may fail to recognize shared libraries
++*** as such.  This will affect the creation of libtool libraries that
++*** depend on shared libraries, but programs linked with such libtool
++*** libraries will work regardless of this problem.  Nevertheless, you
++*** may want to report the problem to your system manager and/or to
++*** bug-libtool at gnu.org
++
++EOF
++	  fi ;;
++	esac
++      fi
++      break
++    fi
++  done
++  IFS="$lt_save_ifs"
++  MAGIC_CMD="$lt_save_MAGIC_CMD"
++  ;;
++esac])
++MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
++if test -n "$MAGIC_CMD"; then
++  AC_MSG_RESULT($MAGIC_CMD)
++else
++  AC_MSG_RESULT(no)
++fi
++])# AC_PATH_TOOL_PREFIX
++
++
++# AC_PATH_MAGIC
++# -------------
++# find a file program which can recognize a shared library
++AC_DEFUN([AC_PATH_MAGIC],
++[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
++if test -z "$lt_cv_path_MAGIC_CMD"; then
++  if test -n "$ac_tool_prefix"; then
++    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
++  else
++    MAGIC_CMD=:
++  fi
++fi
++])# AC_PATH_MAGIC
++
++
++# AC_PROG_LD
++# ----------
++# 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],
++	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
++    [test "$withval" = no || with_gnu_ld=yes],
++    [with_gnu_ld=no])
++AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([AC_PROG_CC])dnl
++AC_REQUIRE([AC_CANONICAL_HOST])dnl
++AC_REQUIRE([AC_CANONICAL_BUILD])dnl
++ac_prog=ld
++if test "$GCC" = yes; then
++  # Check if gcc -print-prog-name=ld gives a path.
++  AC_MSG_CHECKING([for ld used by $CC])
++  case $host in
++  *-*-mingw*)
++    # gcc leaves a trailing carriage return which upsets mingw
++    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
++  *)
++    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
++  esac
++  case $ac_prog in
++    # Accept absolute paths.
++    [[\\/]]* | ?:[[\\/]]*)
++      re_direlt='/[[^/]][[^/]]*/\.\./'
++      # Canonicalize the pathname of ld
++      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
++      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
++	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
++      done
++      test -z "$LD" && LD="$ac_prog"
++      ;;
++  "")
++    # If it fails, then pretend we aren't using GCC.
++    ac_prog=ld
++    ;;
++  *)
++    # If it is relative, then search for the first ld in PATH.
++    with_gnu_ld=unknown
++    ;;
++  esac
++elif test "$with_gnu_ld" = yes; then
++  AC_MSG_CHECKING([for GNU ld])
++else
++  AC_MSG_CHECKING([for non-GNU ld])
++fi
++AC_CACHE_VAL(lt_cv_path_LD,
++[if test -z "$LD"; then
++  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++  for ac_dir in $PATH; do
++    IFS="$lt_save_ifs"
++    test -z "$ac_dir" && ac_dir=.
++    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
++      lt_cv_path_LD="$ac_dir/$ac_prog"
++      # Check to see if the program is GNU ld.  I'd rather use --version,
++      # but apparently some variants of GNU ld only accept -v.
++      # Break only if it was the GNU/non-GNU ld that we prefer.
++      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
++      *GNU* | *'with BFD'*)
++	test "$with_gnu_ld" != no && break
++	;;
++      *)
++	test "$with_gnu_ld" != yes && break
++	;;
++      esac
++    fi
++  done
++  IFS="$lt_save_ifs"
++else
++  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++fi])
++LD="$lt_cv_path_LD"
++if test -n "$LD"; then
++  AC_MSG_RESULT($LD)
++else
++  AC_MSG_RESULT(no)
++fi
++test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
++AC_PROG_LD_GNU
++])# AC_PROG_LD
++
++
++# AC_PROG_LD_GNU
++# --------------
++AC_DEFUN([AC_PROG_LD_GNU],
++[AC_REQUIRE([AC_PROG_EGREP])dnl
++AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
++case `$LD -v 2>&1 </dev/null` in
++*GNU* | *'with BFD'*)
++  lt_cv_prog_gnu_ld=yes
++  ;;
++*)
++  lt_cv_prog_gnu_ld=no
++  ;;
++esac])
++with_gnu_ld=$lt_cv_prog_gnu_ld
++])# AC_PROG_LD_GNU
++
++
++# AC_PROG_LD_RELOAD_FLAG
++# ----------------------
++# find reload flag for linker
++#   -- PORTME Some linkers may need a different reload flag.
++AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
++[AC_CACHE_CHECK([for $LD option to reload object files],
++  lt_cv_ld_reload_flag,
++  [lt_cv_ld_reload_flag='-r'])
++reload_flag=$lt_cv_ld_reload_flag
++case $reload_flag in
++"" | " "*) ;;
++*) reload_flag=" $reload_flag" ;;
++esac
++reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++  darwin*)
++    if test "$GCC" = yes; then
++      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++    else
++      reload_cmds='$LD$reload_flag -o $output$reload_objs'
++    fi
++    ;;
++esac
++])# AC_PROG_LD_RELOAD_FLAG
++
++
++# AC_DEPLIBS_CHECK_METHOD
++# -----------------------
++# how to check for library dependencies
++#  -- PORTME fill in with the dynamic library characteristics
++AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
++lt_cv_deplibs_check_method,
++[lt_cv_file_magic_cmd='$MAGIC_CMD'
++lt_cv_file_magic_test_file=
++lt_cv_deplibs_check_method='unknown'
++# Need to set the preceding variable on all platforms that support
++# interlibrary dependencies.
++# 'none' -- dependencies not supported.
++# `unknown' -- same as none, but documents that we really don't know.
++# 'pass_all' -- all dependencies passed with no checks.
++# 'test_compile' -- check by making test program.
++# 'file_magic [[regex]]' -- check by looking for files in library path
++# which responds to the $file_magic_cmd with a given extended regex.
++# If you have `file' or equivalent on your system and you're not sure
++# whether `pass_all' will *always* work, you probably want this one.
++
++case $host_os in
++aix4* | aix5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++beos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++bsdi[[45]]*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
++  lt_cv_file_magic_cmd='/usr/bin/file -L'
++  lt_cv_file_magic_test_file=/shlib/libc.so
++  ;;
++
++cygwin*)
++  # func_win32_libid is a shell function defined in ltmain.sh
++  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++  lt_cv_file_magic_cmd='func_win32_libid'
++  ;;
++
++mingw* | pw32*)
++  # Base MSYS/MinGW do not provide the 'file' command needed by
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
++  ;;
++
++darwin* | rhapsody*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++freebsd* | dragonfly*)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    case $host_cpu in
++    i*86 )
++      # Not sure whether the presence of OpenBSD here was a mistake.
++      # Let's accept both of them until this is cleared up.
++      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
++      lt_cv_file_magic_cmd=/usr/bin/file
++      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++      ;;
++    esac
++  else
++    lt_cv_deplibs_check_method=pass_all
++  fi
++  ;;
++
++gnu*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++hpux10.20* | hpux11*)
++  lt_cv_file_magic_cmd=/usr/bin/file
++  case $host_cpu in
++  ia64*)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
++    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
++    ;;
++  hppa*64*)
++    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
++    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
++    ;;
++  *)
++    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
++    lt_cv_file_magic_test_file=/usr/lib/libc.sl
++    ;;
++  esac
++  ;;
++
++interix[[3-9]]*)
++  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++  ;;
++
++irix5* | irix6* | nonstopux*)
++  case $LD in
++  *-32|*"-32 ") libmagic=32-bit;;
++  *-n32|*"-n32 ") libmagic=N32;;
++  *-64|*"-64 ") libmagic=64-bit;;
++  *) libmagic=never-match;;
++  esac
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++# This must be Linux ELF.
++linux* | k*bsd*-gnu)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++netbsd* | netbsdelf*-gnu)
++  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
++  fi
++  ;;
++
++newos6*)
++  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
++  lt_cv_file_magic_cmd=/usr/bin/file
++  lt_cv_file_magic_test_file=/usr/lib/libnls.so
++  ;;
++
++nto-qnx*)
++  lt_cv_deplibs_check_method=unknown
++  ;;
++
++openbsd*)
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
++  else
++    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
++  fi
++  ;;
++
++osf3* | osf4* | osf5*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++rdos*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++solaris*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++
++sysv4 | sysv4.3*)
++  case $host_vendor in
++  motorola)
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
++    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
++    ;;
++  ncr)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  sequent)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
++    ;;
++  sni)
++    lt_cv_file_magic_cmd='/bin/file'
++    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
++    lt_cv_file_magic_test_file=/lib/libc.so
++    ;;
++  siemens)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  pc)
++    lt_cv_deplibs_check_method=pass_all
++    ;;
++  esac
++  ;;
++
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++  lt_cv_deplibs_check_method=pass_all
++  ;;
++esac
++])
++file_magic_cmd=$lt_cv_file_magic_cmd
++deplibs_check_method=$lt_cv_deplibs_check_method
++test -z "$deplibs_check_method" && deplibs_check_method=unknown
++])# AC_DEPLIBS_CHECK_METHOD
++
++
++# AC_PROG_NM
++# ----------
++# 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
++  # Let the user override the test.
++  lt_cv_path_NM="$NM"
++else
++  lt_nm_to_check="${ac_tool_prefix}nm"
++  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++    lt_nm_to_check="$lt_nm_to_check nm"
++  fi
++  for lt_tmp_nm in $lt_nm_to_check; do
++    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++      IFS="$lt_save_ifs"
++      test -z "$ac_dir" && ac_dir=.
++      tmp_nm="$ac_dir/$lt_tmp_nm"
++      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++	# Check to see if the nm accepts a BSD-compat flag.
++	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
++	#   nm: unknown option "B" ignored
++	# Tru64's nm complains that /dev/null is an invalid object file
++	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++	*/dev/null* | *'Invalid file or object type'*)
++	  lt_cv_path_NM="$tmp_nm -B"
++	  break
++	  ;;
++	*)
++	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++	  */dev/null*)
++	    lt_cv_path_NM="$tmp_nm -p"
++	    break
++	    ;;
++	  *)
++	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++	    continue # so that we can try to find one that supports BSD flags
++	    ;;
++	  esac
++	  ;;
++	esac
++      fi
++    done
++    IFS="$lt_save_ifs"
++  done
++  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++fi])
++NM="$lt_cv_path_NM"
++])# AC_PROG_NM
++
++
++# AC_CHECK_LIBM
++# -------------
++# check for math library
++AC_DEFUN([AC_CHECK_LIBM],
++[AC_REQUIRE([AC_CANONICAL_HOST])dnl
++LIBM=
++case $host in
++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
++  # These system don't have libm, or don't need it
++  ;;
++*-ncr-sysv4.3*)
++  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
++  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
++  ;;
++*)
++  AC_CHECK_LIB(m, cos, LIBM="-lm")
++  ;;
++esac
++])# AC_CHECK_LIBM
++
++
++# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl convenience library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-convenience to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!).  If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
++AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  case $enable_ltdl_convenience in
++  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
++  "") enable_ltdl_convenience=yes
++      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
++  esac
++  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
++  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_CONVENIENCE
++
++
++# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
++# -----------------------------------
++# sets LIBLTDL to the link flags for the libltdl installable library and
++# LTDLINCL to the include flags for the libltdl header and adds
++# --enable-ltdl-install to the configure arguments.  Note that
++# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!).  If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
++# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
++AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
++[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
++  AC_CHECK_LIB(ltdl, lt_dlinit,
++  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
++  [if test x"$enable_ltdl_install" = xno; then
++     AC_MSG_WARN([libltdl not installed, but installation disabled])
++   else
++     enable_ltdl_install=yes
++   fi
++  ])
++  if test x"$enable_ltdl_install" = x"yes"; then
++    ac_configure_args="$ac_configure_args --enable-ltdl-install"
++    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
++    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
++  else
++    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
++    LIBLTDL="-lltdl"
++    LTDLINCL=
++  fi
++  # For backwards non-gettext consistent compatibility...
++  INCLTDL="$LTDLINCL"
++])# AC_LIBLTDL_INSTALLABLE
++
++
++# AC_LIBTOOL_CXX
++# --------------
++# enable support for C++ libraries
++AC_DEFUN([AC_LIBTOOL_CXX],
++[AC_REQUIRE([_LT_AC_LANG_CXX])
++])# AC_LIBTOOL_CXX
++
++
++# _LT_AC_LANG_CXX
++# ---------------
++AC_DEFUN([_LT_AC_LANG_CXX],
++[AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
++])# _LT_AC_LANG_CXX
++
++# _LT_AC_PROG_CXXCPP
++# ------------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++    (test "X$CXX" != "Xg++"))) ; then
++  AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
++
++# AC_LIBTOOL_F77
++# --------------
++# enable support for Fortran 77 libraries
++AC_DEFUN([AC_LIBTOOL_F77],
++[AC_REQUIRE([_LT_AC_LANG_F77])
++])# AC_LIBTOOL_F77
++
++
++# _LT_AC_LANG_F77
++# ---------------
++AC_DEFUN([_LT_AC_LANG_F77],
++[AC_REQUIRE([AC_PROG_F77])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
++])# _LT_AC_LANG_F77
++
++
++# AC_LIBTOOL_GCJ
++# --------------
++# enable support for GCJ libraries
++AC_DEFUN([AC_LIBTOOL_GCJ],
++[AC_REQUIRE([_LT_AC_LANG_GCJ])
++])# AC_LIBTOOL_GCJ
++
++
++# _LT_AC_LANG_GCJ
++# ---------------
++AC_DEFUN([_LT_AC_LANG_GCJ],
++[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
++  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
++    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
++      [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=${tagnames+${tagnames},}GCJ])
++])# _LT_AC_LANG_GCJ
++
++
++# AC_LIBTOOL_RC
++# -------------
++# enable support for Windows resource files
++AC_DEFUN([AC_LIBTOOL_RC],
++[AC_REQUIRE([LT_AC_PROG_RC])
++_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
++])# AC_LIBTOOL_RC
++
++
++# AC_LIBTOOL_LANG_C_CONFIG
++# ------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
++AC_DEFUN([_LT_AC_LANG_C_CONFIG],
++[lt_save_CC="$CC"
++AC_LANG_PUSH(C)
++
++# Source file extension for C test sources.
++ac_ext=c
++
++# Object file extension for compiled C test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(){return(0);}'
++
++_LT_AC_SYS_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++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_DLOPEN_SELF
++
++# Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
  
- distclean-tags:
--	-rm -f TAGS ID
--
--maintainer-clean-tags:
--
--distdir = $(PACKAGE)-$(VERSION)
--top_distdir = $(distdir)
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+@@ -2472,7 +2757,7 @@
  
--# This target untars the dist file and tries a VPATH configuration.  Then
--# it guarantees that the distribution is self-contained by making another
--# tarfile.
--distcheck: dist
--	-rm -rf $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
--	mkdir $(distdir)/=build
--	mkdir $(distdir)/=inst
--	dc_install_base=`cd $(distdir)/=inst && pwd`; \
--	cd $(distdir)/=build \
--	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
--	  && $(MAKE) $(AM_MAKEFLAGS) \
--	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
--	  && $(MAKE) $(AM_MAKEFLAGS) check \
--	  && $(MAKE) $(AM_MAKEFLAGS) install \
--	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
--	  && $(MAKE) $(AM_MAKEFLAGS) dist
--	-rm -rf $(distdir)
--	@banner="$(distdir).tar.gz is ready for distribution"; \
--	dashes=`echo "$$banner" | sed s/./=/g`; \
--	echo "$$dashes"; \
--	echo "$$banner"; \
--	echo "$$dashes"
--dist: distdir
--	-chmod -R a+r $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
--	-rm -rf $(distdir)
--dist-all: distdir
--	-chmod -R a+r $(distdir)
--	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
--	-rm -rf $(distdir)
- distdir: $(DISTFILES)
--	-rm -rf $(distdir)
-+	$(am__remove_distdir)
- 	mkdir $(distdir)
--	-chmod 777 $(distdir)
--	@for file in $(DISTFILES); do \
--	  d=$(srcdir); \
-+	$(mkdir_p) $(distdir)/.
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-+	list='$(DISTFILES)'; for file in $$list; do \
-+	  case $$file in \
-+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-+	  esac; \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-+	    dir="/$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
-+	  else \
-+	    dir=''; \
-+	  fi; \
- 	  if test -d $$d/$$file; then \
--	    cp -pr $$d/$$file $(distdir)/$$file; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-+	    fi; \
-+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
- 	  else \
- 	    test -f $(distdir)/$$file \
--	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-+	    || cp -p $$d/$$file $(distdir)/$$file \
-+	    || exit 1; \
- 	  fi; \
- 	done
--	for subdir in $(DIST_SUBDIRS); do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
--	    chmod 777 $(distdir)/$$subdir; \
--	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
-+	        distdir) \
- 	      || exit 1; \
- 	  fi; \
- 	done
--	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
--info-am:
--info: info-recursive
--dvi-am:
--dvi: dvi-recursive
-+	$(MAKE) $(AM_MAKEFLAGS) \
-+	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-+	  dist-hook
-+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-+	|| chmod -R a+r $(distdir)
-+dist-gzip: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+   test "$enable_shared" = yes && enable_static=no
+   if test -n "$RANLIB"; then
+@@ -2481,11 +2766,11 @@
+   fi
+   ;;
+ 
+-aix4*)
++aix4* | aix5*)
+   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+     test "$enable_shared" = yes && enable_static=no
+   fi
+-  ;;
++    ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+ 
+@@ -2494,111 +2779,1523 @@
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+ 
+-if test "$hardcode_action" = relink; then
+-  # Fast installation is not supported
+-  enable_fast_install=no
+-elif test "$shlibpath_overrides_runpath" = yes ||
+-     test "$enable_shared" = no; then
+-  # Fast installation is not necessary
+-  enable_fast_install=needless
++AC_LIBTOOL_CONFIG($1)
 +
-+dist-bzip2: distdir
-+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
++AC_LANG_POP
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_C_CONFIG
 +
-+dist-tarZ: distdir
-+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+	$(am__remove_distdir)
 +
-+dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__remove_distdir)
++# AC_LIBTOOL_LANG_CXX_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
++AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
++[AC_LANG_PUSH(C++)
++AC_REQUIRE([AC_PROG_CXX])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
 +
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__remove_distdir)
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
 +
-+dist dist-all: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
++# Dependencies to place before and after the object being linked:
++_LT_AC_TAGVAR(predep_objects, $1)=
++_LT_AC_TAGVAR(postdep_objects, $1)=
++_LT_AC_TAGVAR(predeps, $1)=
++_LT_AC_TAGVAR(postdeps, $1)=
++_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
 +
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	*.tar.bz2*) \
-+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.Z*) \
-+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-+	*.shar.gz*) \
-+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
++# Source file extension for C++ test sources.
++ac_ext=cpp
++
++# Object file extension for compiled C++ test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="int some_variable = 0;"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC=$CC
++lt_save_LD=$LD
++lt_save_GCC=$GCC
++GCC=$GXX
++lt_save_with_gnu_ld=$with_gnu_ld
++lt_save_path_LD=$lt_cv_path_LD
++if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
++  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
++else
++  $as_unset lt_cv_prog_gnu_ld
++fi
++if test -n "${lt_cv_path_LDCXX+set}"; then
++  lt_cv_path_LD=$lt_cv_path_LDCXX
++else
++  $as_unset lt_cv_path_LD
+ fi
++test -z "${LDCXX+set}" || LD=$LDCXX
++CC=${CXX-"c++"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++# We don't want -fno-exception wen compiling C++ code, so set the
++# no_builtin_flag separately
++if test "$GXX" = yes; then
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
++else
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+ fi
+ 
+-AC_LIBTOOL_DLOPEN_SELF
++if test "$GXX" = yes; then
++  # Set up default GNU C++ configuration
+ 
+-if test "$enable_shared" = yes && test "$GCC" = yes; then
+-  case $archive_cmds in
+-  *'~'*)
+-    # FIXME: we may have to deal with multi-command sequences.
++  AC_PROG_LD
++
++  # Check if GNU C++ uses GNU ld as the underlying linker, since the
++  # archiving commands below assume that GNU ld is being used.
++  if test "$with_gnu_ld" = yes; then
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
++    #     investigate it a little bit more. (MM)
++    wlarc='${wl}'
++
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
++	grep 'no-whole-archive' > /dev/null; then
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    else
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++  else
++    with_gnu_ld=no
++    wlarc=
++
++    # A generic and very simple default shared library creation
++    # command for GNU C++ for the case where it uses the native
++    # linker, instead of GNU ld.  If possible, this setting should
++    # overridden to take advantage of the native linker features on
++    # the platform it is being used on.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++  fi
++
++  # Commands to make compiler produce verbose output that lists
++  # what "hidden" libraries, object files and flags are used when
++  # linking a shared library.
++  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++else
++  GXX=no
++  with_gnu_ld=no
++  wlarc=
++fi
++
++# PORTME: fill in a description of your system's C++ link characteristics
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++_LT_AC_TAGVAR(ld_shlibs, $1)=yes
++case $host_os in
++  aix3*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
+     ;;
+-  '$CC '*)
+-    # Test whether the compiler implicitly links with -lc since on some
+-    # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-    # to ld, don't add -lc before -lgcc.
+-    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+-    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
+-    [$rm conftest*
+-    echo 'static int dummy;' > conftest.$ac_ext
++  aix4* | aix5*)
++    if test "$host_cpu" = ia64; then
++      # On IA64, the linker does run time linking by default, so we don't
++      # have to do anything special.
++      aix_use_runtimelinking=no
++      exp_sym_flag='-Bexport'
++      no_entry_flag=""
++    else
++      aix_use_runtimelinking=no
+ 
+-    if AC_TRY_EVAL(ac_compile); then
+-      soname=conftest
+-      lib=conftest
+-      libobjs=conftest.$ac_objext
+-      deplibs=
+-      wl=$lt_cv_prog_cc_wl
+-      compiler_flags=-v
+-      linker_flags=-v
+-      verstring=
+-      output_objdir=.
+-      libname=conftest
+-      save_allow_undefined_flag=$allow_undefined_flag
+-      allow_undefined_flag=
+-      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
+-      then
+-	lt_cv_archive_cmds_need_lc=no
++      # Test if we are trying to use run time linking or normal
++      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++      # need to do runtime linking.
++      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	for ld_flag in $LDFLAGS; do
++	  case $ld_flag in
++	  *-brtl*)
++	    aix_use_runtimelinking=yes
++	    break
++	    ;;
++	  esac
++	done
++	;;
++      esac
++
++      exp_sym_flag='-bexport'
++      no_entry_flag='-bnoentry'
++    fi
++
++    # When large executables or shared objects are built, AIX ld can
++    # have problems creating the table of contents.  If linking a library
++    # or program results in "error TOC overflow" add -mminimal-toc to
++    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++    _LT_AC_TAGVAR(archive_cmds, $1)=''
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++    if test "$GXX" = yes; then
++      case $host_os in aix4.[[012]]|aix4.[[012]].*)
++      # We only want to do this on AIX 4.2 and lower, the check
++      # below for broken collect2 doesn't work under 4.3+
++	collect2name=`${CC} -print-prog-name=collect2`
++	if test -f "$collect2name" && \
++	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	then
++	  # We have reworked collect2
++	  :
++	else
++	  # We have old collect2
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++	  # It fails to find uninstalled libraries when the uninstalled
++	  # path is not listed in the libpath.  Setting hardcode_minus_L
++	  # to unsupported forces relinking
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	fi
++	;;
++      esac
++      shared_flag='-shared'
++      if test "$aix_use_runtimelinking" = yes; then
++	shared_flag="$shared_flag "'${wl}-G'
++      fi
++    else
++      # not using gcc
++      if test "$host_cpu" = ia64; then
++	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++	# chokes on -Wl,-G. The following line is correct:
++	shared_flag='-G'
+       else
+-	lt_cv_archive_cmds_need_lc=yes
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag='${wl}-G'
++	else
++	  shared_flag='${wl}-bM:SRE'
++	fi
+       fi
+-      allow_undefined_flag=$save_allow_undefined_flag
++    fi
++
++    # It seems that -bexpall does not export symbols beginning with
++    # underscore (_), so it is better to generate a list of symbols to export.
++    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++    if test "$aix_use_runtimelinking" = yes; then
++      # Warning - without using the other runtime loading flags (-brtl),
++      # -berok will link without error, but may produce a broken library.
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++      # Determine the default libpath from the value encoded in an empty executable.
++      _LT_AC_SYS_LIBPATH_AIX
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++     else
++      if test "$host_cpu" = ia64; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++      else
++	# Determine the default libpath from the value encoded in an empty executable.
++	_LT_AC_SYS_LIBPATH_AIX
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	# Warning - without using the other run time loading flags,
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	# Exported symbols can be pulled into shared objects from archives
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	# This is similar to how AIX traditionally builds its shared libraries.
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++      fi
++    fi
++    ;;
++
++  beos*)
++    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++      # support --undefined.  This deserves some investigation.  FIXME
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+     else
+-      cat conftest.err 1>&5
+-    fi])
+-    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
+     ;;
+-  esac
+-fi
+-need_lc=${lt_cv_archive_cmds_need_lc-yes}
+ 
+-# The second clause should only fire when bootstrapping the
+-# libtool distribution, otherwise you forgot to ship ltmain.sh
+-# with your package, and you will get complaints that there are
+-# no rules to generate ltmain.sh.
+-if test -f "$ltmain"; then
+-  :
++  chorus*)
++    case $cc_basename in
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++
++  cygwin* | mingw* | pw32*)
++    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++    # as there is no search path for DLLs.
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++    _LT_AC_TAGVAR(always_export_symbols, $1)=no
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++
++    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      # If the export-symbols file already is a .def file (1st line
++      # is EXPORTS), use it as is; otherwise, prepend...
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	cp $export_symbols $output_objdir/$soname.def;
++      else
++	echo EXPORTS > $output_objdir/$soname.def;
++	cat $export_symbols >> $output_objdir/$soname.def;
++      fi~
++      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++  ;;
++      darwin* | rhapsody*)
++        case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++        esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++    if test "$GXX" = yes ; then
++      lt_int_apple_cc_single_mod=no
++      output_verbose_link_cmd='echo'
++      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++       lt_int_apple_cc_single_mod=yes
++      fi
++      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      else
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++        fi
++        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          else
++            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          fi
++            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++      fi
++        ;;
++
++  dgux*)
++    case $cc_basename in
++      ec++*)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      ghcx*)
++	# Green Hills C++ Compiler
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  freebsd[[12]]*)
++    # C++ shared libraries reported to be fairly broken before switch to ELF
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  freebsd-elf*)
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    ;;
++  freebsd* | dragonfly*)
++    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
++    # conventions
++    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++    ;;
++  gnu*)
++    ;;
++  hpux9*)
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++				# but as the default
++				# location of the library.
++
++    case $cc_basename in
++    CC*)
++      # FIXME: insert proper C++ library support
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    aCC*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      # Commands to make compiler produce verbose output that lists
++      # what "hidden" libraries, object files and flags are used when
++      # linking a shared library.
++      #
++      # There doesn't appear to be a way to prevent this compiler from
++      # explicitly linking system object files so we need to strip them
++      # from the output so that they don't get included in the library
++      # dependencies.
++      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++      ;;
++    *)
++      if test "$GXX" = yes; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++        # FIXME: insert proper C++ library support
++        _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
++    ;;
++  hpux10*|hpux11*)
++    if test $with_gnu_ld = no; then
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++      case $host_cpu in
++      hppa*64*|ia64*) ;;
++      *)
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++        ;;
++      esac
++    fi
++    case $host_cpu in
++    hppa*64*|ia64*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++    *)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
++					      # but as the default
++					      # location of the library.
++      ;;
++    esac
++
++    case $cc_basename in
++      CC*)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      aCC*)
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  ;;
 +	esac
-+	chmod -R a-w $(distdir); chmod a+w $(distdir)
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && cd $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-+	$(am__remove_distdir)
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-+distuninstallcheck:
-+	@cd $(distuninstallcheck_dir) \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test $with_gnu_ld = no; then
++	    case $host_cpu in
++	    hppa*64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    ia64*)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    *)
++	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	      ;;
++	    esac
++	  fi
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
 +	fi
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
- check-am: all-am
- check: check-recursive
--installcheck-am:
--installcheck: installcheck-recursive
--install-exec-am: install-binSCRIPTS
-+all-am: Makefile $(SCRIPTS) $(DATA)
-+installdirs: installdirs-recursive
-+installdirs-am:
-+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-recursive
- install-exec: install-exec-recursive
++	;;
++    esac
++    ;;
++  interix[[3-9]]*)
++    _LT_AC_TAGVAR(hardcode_direct, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++    # Instead, shared libraries are loaded at an image base (0x10000000 by
++    # default) and relocated if they conflict, which is a slow very memory
++    # consuming and fragmenting process.  To avoid this, we pick a random,
++    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++    ;;
++  irix5* | irix6*)
++    case $cc_basename in
++      CC*)
++	# SGI C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++
++	# Archives containing C++ object files must be created using
++	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
++	;;
++      *)
++	if test "$GXX" = yes; then
++	  if test "$with_gnu_ld" = no; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	  else
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++	  fi
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++	;;
++    esac
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++    ;;
++  linux* | k*bsd*-gnu)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++	;;
++      icpc*)
++	# Intel C++
++	with_gnu_ld=yes
++	# version 8.0 and above of icpc choke on multiply defined symbols
++	# if we add $predep_objects and $postdep_objects, however 7.1 and
++	# earlier do not add the objects themselves.
++	case `$CC -V 2>&1` in
++	*"Version 7."*)
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	*)  # Version 8.0 or newer
++	  tmp_idyn=
++	  case $host_cpu in
++	    ia64*) tmp_idyn=' -i_dynamic';;
++	  esac
++  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++	  ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
++	;;
++      pgCC*)
++        # Portland Group C++ compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++        ;;
++      cxx*)
++	# Compaq C++
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++
++	runpath_var=LD_RUN_PATH
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  output_verbose_link_cmd='echo'
++
++	  # Archives containing C++ object files must be created using
++	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
++    esac
++    ;;
++  lynxos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  m88k*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  mvs*)
++    case $cc_basename in
++      cxx*)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  netbsd* | netbsdelf*-gnu)
++    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    fi
++    # Workaround some broken pre-1.5 toolchains
++    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
++    ;;
++  openbsd2*)
++    # C++ shared libraries are fairly broken
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  openbsd*)
++    if test -f /usr/libexec/ld.so; then
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      fi
++      output_verbose_link_cmd='echo'
++    else
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    fi
++    ;;
++  osf3*)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Archives containing C++ object files must be created using
++	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
++
++	;;
++      RCC*)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx*)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  osf4* | osf5*)
++    case $cc_basename in
++      KCC*)
++	# Kuck and Associates, Inc. (KAI) C++ Compiler
++
++	# KCC will only create a shared library if the output file
++	# ends with ".so" (or ".sl" for HP-UX), so rename the library
++	# to its proper name (with version) after linking.
++	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Archives containing C++ object files must be created using
++	# the KAI C++ compiler.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
++	;;
++      RCC*)
++	# Rational C++ 2.4.1
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      cxx*)
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
++	  echo "-hidden">> $lib.exp~
++	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
++	  $rm $lib.exp'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	# Commands to make compiler produce verbose output that lists
++	# what "hidden" libraries, object files and flags are used when
++	# linking a shared library.
++	#
++	# There doesn't appear to be a way to prevent this compiler from
++	# explicitly linking system object files so we need to strip them
++	# from the output so that they don't get included in the library
++	# dependencies.
++	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++	;;
++      *)
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	  # Commands to make compiler produce verbose output that lists
++	  # what "hidden" libraries, object files and flags are used when
++	  # linking a shared library.
++	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
++
++	else
++	  # FIXME: insert proper C++ library support
++	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	fi
++	;;
++    esac
++    ;;
++  psos*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  sunos4*)
++    case $cc_basename in
++      CC*)
++	# Sun C++ 4.x
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      lcc*)
++	# Lucid
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  solaris*)
++    case $cc_basename in
++      CC*)
++	# Sun C++ 4.2, 5.x and Centerline C++
++        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
++	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	case $host_os in
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	  *)
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
++	    # Supported since Solaris 2.6 (maybe 2.5.1?)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	    ;;
++	esac
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++	output_verbose_link_cmd='echo'
++
++	# Archives containing C++ object files must be created using
++	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	# necessary to make sure instantiated templates are included
++	# in the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++	;;
++      gcx*)
++	# Green Hills C++ Compiler
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++
++	# The C++ compiler must be used to create the archive.
++	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
++	;;
++      *)
++	# GNU C++ compiler with Solaris linker
++	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
++	  if $CC --version | grep -v '^2\.7' > /dev/null; then
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  else
++	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
++	    # platform.
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
++
++	    # Commands to make compiler produce verbose output that lists
++	    # what "hidden" libraries, object files and flags are used when
++	    # linking a shared library.
++	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
++	  fi
++
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++	  *)
++	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
++	fi
++	;;
++    esac
++    ;;
++  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  sysv5* | sco3.2v5* | sco5v6*)
++    # Note: We can NOT use -z defs as we might desire, because we do not
++    # link with -lc, and that would cause any symbols used from libc to
++    # always be unresolved, which means just about no library would
++    # ever link correctly.  If we're not using GNU ld we use -z text
++    # though, which does catch some bad symbols but isn't as heavy-handed
++    # as -z defs.
++    # For security reasons, it is highly recommended that you always
++    # use absolute paths for naming shared libraries, and exclude the
++    # DT_RUNPATH tag from executables and libraries.  But doing so
++    # requires that you compile everything twice, which is a pain.
++    # So that behaviour is only enabled if SCOABSPATH is set to a
++    # non-empty value in the environment.  Most likely only useful for
++    # creating official distributions of packages.
++    # This is a hack until libtool officially supports absolute path
++    # names for shared libraries.
++    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++    runpath_var='LD_RUN_PATH'
++
++    case $cc_basename in
++      CC*)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++      *)
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	;;
++    esac
++    ;;
++  tandem*)
++    case $cc_basename in
++      NCC*)
++	# NonStop-UX NCC 3.20
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++      *)
++	# FIXME: insert proper C++ library support
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	;;
++    esac
++    ;;
++  vxworks*)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++  *)
++    # FIXME: insert proper C++ library support
++    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++    ;;
++esac
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
++
++_LT_AC_TAGVAR(GCC, $1)="$GXX"
++_LT_AC_TAGVAR(LD, $1)="$LD"
++
++AC_LIBTOOL_POSTDEP_PREDEP($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++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_CONFIG($1)
++
++AC_LANG_POP
++CC=$lt_save_CC
++LDCXX=$LD
++LD=$lt_save_LD
++GCC=$lt_save_GCC
++with_gnu_ldcxx=$with_gnu_ld
++with_gnu_ld=$lt_save_with_gnu_ld
++lt_cv_path_LDCXX=$lt_cv_path_LD
++lt_cv_path_LD=$lt_save_path_LD
++lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
++lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
++])# AC_LIBTOOL_LANG_CXX_CONFIG
++
++# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
++# ------------------------------------
++# Figure out "hidden" library dependencies from verbose
++# compiler output when linking a shared library.
++# Parse the compiler output and extract the necessary
++# objects, libraries and library flags.
++AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
++dnl we can't use the lt_simple_compile_test_code here,
++dnl because it contains code intended for an executable,
++dnl not a library.  It's possible we should let each
++dnl tag define a new lt_????_link_test_code variable,
++dnl but it's only used here...
++ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
++int a;
++void foo (void) { a = 0; }
++EOF
++],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
++class Foo
++{
++public:
++  Foo (void) { a = 0; }
++private:
++  int a;
++};
++EOF
++],[$1],[F77],[cat > conftest.$ac_ext <<EOF
++      subroutine foo
++      implicit none
++      integer*4 a
++      a=0
++      return
++      end
++EOF
++],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
++public class foo {
++  private int a;
++  public void bar (void) {
++    a = 0;
++  }
++};
++EOF
++])
++dnl Parse the compiler output and extract the necessary
++dnl objects, libraries and library flags.
++if AC_TRY_EVAL(ac_compile); then
++  # Parse the compiler output and extract the necessary
++  # objects, libraries and library flags.
++
++  # Sentinel used to keep track of whether or not we are before
++  # the conftest object file.
++  pre_test_object_deps_done=no
++
++  # The `*' in the case matches for architectures that use `case' in
++  # $output_verbose_cmd can trigger glob expansion during the loop
++  # eval without this substitution.
++  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
++
++  for p in `eval $output_verbose_link_cmd`; do
++    case $p in
++
++    -L* | -R* | -l*)
++       # Some compilers place space between "-{L,R}" and the path.
++       # Remove the space.
++       if test $p = "-L" \
++	  || test $p = "-R"; then
++	 prev=$p
++	 continue
++       else
++	 prev=
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 case $p in
++	 -L* | -R*)
++	   # Internal compiler library paths should come after those
++	   # provided the user.  The postdeps already come after the
++	   # user supplied libs so there is no need to process them.
++	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
++	   else
++	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
++	   fi
++	   ;;
++	 # The "-l" case would never come before the object being
++	 # linked, so don't bother handling this case.
++	 esac
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
++	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
++	 else
++	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
++	 fi
++       fi
++       ;;
++
++    *.$objext)
++       # This assumes that the test object file only shows up
++       # once in the compiler output.
++       if test "$p" = "conftest.$objext"; then
++	 pre_test_object_deps_done=yes
++	 continue
++       fi
++
++       if test "$pre_test_object_deps_done" = no; then
++	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
++	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
++	 fi
++       else
++	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
++	 else
++	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
++	 fi
++       fi
++       ;;
++
++    *) ;; # Ignore the rest.
++
++    esac
++  done
++
++  # Clean up.
++  rm -f a.out a.exe
+ else
+-  # 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"
++  echo "libtool.m4: error: problem compiling $1 test program"
+ fi
+ 
+-if test -f "$ltmain"; then
+-  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
+-  $rm -f "${ofile}T"
++$rm -f confest.$objext
+ 
+-  echo creating $ofile
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix[[3-9]]*)
++  # Interix 3.5 installs completely hosed .la files for C++, so rather than
++  # hack all around it, let's just trust "g++" to DTRT.
++  _LT_AC_TAGVAR(predep_objects,$1)=
++  _LT_AC_TAGVAR(postdep_objects,$1)=
++  _LT_AC_TAGVAR(postdeps,$1)=
++  ;;
++
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
++solaris*)
++  case $cc_basename in
++  CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++
++    # Adding this requires a known-good setup of shared libraries for
++    # Sun compiler versions before 5.6, else PIC objects from an old
++    # archive will be linked into the output, leading to subtle bugs.
++    if test "$solaris_use_stlport4" != yes; then
++      _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++esac
++])
++
++case " $_LT_AC_TAGVAR(postdeps, $1) " in
++*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
++esac
++])# AC_LIBTOOL_POSTDEP_PREDEP
++
++# AC_LIBTOOL_LANG_F77_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
++AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
++[AC_REQUIRE([AC_PROG_F77])
++AC_LANG_PUSH(Fortran 77)
++
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++_LT_AC_TAGVAR(allow_undefined_flag, $1)=
++_LT_AC_TAGVAR(always_export_symbols, $1)=no
++_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_direct, $1)=no
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_automatic, $1)=no
++_LT_AC_TAGVAR(module_cmds, $1)=
++_LT_AC_TAGVAR(module_expsym_cmds, $1)=
++_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++_LT_AC_TAGVAR(no_undefined_flag, $1)=
++_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++
++# Source file extension for f77 test sources.
++ac_ext=f
++
++# Object file extension for compiled f77 test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="\
++      program t
++      end
++"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${F77-"f77"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++
++AC_MSG_CHECKING([if libtool supports shared libraries])
++AC_MSG_RESULT([$can_build_shared])
++
++AC_MSG_CHECKING([whether to build shared libraries])
++test "$can_build_shared" = "no" && enable_shared=no
++
++# On AIX, shared libraries and static libraries use the same namespace, and
++# are all built from PIC.
++case $host_os in
++aix3*)
++  test "$enable_shared" = yes && enable_static=no
++  if test -n "$RANLIB"; then
++    archive_cmds="$archive_cmds~\$RANLIB \$lib"
++    postinstall_cmds='$RANLIB $lib'
++  fi
++  ;;
++aix4* | aix5*)
++  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++    test "$enable_shared" = yes && enable_static=no
++  fi
++  ;;
++esac
++AC_MSG_RESULT([$enable_shared])
++
++AC_MSG_CHECKING([whether to build static libraries])
++# Make sure either enable_shared or enable_static is yes.
++test "$enable_shared" = yes || enable_static=yes
++AC_MSG_RESULT([$enable_static])
++
++_LT_AC_TAGVAR(GCC, $1)="$G77"
++_LT_AC_TAGVAR(LD, $1)="$LD"
++
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++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_CONFIG($1)
++
++AC_LANG_POP
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_F77_CONFIG
++
++
++# AC_LIBTOOL_LANG_GCJ_CONFIG
++# --------------------------
++# Ensure that the configuration vars for the C compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
++AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
++[AC_LANG_SAVE
++
++# Source file extension for Java test sources.
++ac_ext=java
++
++# Object file extension for compiled Java test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code="class foo {}"
++
++# Code to be used in simple link tests
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${GCJ-"gcj"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++
++# GCJ did not exist at the time GCC didn't implicitly link libc in.
++_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
++AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
++AC_LIBTOOL_PROG_COMPILER_PIC($1)
++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_CONFIG($1)
++
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_GCJ_CONFIG
+ 
++
++# AC_LIBTOOL_LANG_RC_CONFIG
++# -------------------------
++# Ensure that the configuration vars for the Windows resource compiler are
++# suitably defined.  Those variables are subsequently used by
++# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
++AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
++AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
++[AC_LANG_SAVE
++
++# Source file extension for RC test sources.
++ac_ext=rc
++
++# Object file extension for compiled RC test sources.
++objext=o
++_LT_AC_TAGVAR(objext, $1)=$objext
++
++# Code to be used in simple compile tests
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
++
++# Code to be used in simple link tests
++lt_simple_link_test_code="$lt_simple_compile_test_code"
++
++# ltmain only uses $CC for tagged configurations so make sure $CC is set.
++_LT_AC_SYS_COMPILER
++
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
++# Allow CC to be a program name with arguments.
++lt_save_CC="$CC"
++CC=${RC-"windres"}
++compiler=$CC
++_LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
++_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
++
++AC_LIBTOOL_CONFIG($1)
++
++AC_LANG_RESTORE
++CC="$lt_save_CC"
++])# AC_LIBTOOL_LANG_RC_CONFIG
++
++
++# AC_LIBTOOL_CONFIG([TAGNAME])
++# ----------------------------
++# If TAGNAME is not passed, then create an initial libtool script
++# with a default configuration from the untagged config vars.  Otherwise
++# add code to config.status for appending the configuration named by
++# TAGNAME from the matching tagged config vars.
++AC_DEFUN([AC_LIBTOOL_CONFIG],
++[# The else clause should only fire when bootstrapping the
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
++  # See if we are running on zsh, and set the options which allow our commands through
++  # without removal of \ escapes.
++  if test -n "${ZSH_VERSION+set}" ; then
++    setopt NO_GLOB_SUBST
++  fi
+   # 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 SED \
+-    AR AR_FLAGS CC LD LN_S NM SHELL \
+-    reload_flag reload_cmds wl \
+-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
+-    library_names_spec soname_spec \
+-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
+-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
+-    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd export_symbols_cmds \
+-    deplibs_check_method allow_undefined_flag no_undefined_flag \
+-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
+-    global_symbol_to_c_name_address \
+-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++    SED SHELL STRIP \
++    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
++    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
++    deplibs_check_method reload_flag reload_cmds need_locks \
++    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
++    lt_cv_sys_global_symbol_to_c_name_address \
+     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++    old_postinstall_cmds old_postuninstall_cmds \
++    _LT_AC_TAGVAR(compiler, $1) \
++    _LT_AC_TAGVAR(CC, $1) \
++    _LT_AC_TAGVAR(LD, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
++    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
++    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
++    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
++    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
++    _LT_AC_TAGVAR(old_archive_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
++    _LT_AC_TAGVAR(predep_objects, $1) \
++    _LT_AC_TAGVAR(postdep_objects, $1) \
++    _LT_AC_TAGVAR(predeps, $1) \
++    _LT_AC_TAGVAR(postdeps, $1) \
++    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
++    _LT_AC_TAGVAR(archive_cmds, $1) \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(postinstall_cmds, $1) \
++    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
++    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
++    _LT_AC_TAGVAR(no_undefined_flag, $1) \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
++    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
++    _LT_AC_TAGVAR(hardcode_automatic, $1) \
++    _LT_AC_TAGVAR(module_cmds, $1) \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
++    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++    _LT_AC_TAGVAR(fix_srcfile_path, $1) \
++    _LT_AC_TAGVAR(exclude_expsyms, $1) \
++    _LT_AC_TAGVAR(include_expsyms, $1); do
+ 
+     case $var in
+-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
+-    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
++    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_cmds, $1) | \
++    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(module_cmds, $1) | \
++    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
++    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
++    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
++    extract_expsyms_cmds | reload_cmds | finish_cmds | \
+     postinstall_cmds | postuninstall_cmds | \
+-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++    old_postinstall_cmds | old_postuninstall_cmds | \
++    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
+       # Double-quote double-evaled strings.
+       eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+       ;;
+@@ -2608,14 +4305,31 @@
+     esac
+   done
+ 
+-  cat <<__EOF__ > "${ofile}T"
+-#! $SHELL
++  case $lt_echo in
++  *'\[$]0 --fallback-echo"')
++    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
++    ;;
++  esac
+ 
+-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
++ifelse([$1], [],
++  [cfgfile="${ofile}T"
++  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
++  $rm -f "$cfgfile"
++  AC_MSG_NOTICE([creating $ofile])],
++  [cfgfile="$ofile"])
++
++  cat <<__EOF__ >> "$cfgfile"
++ifelse([$1], [],
++[#! $SHELL
++
++# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
++# Free Software Foundation, Inc.
++#
++# This file is part of GNU Libtool:
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -2630,24 +4344,28 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+-# A sed that does not truncate output.
++# A sed program that does not truncate output.
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="${SED} -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+-# ### BEGIN LIBTOOL CONFIG
++# The names of the tagged configurations supported by this script.
++available_tags=
++
++# ### BEGIN LIBTOOL CONFIG],
++[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
+ 
+ # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+ 
+@@ -2661,7 +4379,10 @@
+ build_old_libs=$enable_static
+ 
+ # Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$need_lc
++build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
++
++# Whether or not to disallow shared libs when runtime libs are static
++allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
+ 
+ # Whether or not to optimize for fast installation.
+ fast_install=$enable_fast_install
+@@ -2669,6 +4390,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -2677,14 +4404,23 @@
+ AR=$lt_AR
+ AR_FLAGS=$lt_AR_FLAGS
+ 
+-# The default C compiler.
+-CC=$lt_CC
++# A C compiler.
++LTCC=$lt_LTCC
++
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
++# A language-specific compiler.
++CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+ 
+ # Is the compiler the GNU C compiler?
+-with_gcc=$GCC
++with_gcc=$_LT_AC_TAGVAR(GCC, $1)
++
++# An ERE matcher.
++EGREP=$lt_EGREP
+ 
+ # The linker used to build libraries.
+-LD=$lt_LD
++LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
+ 
+ # Whether we need hard or soft links.
+ LN_S=$lt_LN_S
+@@ -2693,7 +4429,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -2715,7 +4451,7 @@
+ reload_cmds=$lt_reload_cmds
+ 
+ # How to pass a linker flag through the compiler.
+-wl=$lt_wl
++wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
+ 
+ # Object file suffix (normally "o").
+ objext="$ac_objext"
+@@ -2723,20 +4459,23 @@
+ # Old archive suffix (normally "a").
+ libext="$libext"
+ 
++# Shared library suffix (normally ".so").
++shrext_cmds='$shrext_cmds'
++
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+ 
+ # Additional compiler flags for building library objects.
+-pic_flag=$lt_pic_flag
++pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+ pic_mode=$pic_mode
+ 
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_compiler_c_o
++# What is the maximum length of a command?
++max_cmd_len=$lt_cv_sys_max_cmd_len
+ 
+-# Can we write directly to a .lo ?
+-compiler_o_lo=$lt_compiler_o_lo
++# Does compiler simultaneously support -c and -o options?
++compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+ 
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -2755,19 +4494,19 @@
+ dlopen_self_static=$enable_dlopen_self_static
+ 
+ # Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_link_static_flag
++link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
+ 
+ # Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_no_builtin_flag
++no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
+ 
+ # Compiler flag to allow reflexive dlopens.
+-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
+ 
+ # Compiler flag to generate shared objects directly from archives.
+-whole_archive_flag_spec=$lt_whole_archive_flag_spec
++whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
+ 
+ # Compiler flag to generate thread-safe objects.
+-thread_safe_flag_spec=$lt_thread_safe_flag_spec
++thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
+ 
+ # Library versioning type.
+ version_type=$version_type
+@@ -2784,26 +4523,50 @@
+ 
+ # Commands used to build and install an old-style archive.
+ RANLIB=$lt_RANLIB
+-old_archive_cmds=$lt_old_archive_cmds
++old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
+ old_postinstall_cmds=$lt_old_postinstall_cmds
+ old_postuninstall_cmds=$lt_old_postuninstall_cmds
+ 
+ # Create an old-style archive from a shared archive.
+-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
+ 
+ # Create a temporary old-style archive to link instead of a shared archive.
+-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
+ 
+ # Commands used to build and install a shared archive.
+-archive_cmds=$lt_archive_cmds
+-archive_expsym_cmds=$lt_archive_expsym_cmds
++archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
++archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
+ postinstall_cmds=$lt_postinstall_cmds
+ postuninstall_cmds=$lt_postuninstall_cmds
+ 
++# Commands used to build a loadable module (assumed same as above if empty)
++module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
++module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
++
+ # Commands to strip libraries.
+ old_striplib=$lt_old_striplib
+ striplib=$lt_striplib
+ 
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
++
++# Dependencies to place before the objects being linked to create a
++# shared library.
++predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
++
++# Dependencies to place after the objects being linked to create a
++# shared library.
++postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
++
++# The library search path used internally by the compiler when linking
++# a shared library.
++compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
++
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+ 
+@@ -2811,10 +4574,10 @@
+ file_magic_cmd=$lt_file_magic_cmd
+ 
+ # Flag that allows shared libraries with undefined symbols to be built.
+-allow_undefined_flag=$lt_allow_undefined_flag
++allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
+ 
+ # Flag that forces no undefined symbols.
+-no_undefined_flag=$lt_no_undefined_flag
++no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
+ 
+ # Commands used to finish a libtool library installation in a directory.
+ finish_cmds=$lt_finish_cmds
+@@ -2823,13 +4586,13 @@
+ finish_eval=$lt_finish_eval
+ 
+ # Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_global_symbol_pipe
++global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
+ 
+ # Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
++global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
+ 
+ # Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
++global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
+ 
+ # This is the shared library runtime path variable.
+ runpath_var=$runpath_var
+@@ -2841,36 +4604,45 @@
+ shlibpath_overrides_runpath=$shlibpath_overrides_runpath
+ 
+ # How to hardcode a shared library path into an executable.
+-hardcode_action=$hardcode_action
++hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
+ 
+ # Whether we should hardcode library paths into libraries.
+ hardcode_into_libs=$hardcode_into_libs
+ 
+ # Flag to hardcode \$libdir into a binary during linking.
+ # This must work even if \$libdir does not exist.
+-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
++
++# If ld is used when linking, flag to hardcode \$libdir into
++# a binary during linking. This must work even if \$libdir does
++# not exist.
++hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
+ 
+ # Whether we need a single -rpath flag with a separated argument.
+-hardcode_libdir_separator=$lt_hardcode_libdir_separator
++hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
+ 
+-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
+ # resulting binary.
+-hardcode_direct=$hardcode_direct
++hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
+ 
+ # Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+ # resulting binary.
+-hardcode_minus_L=$hardcode_minus_L
++hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
+ 
+ # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+ # the resulting binary.
+-hardcode_shlibpath_var=$hardcode_shlibpath_var
++hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
++
++# Set to yes if building a shared library automatically hardcodes DIR into the library
++# and all subsequent libraries and executables linked against it.
++hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
+ 
+ # Variables whose values should be saved in libtool wrapper scripts and
+ # restored at relink time.
+ variables_saved_for_relink="$variables_saved_for_relink"
+ 
+ # Whether libtool must link a program against all its dependency libraries.
+-link_all_deplibs=$link_all_deplibs
++link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
+ 
+ # Compile-time system search path for libraries
+ sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
+@@ -2879,30 +4651,33 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+-always_export_symbols=$always_export_symbols
++always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+ 
+ # The commands to list exported symbols.
+-export_symbols_cmds=$lt_export_symbols_cmds
++export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
+ 
+ # The commands to extract the exported symbol list from a shared archive.
+ extract_expsyms_cmds=$lt_extract_expsyms_cmds
+ 
+ # Symbols that should not be listed in the preloaded symbols.
+-exclude_expsyms=$lt_exclude_expsyms
++exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
+ 
+ # Symbols that must always be exported.
+-include_expsyms=$lt_include_expsyms
++include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
+ 
+-# ### END LIBTOOL CONFIG
++ifelse([$1],[],
++[# ### END LIBTOOL CONFIG],
++[# ### END LIBTOOL TAG CONFIG: $tagname])
+ 
+ __EOF__
+ 
++ifelse([$1],[], [
+   case $host_os in
+   aix3*)
+-    cat <<\EOF >> "${ofile}T"
++    cat <<\EOF >> "$cfgfile"
+ 
+ # AIX sometimes has problems with the GCC collect2 program.  For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+@@ -2915,786 +4690,1798 @@
+     ;;
+   esac
+ 
+-  case $host_os in
+-  cygwin* | mingw* | pw32* | os2*)
+-    cat <<'EOF' >> "${ofile}T"
+-      # This is a source program that is used to create dlls on Windows
+-      # Don't remove nor modify the starting and closing comments
+-# /* ltdll.c starts here */
+-# #define WIN32_LEAN_AND_MEAN
+-# #include <windows.h>
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include <stdio.h>
+-#
+-# #ifndef __CYGWIN__
+-# #  ifdef __CYGWIN32__
+-# #    define __CYGWIN__ __CYGWIN32__
+-# #  endif
+-# #endif
+-#
+-# #ifdef __cplusplus
+-# extern "C" {
+-# #endif
+-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+-# #ifdef __cplusplus
+-# }
+-# #endif
+-#
+-# #ifdef __CYGWIN__
+-# #include <cygwin/cygwin_dll.h>
+-# DECLARE_CYGWIN_DLL( DllMain );
+-# #endif
+-# HINSTANCE __hDllInstance_base;
+-#
+-# BOOL APIENTRY
+-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+-# {
+-#   __hDllInstance_base = hInst;
+-#   return TRUE;
+-# }
+-# /* ltdll.c ends here */
+-	# This is a source program that is used to create import libraries
+-	# on Windows for dlls which lack them. Don't remove nor modify the
+-	# starting and closing comments
+-# /* impgen.c starts here */
+-# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
+-#
+-#  This file is part of GNU libtool.
+-#
+-#  This program is free software; you can redistribute it and/or modify
+-#  it under the terms of the GNU General Public License as published by
+-#  the Free Software Foundation; either version 2 of the License, or
+-#  (at your option) any later version.
+-#
+-#  This program is distributed in the hope that it will be useful,
+-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#  GNU General Public License for more details.
+-#
+-#  You should have received a copy of the GNU General Public License
+-#  along with this program; if not, write to the Free Software
+-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-#  */
+-#
+-# #include <stdio.h>		/* for printf() */
+-# #include <unistd.h>		/* for open(), lseek(), read() */
+-# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
+-# #include <string.h>		/* for strdup() */
+-#
+-# /* O_BINARY isn't required (or even defined sometimes) under Unix */
+-# #ifndef O_BINARY
+-# #define O_BINARY 0
+-# #endif
+-#
+-# static unsigned int
+-# pe_get16 (fd, offset)
+-#      int fd;
+-#      int offset;
+-# {
+-#   unsigned char b[2];
+-#   lseek (fd, offset, SEEK_SET);
+-#   read (fd, b, 2);
+-#   return b[0] + (b[1]<<8);
+-# }
+-#
+-# static unsigned int
+-# pe_get32 (fd, offset)
+-#     int fd;
+-#     int offset;
+-# {
+-#   unsigned char b[4];
+-#   lseek (fd, offset, SEEK_SET);
+-#   read (fd, b, 4);
+-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+-# }
+-#
+-# static unsigned int
+-# pe_as32 (ptr)
+-#      void *ptr;
+-# {
+-#   unsigned char *b = ptr;
+-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+-# }
+-#
+-# int
+-# main (argc, argv)
+-#     int argc;
+-#     char *argv[];
+-# {
+-#     int dll;
+-#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
+-#     unsigned long export_rva, export_size, nsections, secptr, expptr;
+-#     unsigned long name_rvas, nexp;
+-#     unsigned char *expdata, *erva;
+-#     char *filename, *dll_name;
+-#
+-#     filename = argv[1];
+-#
+-#     dll = open(filename, O_RDONLY|O_BINARY);
+-#     if (dll < 1)
+-# 	return 1;
+-#
+-#     dll_name = filename;
+-#
+-#     for (i=0; filename[i]; i++)
+-# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
+-# 	    dll_name = filename + i +1;
+-#
+-#     pe_header_offset = pe_get32 (dll, 0x3c);
+-#     opthdr_ofs = pe_header_offset + 4 + 20;
+-#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
+-#
+-#     if (num_entries < 1) /* no exports */
+-# 	return 1;
+-#
+-#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
+-#     export_size = pe_get32 (dll, opthdr_ofs + 100);
+-#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
+-#     secptr = (pe_header_offset + 4 + 20 +
+-# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
+-#
+-#     expptr = 0;
+-#     for (i = 0; i < nsections; i++)
+-#     {
+-# 	char sname[8];
+-# 	unsigned long secptr1 = secptr + 40 * i;
+-# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
+-# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
+-# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
+-# 	lseek(dll, secptr1, SEEK_SET);
+-# 	read(dll, sname, 8);
+-# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
+-# 	{
+-# 	    expptr = fptr + (export_rva - vaddr);
+-# 	    if (export_rva + export_size > vaddr + vsize)
+-# 		export_size = vsize - (export_rva - vaddr);
+-# 	    break;
+-# 	}
+-#     }
+-#
+-#     expdata = (unsigned char*)malloc(export_size);
+-#     lseek (dll, expptr, SEEK_SET);
+-#     read (dll, expdata, export_size);
+-#     erva = expdata - export_rva;
+-#
+-#     nexp = pe_as32 (expdata+24);
+-#     name_rvas = pe_as32 (expdata+32);
+-#
+-#     printf ("EXPORTS\n");
+-#     for (i = 0; i<nexp; i++)
+-#     {
+-# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
+-# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
+-#     }
+-#
+-#     return 0;
+-# }
+-# /* impgen.c ends here */
 -
--install-data-am: install-m4dataDATA install-pkgconfigDATA
- install-data: install-data-recursive
-+uninstall: uninstall-recursive
+-EOF
+-    ;;
+-  esac
+-
+   # We use sed instead of cat because bash on DJGPP gets confused if
+   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+   # text mode, it properly converts lines to CR/LF.  This bash problem
+   # is reportedly fixed, but why not run on old versions too?
+-  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
++  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
  
- install-am: all-am
- 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-recursive
--uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA \
--		uninstall-pkgconfigDATA
--uninstall: uninstall-recursive
--all-am: Makefile $(SCRIPTS) $(DATA)
--all-redirect: all-recursive
--install-strip:
--	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs: installdirs-recursive
--installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) \
--		$(DESTDIR)$(pkgconfigdir)
+-  mv -f "${ofile}T" "$ofile" || \
+-    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
++  mv -f "$cfgfile" "$ofile" || \
++    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+   chmod +x "$ofile"
++])
++else
++  # 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.
++  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++  if test -f "$ltmain_in"; then
++    test -f Makefile && make "$ltmain"
++  fi
+ fi
++])# AC_LIBTOOL_CONFIG
+ 
+-])# _LT_AC_LTCONFIG_HACK
 -
+-# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
+-AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
  
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
- mostlyclean-generic:
+-# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
+-AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
++# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
++# -------------------------------------------
++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
++[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
  
- clean-generic:
+-# AC_ENABLE_SHARED - implement the --enable-shared flag
+-# Usage: AC_ENABLE_SHARED[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN([AC_ENABLE_SHARED],
+-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(shared,
+-changequote(<<, >>)dnl
+-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_shared=yes ;;
+-no) enable_shared=no ;;
+-*)
+-  enable_shared=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_shared=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
+-])
++_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
  
- distclean-generic:
--	-rm -f Makefile $(CONFIG_CLEAN_FILES)
--	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+-# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
+-AC_DEFUN([AC_DISABLE_SHARED],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_SHARED(no)])
++if test "$GCC" = yes; then
++  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
  
- maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
+-# AC_ENABLE_STATIC - implement the --enable-static flag
+-# Usage: AC_ENABLE_STATIC[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN([AC_ENABLE_STATIC],
+-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(static,
+-changequote(<<, >>)dnl
+-<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_static=yes ;;
+-no) enable_static=no ;;
+-*)
+-  enable_static=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_static=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
+-])
++  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
++    lt_cv_prog_compiler_rtti_exceptions,
++    [-fno-rtti -fno-exceptions], [],
++    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
++fi
++])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
  
--mostlyclean: mostlyclean-recursive
-+clean-am: clean-generic clean-libtool mostlyclean-am
+-# AC_DISABLE_STATIC - set the default static flag to --disable-static
+-AC_DEFUN([AC_DISABLE_STATIC],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_STATIC(no)])
  
--clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
-+distclean: distclean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-libtool \
-+	distclean-local distclean-tags
++# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
++# ---------------------------------
++AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
++[AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
++AC_REQUIRE([AC_PROG_NM])
++AC_REQUIRE([AC_OBJEXT])
++# Check for command to grab the raw symbol name followed by C symbol from nm.
++AC_MSG_CHECKING([command to parse $NM output from $compiler object])
++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
++[
++# These are sane defaults that work on at least a few old systems.
++# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
  
--clean: clean-recursive
-+dvi: dvi-recursive
+-# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
+-# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
+-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
+-#   `yes'.
+-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
+-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
+-AC_ARG_ENABLE(fast-install,
+-changequote(<<, >>)dnl
+-<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
+-changequote([, ])dnl
+-[p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_fast_install=yes ;;
+-no) enable_fast_install=no ;;
+-*)
+-  enable_fast_install=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_fast_install=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac],
+-enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
+-])
++# Character class describing NM global symbol codes.
++symcode='[[BCDEGRST]]'
  
--distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
--	-rm -f libtool
-+dvi-am:
+-# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
+-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-AC_ENABLE_FAST_INSTALL(no)])
++# Regexp to match symbols that can be accessed directly from C.
++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
--distclean: distclean-recursive
--	-rm -f config.status
-+html: html-recursive
+-# AC_LIBTOOL_PICMODE - implement the --with-pic flag
+-# Usage: AC_LIBTOOL_PICMODE[(MODE)]
+-#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
+-#   `both'.
+-AC_DEFUN([AC_LIBTOOL_PICMODE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-pic_mode=ifelse($#,1,$1,default)])
++# Transform an extracted symbol line into a proper C declaration
++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
  
--maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
--		maintainer-clean-generic distclean-am
--	@echo "This command is intended for maintainers to use;"
--	@echo "it deletes files that may require special tools to rebuild."
-+info: info-recursive
++# Transform an extracted symbol line into symbol name and symbol address
++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
+ 
+-# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
+-AC_DEFUN([AC_PATH_TOOL_PREFIX],
+-[AC_MSG_CHECKING([for $1])
+-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+-[case $MAGIC_CMD in
+-  /*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
++# Define system-specific variables.
++case $host_os in
++aix*)
++  symcode='[[BCDT]]'
+   ;;
+-  ?:/*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
++cygwin* | mingw* | pw32*)
++  symcode='[[ABCDGISTW]]'
+   ;;
+-  *)
+-  ac_save_MAGIC_CMD="$MAGIC_CMD"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-dnl $ac_dummy forces splitting on constant user-supplied paths.
+-dnl POSIX.2 word splitting is done only on the output of word expansions,
+-dnl not every word.  This closes a longstanding sh security hole.
+-  ac_dummy="ifelse([$2], , $PATH, [$2])"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$1; then
+-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+-      if test -n "$file_magic_test_file"; then
+-	case $deplibs_check_method in
+-	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
+-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
+-	    :
+-	  else
+-	    cat <<EOF 1>&2
++hpux*) # Its linker distinguishes data from code symbols
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDEGRST]]'
++  fi
++  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  ;;
++linux* | k*bsd*-gnu)
++  if test "$host_cpu" = ia64; then
++    symcode='[[ABCDGIRSTW]]'
++    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
++  fi
++  ;;
++irix* | nonstopux*)
++  symcode='[[BCDEGRST]]'
++  ;;
++osf*)
++  symcode='[[BCDEGQRST]]'
++  ;;
++solaris*)
++  symcode='[[BDRT]]'
++  ;;
++sco3.2v5*)
++  symcode='[[DT]]'
++  ;;
++sysv4.2uw2*)
++  symcode='[[DT]]'
++  ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++  symcode='[[ABDT]]'
++  ;;
++sysv4)
++  symcode='[[DFNSTU]]'
++  ;;
++esac
+ 
+-*** Warning: the command libtool uses to detect shared libraries,
+-*** $file_magic_cmd, produces output that libtool cannot recognize.
+-*** The result is that libtool may fail to recognize shared libraries
+-*** as such.  This will affect the creation of libtool libraries that
+-*** depend on shared libraries, but programs linked with such libtool
+-*** libraries will work regardless of this problem.  Nevertheless, you
+-*** may want to report the problem to your system manager and/or to
+-*** bug-libtool at gnu.org
++# Handle CRLF in mingw tool chain
++opt_cr=
++case $build_os in
++mingw*)
++  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
++  ;;
++esac
+ 
++# If we're using GNU nm, then use its standard symbol codes.
++case `$NM -V 2>&1` in
++*GNU* | *'with BFD'*)
++  symcode='[[ABCDGIRSTW]]' ;;
++esac
 +
-+info-am:
++# Try without a prefix undercore, then with it.
++for ac_symprfx in "" "_"; do
 +
-+install-data-am: install-m4dataDATA install-pkgconfigDATA
++  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++  symxfrm="\\1 $ac_symprfx\\2 \\2"
 +
-+install-exec-am: install-binSCRIPTS
++  # Write the raw and C identifiers.
++  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
 +
-+install-info: install-info-recursive
++  # Check to see that the pipe works correctly.
++  pipe_works=no
 +
-+install-man:
++  rm -f conftest*
++  cat > conftest.$ac_ext <<EOF
++#ifdef __cplusplus
++extern "C" {
++#endif
++char nm_test_var;
++void nm_test_func(){}
++#ifdef __cplusplus
++}
++#endif
++int main(){nm_test_var='a';nm_test_func();return(0);}
+ EOF
+-	  fi ;;
+-	esac
 +
-+installcheck-am:
++  if AC_TRY_EVAL(ac_compile); then
++    # Now try to grab the symbols.
++    nlist=conftest.nm
++    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
++      # Try sorting and uniquifying the output.
++      if sort "$nlist" | uniq > "$nlist"T; then
++	mv -f "$nlist"T "$nlist"
++      else
++	rm -f "$nlist"T
+       fi
+-      break
++
++      # Make sure that we snagged all the symbols we need.
++      if grep ' nm_test_var$' "$nlist" >/dev/null; then
++	if grep ' nm_test_func$' "$nlist" >/dev/null; then
++	  cat <<EOF > conftest.$ac_ext
++#ifdef __cplusplus
++extern "C" {
++#endif
++
++EOF
++	  # Now generate the symbol file.
++	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
++
++	  cat <<EOF >> conftest.$ac_ext
++#if defined (__STDC__) && __STDC__
++# define lt_ptr_t void *
++#else
++# define lt_ptr_t char *
++# define const
++#endif
++
++/* The mapping between symbol names and symbols. */
++const struct {
++  const char *name;
++  lt_ptr_t address;
++}
++lt_preloaded_symbols[[]] =
++{
++EOF
++	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
++	  cat <<\EOF >> conftest.$ac_ext
++  {0, (lt_ptr_t) 0}
++};
++
++#ifdef __cplusplus
++}
++#endif
++EOF
++	  # Now try linking the two files.
++	  mv conftest.$ac_objext conftstm.$ac_objext
++	  lt_save_LIBS="$LIBS"
++	  lt_save_CFLAGS="$CFLAGS"
++	  LIBS="conftstm.$ac_objext"
++	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
++	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
++	    pipe_works=yes
++	  fi
++	  LIBS="$lt_save_LIBS"
++	  CFLAGS="$lt_save_CFLAGS"
++	else
++	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
++	fi
++      else
++	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
++      fi
++    else
++      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+     fi
+-  done
+-  IFS="$ac_save_ifs"
+-  MAGIC_CMD="$ac_save_MAGIC_CMD"
+-  ;;
+-esac])
+-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+-if test -n "$MAGIC_CMD"; then
+-  AC_MSG_RESULT($MAGIC_CMD)
++  else
++    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
++    cat conftest.$ac_ext >&5
++  fi
++  rm -f conftest* conftst*
++
++  # Do not use the global_symbol_pipe unless it works.
++  if test "$pipe_works" = yes; then
++    break
++  else
++    lt_cv_sys_global_symbol_pipe=
++  fi
++done
++])
++if test -z "$lt_cv_sys_global_symbol_pipe"; then
++  lt_cv_sys_global_symbol_to_cdecl=
++fi
++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
++  AC_MSG_RESULT(failed)
+ else
+-  AC_MSG_RESULT(no)
++  AC_MSG_RESULT(ok)
+ fi
+-])
++]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
  
- maintainer-clean: maintainer-clean-recursive
--	-rm -f config.status
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+-# AC_PATH_MAGIC - find a file program which can recognise a shared library
+-AC_DEFUN([AC_PATH_MAGIC],
+-[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
+-AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
+-if test -z "$lt_cv_path_MAGIC_CMD"; then
+-  if test -n "$ac_tool_prefix"; then
+-    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
++# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
++# ---------------------------------------
++AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
++[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
 +
-+mostlyclean: mostlyclean-recursive
++AC_MSG_CHECKING([for $compiler option to produce PIC])
++ ifelse([$1],[CXX],[
++  # C++ specific cases for pic, static, wl, etc.
++  if test "$GXX" = yes; then
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
 +
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++    case $host_os in
++    aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
++      ;;
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
++    mingw* | cygwin* | os2* | pw32*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      ;;
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
++    *djgpp*)
++      # DJGPP does not support shared libraries at all
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++      ;;
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
+   else
+-    MAGIC_CMD=:
++    case $host_os in
++      aix4* | aix5*)
++	# All AIX code is PIC.
++	if test "$host_cpu" = ia64; then
++	  # AIX 5 now supports IA64 processor
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	else
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
++	fi
++	;;
++      chorus*)
++	case $cc_basename in
++	cxch68*)
++	  # Green Hills C++ Compiler
++	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
++	  ;;
++	esac
++	;;
++       darwin*)
++         # PIC is the default on this platform
++         # Common symbols not allowed in MH_DYLIB files
++         case $cc_basename in
++           xlc*)
++           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++           ;;
++         esac
++       ;;
++      dgux*)
++	case $cc_basename in
++	  ec++*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  ghcx*)
++	    # Green Hills C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      freebsd* | dragonfly*)
++	# FreeBSD uses GNU C++
++	;;
++      hpux9* | hpux10* | hpux11*)
++	case $cc_basename in
++	  CC*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    if test "$host_cpu" != ia64; then
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	    fi
++	    ;;
++	  aCC*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++	    case $host_cpu in
++	    hppa*64*|ia64*)
++	      # +Z the default
++	      ;;
++	    *)
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	      ;;
++	    esac
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      interix*)
++	# This is c89, which is MS Visual C++ (no shared libs)
++	# Anyone wants to do a port?
++	;;
++      irix5* | irix6* | nonstopux*)
++	case $cc_basename in
++	  CC*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    # CC pic flag -KPIC is the default.
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      linux* | k*bsd*-gnu)
++	case $cc_basename in
++	  KCC*)
++	    # KAI C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	    ;;
++	  icpc* | ecpc*)
++	    # Intel C++
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++	    ;;
++	  pgCC*)
++	    # Portland Group C++ compiler.
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  cxx*)
++	    # Compaq C++
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	      ;;
++	    esac
++	    ;;
++	esac
++	;;
++      lynxos*)
++	;;
++      m88k*)
++	;;
++      mvs*)
++	case $cc_basename in
++	  cxx*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      netbsd* | netbsdelf*-gnu)
++	;;
++      osf3* | osf4* | osf5*)
++	case $cc_basename in
++	  KCC*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
++	    ;;
++	  RCC*)
++	    # Rational C++ 2.4.1
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  cxx*)
++	    # Digital/Compaq C++
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    # Make sure the PIC flag is empty.  It appears that all Alpha
++	    # Linux and Compaq Tru64 Unix objects are PIC.
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      psos*)
++	;;
++      solaris*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.2, 5.x and Centerline C++
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++	    ;;
++	  gcx*)
++	    # Green Hills C++ Compiler
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sunos4*)
++	case $cc_basename in
++	  CC*)
++	    # Sun C++ 4.x
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	  lcc*)
++	    # Lucid
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      tandem*)
++	case $cc_basename in
++	  NCC*)
++	    # NonStop-UX NCC 3.20
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    ;;
++	  *)
++	    ;;
++	esac
++	;;
++      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++	case $cc_basename in
++	  CC*)
++	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	    ;;
++	esac
++	;;
++      vxworks*)
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++	;;
++    esac
+   fi
+-fi
+-])
++],
++[
++  if test "$GCC" = yes; then
++    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
  
--.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
--uninstall-binSCRIPTS install-binSCRIPTS uninstall-m4dataDATA \
--install-m4dataDATA uninstall-pkgconfigDATA install-pkgconfigDATA \
--install-data-recursive uninstall-data-recursive install-exec-recursive \
--uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
--all-recursive check-recursive installcheck-recursive info-recursive \
--dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
--maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
--distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
--dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
--install-exec install-data-am install-data install-am install \
--uninstall-am uninstall all-redirect all-am all installdirs-am \
--installdirs mostlyclean-generic distclean-generic clean-generic \
--maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+pdf: pdf-recursive
++    case $host_os in
++      aix*)
++      # All AIX code is PIC.
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
+ 
+-# AC_PROG_LD - find the path to the GNU or non-GNU linker
+-AC_DEFUN([AC_PROG_LD],
+-[AC_ARG_WITH(gnu-ld,
+-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
+-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
+-AC_REQUIRE([AC_PROG_CC])dnl
+-AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+-AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
+-ac_prog=ld
+-if test "$GCC" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  AC_MSG_CHECKING([for ld used by GCC])
+-  case $host in
+-  *-*-mingw*)
+-    # gcc leaves a trailing carriage return which upsets mingw
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+-  *)
+-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-  esac
+-  case $ac_prog in
+-    # Accept absolute paths.
+-    [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
+-      re_direlt='/[[^/]][[^/]]*/\.\./'
+-      # Canonicalize the path of ld
+-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
++    amigaos*)
++      # FIXME: we need at least 68020 code to build shared libraries, but
++      # adding the `-m68020' flag to GCC prevents building anything better,
++      # like `-m68040'.
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+       ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
+-    ;;
+-  *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
+-    ;;
+-  esac
+-elif test "$with_gnu_ld" = yes; then
+-  AC_MSG_CHECKING([for GNU ld])
+-else
+-  AC_MSG_CHECKING([for non-GNU ld])
+-fi
+-AC_CACHE_VAL(lt_cv_path_LD,
+-[if test -z "$LD"; then
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      lt_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+-	test "$with_gnu_ld" != no && break
 +
-+pdf-am:
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++      # PIC is the default for these OSes.
++      ;;
 +
-+ps: ps-recursive
++    mingw* | cygwin* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      ;;
 +
-+ps-am:
++    darwin* | rhapsody*)
++      # PIC is the default on this platform
++      # Common symbols not allowed in MH_DYLIB files
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
++      ;;
 +
-+uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
-+	uninstall-m4dataDATA uninstall-pkgconfigDATA
++    interix[[3-9]]*)
++      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++      # Instead, we relocate shared libraries at runtime.
++      ;;
 +
-+uninstall-info: uninstall-info-recursive
++    msdosdjgpp*)
++      # Just because we use GCC doesn't mean we suddenly get shared libraries
++      # on systems that don't support them.
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      enable_shared=no
++      ;;
 +
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-+	check-am clean clean-generic clean-libtool clean-recursive \
-+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
-+	distclean-generic distclean-libtool distclean-local \
-+	distclean-recursive distclean-tags distcleancheck distdir \
-+	distuninstallcheck dvi dvi-am html html-am info info-am \
-+	install install-am install-binSCRIPTS install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-m4dataDATA install-man \
-+	install-pkgconfigDATA install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \
-+	uninstall-m4dataDATA uninstall-pkgconfigDATA
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
++      fi
++      ;;
++
++    hpux*)
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++	;;
++      esac
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
++      ;;
++    esac
++  else
++    # PORTME Check for flag to pass linker flags through the system compiler.
++    case $host_os in
++    aix*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      if test "$host_cpu" = ia64; then
++	# AIX 5 now supports IA64 processor
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+       else
+-	test "$with_gnu_ld" != yes && break
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+       fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-else
+-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi])
+-LD="$lt_cv_path_LD"
+-if test -n "$LD"; then
+-  AC_MSG_RESULT($LD)
+-else
+-  AC_MSG_RESULT(no)
+-fi
+-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+-AC_PROG_LD_GNU
+-])
++      ;;
++      darwin*)
++        # PIC is the default on this platform
++        # Common symbols not allowed in MH_DYLIB files
++       case $cc_basename in
++         xlc*)
++         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++         ;;
++       esac
++       ;;
  
+-# AC_PROG_LD_GNU -
+-AC_DEFUN([AC_PROG_LD_GNU],
+-[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.
+-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+-  lt_cv_prog_gnu_ld=yes
+-else
+-  lt_cv_prog_gnu_ld=no
+-fi])
+-with_gnu_ld=$lt_cv_prog_gnu_ld
+-])
++    mingw* | cygwin* | pw32* | os2*)
++      # This hack is so that the source file can tell whether it is being
++      # built for inclusion in a dll (and should export symbols for example).
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
++      ;;
  
- $(PACKAGE)-$(VERSION).tar.gz: dist
-@@ -519,6 +783,10 @@
- install-hook:
- 	-ldconfig
+-# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
+-#   -- PORTME Some linkers may need a different reload flag.
+-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
+-[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
+-[lt_cv_ld_reload_flag='-r'])
+-reload_flag=$lt_cv_ld_reload_flag
+-test -n "$reload_flag" && reload_flag=" $reload_flag"
+-])
++    hpux9* | hpux10* | hpux11*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
++      # not for PA HP-UX.
++      case $host_cpu in
++      hppa*64*|ia64*)
++	# +Z the default
++	;;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
++	;;
++      esac
++      # Is there a better lt_prog_compiler_static that works with the bundled CC?
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++      ;;
  
-+distclean-local:
-+	make -C sdk distclean
-+	make -C doc distclean
+-# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
+-#  -- PORTME fill in with the dynamic library characteristics
+-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
+-lt_cv_deplibs_check_method,
+-[lt_cv_file_magic_cmd='$MAGIC_CMD'
+-lt_cv_file_magic_test_file=
+-lt_cv_deplibs_check_method='unknown'
+-# Need to set the preceding variable on all platforms that support
+-# interlibrary dependencies.
+-# 'none' -- dependencies not supported.
+-# `unknown' -- same as none, but documents that we really don't know.
+-# 'pass_all' -- all dependencies passed with no checks.
+-# 'test_compile' -- check by making test program.
+-# 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given egrep regex.
+-# If you have `file' or equivalent on your system and you're not sure
+-# whether `pass_all' will *always* work, you probably want this one.
++    irix5* | irix6* | nonstopux*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # PIC (with -KPIC) is the default.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
+ 
+-case $host_os in
+-aix4* | aix5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++    newsos6)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
+ 
+-beos*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++    linux* | k*bsd*-gnu)
++      case $cc_basename in
++      icc* | ecc*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
++        ;;
++      pgcc* | pgf77* | pgf90* | pgf95*)
++        # Portland Group compilers (*not* the Pentium gcc compiler,
++	# which looks to be a dead project)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++        ;;
++      ccc*)
++        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++        # All Alpha code is PIC.
++        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++        ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++	  _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++	  ;;
++	esac
++	;;
++      esac
++      ;;
+ 
+-bsdi4*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  ;;
++    osf3* | osf4* | osf5*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      # All OSF/1 code is PIC.
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
+ 
+-cygwin* | mingw* | pw32*)
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
+-  ;;
++    rdos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
++      ;;
+ 
+-darwin* | rhapsody*)
+-  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+-  lt_cv_file_magic_cmd='/usr/bin/file -L'
+-  case "$host_os" in
+-  rhapsody* | darwin1.[[012]])
+-    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
+-    ;;
+-  *) # Darwin 1.3 on
+-    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+-    ;;
+-  esac
+-  ;;
++    solaris*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      case $cc_basename in
++      f77* | f90* | f95*)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++      *)
++	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++      esac
++      ;;
+ 
+-freebsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    case $host_cpu in
+-    i*86 )
+-      # Not sure whether the presence of OpenBSD here was a mistake.
+-      # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
+-      lt_cv_file_magic_cmd=/usr/bin/file
+-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
++    sunos4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
 +
- rpm: $(PACKAGE)-$(VERSION).tar.gz
- 	cp $(PACKAGE)-$(VERSION).tar.gz $(RPM_ROOT)
- 	rpm -ba $(PACKAGE).spec
-@@ -546,7 +814,6 @@
- 	rm -Rf $(PACKAGE)-$(VERSION)/CVS
- 	tar -czvf $(PACKAGE)-$(VERSION)_ML1.0.0-beta3.mlz $(PACKAGE)-$(VERSION)
- 	rm -Rf $(PACKAGE)-$(VERSION)
++    sysv4 | sysv4.2uw2* | sysv4.3*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec ;then
++	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
++	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      fi
++      ;;
++
++    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    unicos*)
++      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++      ;;
++
++    uts4*)
++      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
++      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+       ;;
+     esac
+-  else
+-    lt_cv_deplibs_check_method=pass_all
+   fi
+-  ;;
++])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
+ 
+-gnu*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++#
++# Check to make sure the PIC flag actually works.
++#
++if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
++  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
++    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
++    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
++    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
++     "" | " "*) ;;
++     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
++     esac],
++    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
++fi
++case $host_os in
++  # For platforms which do not support PIC, -DPIC is meaningless:
++  *djgpp*)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
++    ;;
++  *)
++    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
++    ;;
++esac
+ 
+-hpux10.20*|hpux11*)
+-  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libc.sl
+-  ;;
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++  $lt_tmp_static_flag,
++  [],
++  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
++])
+ 
+-irix5* | irix6* | nonstopux*)
++
++# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
++# ------------------------------------
++# See if the linker supports building shared libraries.
++AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++ifelse([$1],[CXX],[
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+   case $host_os in
+-  irix5* | nonstopux*)
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
++  aix4* | aix5*)
++    # If we're using GNU nm, then we don't want the "-C" option.
++    # -C means demangle to AIX nm, but means don't demangle with GNU nm
++    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    else
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++    fi
+     ;;
++  pw32*)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
++  ;;
++  cygwin* | mingw*)
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++  ;;
++  linux* | k*bsd*-gnu)
++    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++  ;;
+   *)
+-    case $LD in
+-    *-32|*"-32 ") libmagic=32-bit;;
+-    *-n32|*"-n32 ") libmagic=N32;;
+-    *-64|*"-64 ") libmagic=64-bit;;
+-    *) libmagic=never-match;;
+-    esac
+-    # this will be overridden with pass_all, but let us keep it just in case
+-    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
++    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  ;;
++  esac
++],[
++  runpath_var=
++  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
++  _LT_AC_TAGVAR(archive_cmds, $1)=
++  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
++  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
++  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
++  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
++  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
++  _LT_AC_TAGVAR(module_cmds, $1)=
++  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
++  _LT_AC_TAGVAR(always_export_symbols, $1)=no
++  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
++  # include_expsyms should be a list of space-separated symbols to be *always*
++  # included in the symbol list
++  _LT_AC_TAGVAR(include_expsyms, $1)=
++  # exclude_expsyms can be an extended regexp of symbols to exclude
++  # it will be wrapped by ` (' and `)$', so one must not match beginning or
++  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
++  # as well as any symbol that contains `d'.
++  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
++  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
++  # platforms (ab)use it in PIC code, but their linkers get confused if
++  # the symbol is explicitly referenced.  Since portable code cannot
++  # rely on this symbol name, it's probably fine to never include it in
++  # preloaded symbol tables.
++  extract_expsyms_cmds=
++  # Just being paranoid about ensuring that cc_basename is set.
++  _LT_CC_BASENAME([$compiler])
++  case $host_os in
++  cygwin* | mingw* | pw32*)
++    # FIXME: the MSVC++ port hasn't been tested in a loooong time
++    # When not using gcc, we currently assume that we are using
++    # Microsoft Visual C++.
++    if test "$GCC" != yes; then
++      with_gnu_ld=no
++    fi
++    ;;
++  interix*)
++    # we just hope/assume this is gcc and not c89 (= MSVC++)
++    with_gnu_ld=yes
++    ;;
++  openbsd*)
++    with_gnu_ld=no
+     ;;
+   esac
+-  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+ 
+-# This must be Linux ELF.
+-linux-gnu*)
+-  case $host_cpu in
+-  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | x86_64*)
+-    lt_cv_deplibs_check_method=pass_all ;;
+-  *)
+-    # glibc up to 2.1.1 does not perform some relocations on ARM
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+-  esac
+-  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
+-  ;;
++  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
++  if test "$with_gnu_ld" = yes; then
++    # If archive_cmds runs LD, not CC, wlarc should be empty
++    wlarc='${wl}'
+ 
+-netbsd*)
+-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
+-  else
+-    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
+-  fi
+-  ;;
++    # Set some defaults for GNU ld with shared library support. These
++    # are reset later if shared libraries are not supported. Putting them
++    # here allows them to be overridden if necessary.
++    runpath_var=LD_RUN_PATH
++    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++    # ancient GNU ld didn't support --whole-archive et. al.
++    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      else
++  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++    fi
++    supports_anon_versioning=no
++    case `$LD -v 2>/dev/null` in
++      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++      *\ 2.11.*) ;; # other 2.11 versions
++      *) supports_anon_versioning=yes ;;
++    esac
+ 
+-newos6*)
+-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+-  ;;
++    # See if GNU ld supports shared libraries.
++    case $host_os in
++    aix3* | aix4* | aix5*)
++      # On AIX/PPC, the GNU linker is very broken
++      if test "$host_cpu" != ia64; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
+ 
+-openbsd*)
+-  lt_cv_file_magic_cmd=/usr/bin/file
+-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
+-  else
+-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+-  fi
+-  ;;
++*** Warning: the GNU linker, at least up to release 2.9.1, is reported
++*** to be unable to reliably create shared libraries on AIX.
++*** Therefore, libtool is disabling shared libraries support.  If you
++*** really care for shared libraries, you may want to modify your PATH
++*** so that a non-GNU linker is found, and then restart.
+ 
+-osf3* | osf4* | osf5*)
+-  # this will be overridden with pass_all, but let us keep it just in case
+-  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+-  lt_cv_file_magic_test_file=/shlib/libc.so
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++EOF
++      fi
++      ;;
+ 
+-sco3.2v5*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++    amigaos*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ 
+-solaris*)
+-  lt_cv_deplibs_check_method=pass_all
+-  lt_cv_file_magic_test_file=/lib/libc.so
+-  ;;
++      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
++      # that the semantics of dynamic libraries on AmigaOS, at least up
++      # to version 4, is to share data among multiple programs linked
++      # with the same dynamic library.  Since this doesn't match the
++      # behavior of shared libraries on other platforms, we can't use
++      # them.
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
+ 
+-sysv5uw[[78]]* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
++    beos*)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++	# support --undefined.  This deserves some investigation.  FIXME
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-  case $host_vendor in
+-  motorola)
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+-    ;;
+-  ncr)
+-    lt_cv_deplibs_check_method=pass_all
+-    ;;
+-  sequent)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+-    ;;
+-  sni)
+-    lt_cv_file_magic_cmd='/bin/file'
+-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+-    lt_cv_file_magic_test_file=/lib/libc.so
+-    ;;
+-  siemens)
+-    lt_cv_deplibs_check_method=pass_all
+-    ;;
+-  esac
+-  ;;
+-esac
+-])
+-file_magic_cmd=$lt_cv_file_magic_cmd
+-deplibs_check_method=$lt_cv_deplibs_check_method
+-])
++    cygwin* | mingw* | pw32*)
++      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
++      # as there is no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=no
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+ 
++      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++	# If the export-symbols file already is a .def file (1st line
++	# is EXPORTS), use it as is; otherwise, prepend...
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
++	  cp $export_symbols $output_objdir/$soname.def;
++	else
++	  echo EXPORTS > $output_objdir/$soname.def;
++	  cat $export_symbols >> $output_objdir/$soname.def;
++	fi~
++	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
+ 
+-# AC_PROG_NM - find the path to a BSD-compatible name lister
+-AC_DEFUN([AC_PROG_NM],
+-[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
+-AC_MSG_CHECKING([for BSD-compatible nm])
+-AC_CACHE_VAL(lt_cv_path_NM,
+-[if test -n "$NM"; then
+-  # Let the user override the test.
+-  lt_cv_path_NM="$NM"
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
+-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	lt_cv_path_NM="$tmp_nm -p"
+-	break
++    interix[[3-9]]*)
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++      # Instead, shared libraries are loaded at an image base (0x10000000 by
++      # default) and relocated if they conflict, which is a slow very memory
++      # consuming and fragmenting process.  To avoid this, we pick a random,
++      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++      ;;
++
++    gnu* | linux* | k*bsd*-gnu)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	tmp_addflag=
++	case $cc_basename,$host_cpu in
++	pgcc*)				# Portland Group C compiler
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag'
++	  ;;
++	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_addflag=' $pic_flag -Mnomain' ;;
++	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
++	  tmp_addflag=' -i_dynamic' ;;
++	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
++	  tmp_addflag=' -i_dynamic -nofor_main' ;;
++	ifc* | ifort*)			# Intel Fortran compiler
++	  tmp_addflag=' -nofor_main' ;;
++	esac
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++	if test $supports_anon_versioning = yes; then
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++  $echo "local: *; };" >> $output_objdir/$libname.ver~
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
++	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
+       else
+-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	continue # so that we can try to find one that supports BSD flags
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
++	wlarc=
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+       fi
++      ;;
++
++    solaris*)
++      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<EOF 1>&2
++
++*** Warning: The releases 2.8.* of the GNU linker cannot reliably
++*** create shared libraries on Solaris systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.9.1 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++EOF
++      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++      case `$LD -v 2>&1` in
++        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++	cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems.  Therefore, libtool
++*** is disabling shared libraries support.  We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++	;;
++	*)
++	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++	  else
++	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
++	  fi
++	;;
++      esac
++      ;;
++
++    sunos4*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      wlarc=
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    *)
++      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++    esac
++
++    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++      runpath_var=
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+     fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+-fi])
+-NM="$lt_cv_path_NM"
+-AC_MSG_RESULT([$NM])
++  else
++    # PORTME fill in a description of your system's linker (not GNU ld)
++    case $host_os in
++    aix3*)
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
++      # Note: this linker hardcodes the directories in LIBPATH if there
++      # are no directories specified by -L.
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
++	# Neither direct hardcoding nor static linking is supported with a
++	# broken collect2.
++	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++      fi
++      ;;
++
++    aix4* | aix5*)
++      if test "$host_cpu" = ia64; then
++	# On IA64, the linker does run time linking by default, so we don't
++	# have to do anything special.
++	aix_use_runtimelinking=no
++	exp_sym_flag='-Bexport'
++	no_entry_flag=""
++      else
++	# If we're using GNU nm, then we don't want the "-C" option.
++	# -C means demangle to AIX nm, but means don't demangle with GNU nm
++	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	else
++	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
++	fi
++	aix_use_runtimelinking=no
++
++	# Test if we are trying to use run time linking or normal
++	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
++	# need to do runtime linking.
++	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++	  for ld_flag in $LDFLAGS; do
++  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++  	    aix_use_runtimelinking=yes
++  	    break
++  	  fi
++	  done
++	  ;;
++	esac
++
++	exp_sym_flag='-bexport'
++	no_entry_flag='-bnoentry'
++      fi
++
++      # When large executables or shared objects are built, AIX ld can
++      # have problems creating the table of contents.  If linking a library
++      # or program results in "error TOC overflow" add -mminimal-toc to
++      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
++      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
++      _LT_AC_TAGVAR(archive_cmds, $1)=''
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++
++      if test "$GCC" = yes; then
++	case $host_os in aix4.[[012]]|aix4.[[012]].*)
++	# We only want to do this on AIX 4.2 and lower, the check
++	# below for broken collect2 doesn't work under 4.3+
++	  collect2name=`${CC} -print-prog-name=collect2`
++	  if test -f "$collect2name" && \
++  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
++	  then
++  	  # We have reworked collect2
++  	  :
++	  else
++  	  # We have old collect2
++  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
++  	  # It fails to find uninstalled libraries when the uninstalled
++  	  # path is not listed in the libpath.  Setting hardcode_minus_L
++  	  # to unsupported forces relinking
++  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
++	  fi
++	  ;;
++	esac
++	shared_flag='-shared'
++	if test "$aix_use_runtimelinking" = yes; then
++	  shared_flag="$shared_flag "'${wl}-G'
++	fi
++      else
++	# not using gcc
++	if test "$host_cpu" = ia64; then
++  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
++  	# chokes on -Wl,-G. The following line is correct:
++	  shared_flag='-G'
++	else
++	  if test "$aix_use_runtimelinking" = yes; then
++	    shared_flag='${wl}-G'
++	  else
++	    shared_flag='${wl}-bM:SRE'
++	  fi
++	fi
++      fi
++
++      # It seems that -bexpall does not export symbols beginning with
++      # underscore (_), so it is better to generate a list of symbols to export.
++      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
++      if test "$aix_use_runtimelinking" = yes; then
++	# Warning - without using the other runtime loading flags (-brtl),
++	# -berok will link without error, but may produce a broken library.
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
++       # Determine the default libpath from the value encoded in an empty executable.
++       _LT_AC_SYS_LIBPATH_AIX
++       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++       else
++	if test "$host_cpu" = ia64; then
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
++	else
++	 # Determine the default libpath from the value encoded in an empty executable.
++	 _LT_AC_SYS_LIBPATH_AIX
++	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++	  # Warning - without using the other run time loading flags,
++	  # -berok will link without error, but may produce a broken library.
++	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
++	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
++	  # Exported symbols can be pulled into shared objects from archives
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++	  # This is similar to how AIX traditionally builds its shared libraries.
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++	fi
++      fi
++      ;;
++
++    amigaos*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      # see comment about different semantics on the GNU ld section
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    bsdi[[45]]*)
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
++      ;;
++
++    cygwin* | mingw* | pw32*)
++      # When not using gcc, we currently assume that we are using
++      # Microsoft Visual C++.
++      # hardcode_libdir_flag_spec is actually meaningless, as there is
++      # no search path for DLLs.
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      # Tell ltmain to make .lib files, not .a files.
++      libext=lib
++      # Tell ltmain to make .dll files, not .so files.
++      shrext_cmds=".dll"
++      # FIXME: Setting linknames here is a bad hack.
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++      # The linker will automatically build a .lib file if we build a DLL.
++      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
++      # FIXME: Should let the user specify the lib program.
++      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
++      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
++      ;;
++
++    darwin* | rhapsody*)
++      case $host_os in
++        rhapsody* | darwin1.[[012]])
++         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++         ;;
++       *) # Darwin 1.3 on
++         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++         else
++           case ${MACOSX_DEPLOYMENT_TARGET} in
++             10.[[012]])
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++               ;;
++             10.*)
++               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++               ;;
++           esac
++         fi
++         ;;
++      esac
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_direct, $1)=no
++      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++    if test "$GCC" = yes ; then
++    	output_verbose_link_cmd='echo'
++        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++    else
++      case $cc_basename in
++        xlc*)
++         output_verbose_link_cmd='echo'
++         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          ;;
++       *)
++         _LT_AC_TAGVAR(ld_shlibs, $1)=no
++          ;;
++      esac
++    fi
++      ;;
++
++    dgux*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    freebsd1*)
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++
++    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
++    # support.  Future versions do this automatically, but an explicit c++rt0.o
++    # does not break anything, and helps significantly (at the cost of a little
++    # extra space).
++    freebsd2.2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
++    freebsd2*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
++    freebsd* | dragonfly*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    hpux9*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++
++      # hardcode_minus_L: Not really in the search PATH,
++      # but as the default location of the library.
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++      ;;
++
++    hpux10*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      if test "$with_gnu_ld" = no; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++	# hardcode_minus_L: Not really in the search PATH,
++	# but as the default location of the library.
++	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      fi
++      ;;
++
++    hpux11*)
++      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      else
++	case $host_cpu in
++	hppa*64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	ia64*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++	  ;;
++	esac
++      fi
++      if test "$with_gnu_ld" = no; then
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++	case $host_cpu in
++	hppa*64*|ia64*)
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	  ;;
++	*)
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++	  # hardcode_minus_L: Not really in the search PATH,
++	  # but as the default location of the library.
++	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++	  ;;
++	esac
++      fi
++      ;;
++
++    irix5* | irix6* | nonstopux*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
++
++    netbsd* | netbsdelf*-gnu)
++      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    newsos6)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    openbsd*)
++      if test -f /usr/libexec/ld.so; then
++	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++	     ;;
++	   *)
++	     _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
++      else
++	_LT_AC_TAGVAR(ld_shlibs, $1)=no
++      fi
++      ;;
++
++    os2*)
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
++      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
++      ;;
++
++    osf3*)
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++      else
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
++
++    osf4* | osf5*)	# as osf3* with the addition of -msym flag
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
++      else
++	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
++	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
++
++	# Both c and cxx compiler support -rpath directly
++	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++      ;;
++
++    solaris*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
++      if test "$GCC" = yes; then
++	wlarc='${wl}'
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
++      else
++	wlarc=''
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
++  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      case $host_os in
++      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++      *)
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
++ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
++	if test "$GCC" = yes; then
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++	fi
++	;;
++      esac
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      ;;
++
++    sunos4*)
++      if test "x$host_vendor" = xsequent; then
++	# Use $CC to link under sequent, because it throws in some extra .o
++	# files that make .init and .fini sections work.
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
++      fi
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    sysv4)
++      case $host_vendor in
++	sni)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
++	;;
++	siemens)
++	  ## LD is ld it makes a PLAMLIB
++	  ## CC just makes a GrossModule.
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
++        ;;
++	motorola)
++	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
++	;;
++      esac
++      runpath_var='LD_RUN_PATH'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    sysv4.3*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
++      ;;
++
++    sysv4*MP*)
++      if test -d /usr/nec; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++	runpath_var=LD_RUN_PATH
++	hardcode_runpath_var=yes
++	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
++      fi
++      ;;
++
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      runpath_var='LD_RUN_PATH'
++
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
++
++    sysv5* | sco3.2v5* | sco5v6*)
++      # Note: We can NOT use -z defs as we might desire, because we do not
++      # link with -lc, and that would cause any symbols used from libc to
++      # always be unresolved, which means just about no library would
++      # ever link correctly.  If we're not using GNU ld we use -z text
++      # though, which does catch some bad symbols but isn't as heavy-handed
++      # as -z defs.
++      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++      runpath_var='LD_RUN_PATH'
++
++      if test "$GCC" = yes; then
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      else
++	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++      fi
++      ;;
++
++    uts4*)
++      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
++      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
++      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++      ;;
++
++    *)
++      _LT_AC_TAGVAR(ld_shlibs, $1)=no
++      ;;
++    esac
++  fi
+ ])
++AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
++test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ 
+-# AC_CHECK_LIBM - check for math library
+-AC_DEFUN([AC_CHECK_LIBM],
+-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+-LIBM=
+-case $host in
+-*-*-beos* | *-*-cygwin* | *-*-pw32*)
+-  # These system don't have libm
+-  ;;
+-*-ncr-sysv4.3*)
+-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+-  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
+-  ;;
+-*)
+-  AC_CHECK_LIB(m, main, LIBM="-lm")
++#
++# Do we need to explicitly link libc?
++#
++case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
++x|xyes)
++  # Assume -lc should be added
++  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++
++  if test "$enable_shared" = yes && test "$GCC" = yes; then
++    case $_LT_AC_TAGVAR(archive_cmds, $1) in
++    *'~'*)
++      # FIXME: we may have to deal with multi-command sequences.
++      ;;
++    '$CC '*)
++      # Test whether the compiler implicitly links with -lc since on some
++      # systems, -lgcc has to come before -lc. If gcc already passes -lc
++      # to ld, don't add -lc before -lgcc.
++      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
++      $rm conftest*
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
++      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
++        soname=conftest
++        lib=conftest
++        libobjs=conftest.$ac_objext
++        deplibs=
++        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
++        compiler_flags=-v
++        linker_flags=-v
++        verstring=
++        output_objdir=.
++        libname=conftest
++        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
++        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
++        then
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++        else
++	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
++        fi
++        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
++      else
++        cat conftest.err 1>&5
++      fi
++      $rm conftest*
++      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
++      ;;
++    esac
++  fi
+   ;;
+ esac
+-])
++])# AC_LIBTOOL_PROG_LD_SHLIBS
+ 
+-# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl convenience library and LTDLINCL to the include flags for
+-# the libltdl header and adds --enable-ltdl-convenience to the
+-# configure arguments.  Note that LIBLTDL and LTDLINCL are not
+-# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
+-# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
+-# with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!).  If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
+-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  case $enable_ltdl_convenience in
+-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
+-  "") enable_ltdl_convenience=yes
+-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
+-  esac
+-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
+-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])
+ 
+-# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
+-# the libltdl installable library and LTDLINCL to the include flags for
+-# the libltdl header and adds --enable-ltdl-install to the configure
+-# arguments.  Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
+-# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
+-# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
+-# with '${top_srcdir}/' (note the single quotes!).  If your package is
+-# not flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
+-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+-  AC_CHECK_LIB(ltdl, main,
+-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
+-  [if test x"$enable_ltdl_install" = xno; then
+-     AC_MSG_WARN([libltdl not installed, but installation disabled])
+-   else
+-     enable_ltdl_install=yes
+-   fi
+-  ])
+-  if test x"$enable_ltdl_install" = x"yes"; then
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
+-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
+-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
+-  else
+-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
+-    LIBLTDL="-lltdl"
+-    LTDLINCL=
+-  fi
+-  # For backwards non-gettext consistent compatibility...
+-  INCLTDL="$LTDLINCL"
+-])
++# _LT_AC_FILE_LTDLL_C
++# -------------------
++# Be careful that the start marker always follows a newline.
++AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
++# /* ltdll.c starts here */
++# #define WIN32_LEAN_AND_MEAN
++# #include <windows.h>
++# #undef WIN32_LEAN_AND_MEAN
++# #include <stdio.h>
++#
++# #ifndef __CYGWIN__
++# #  ifdef __CYGWIN32__
++# #    define __CYGWIN__ __CYGWIN32__
++# #  endif
++# #endif
++#
++# #ifdef __cplusplus
++# extern "C" {
++# #endif
++# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
++# #ifdef __cplusplus
++# }
++# #endif
++#
++# #ifdef __CYGWIN__
++# #include <cygwin/cygwin_dll.h>
++# DECLARE_CYGWIN_DLL( DllMain );
++# #endif
++# HINSTANCE __hDllInstance_base;
++#
++# BOOL APIENTRY
++# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
++# {
++#   __hDllInstance_base = hInst;
++#   return TRUE;
++# }
++# /* ltdll.c ends here */
++])# _LT_AC_FILE_LTDLL_C
++
++
++# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
++# ---------------------------------
++AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
++
+ 
+ # old names
+ AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
+@@ -3708,6 +6495,40 @@
+ # This is just to silence aclocal about the macro not being used
+ ifelse([AC_DISABLE_FAST_INSTALL])
+ 
++AC_DEFUN([LT_AC_PROG_GCJ],
++[AC_CHECK_TOOL(GCJ, gcj, no)
++  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
++  AC_SUBST(GCJFLAGS)
++])
++
++AC_DEFUN([LT_AC_PROG_RC],
++[AC_CHECK_TOOL(RC, windres, no)
++])
++
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++  as_executable_p='test -x'
++else
++  as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+ # NOTE: This macro has been submitted for inclusion into   #
+ #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+ #  a released version of Autoconf we should remove this    #
+@@ -3721,79 +6542,53 @@
+ AC_CACHE_VAL(lt_cv_path_SED,
+ [# Loop through the user's path and test for sed and gsed.
+ # Then use that list of sed's as ones to test for truncation.
+-as_executable_p="test -f"
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for as_dir in $PATH
+ do
+   IFS=$as_save_IFS
+   test -z "$as_dir" && as_dir=.
+-  for ac_prog in sed gsed; do
++  for lt_ac_prog in sed gsed; do
+     for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+-        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
++      if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
++        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+       fi
+     done
+   done
+ done
 -
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-Index: libparagui1.0-1.0.4/bindings/Makefile.in
-===================================================================
+-  # Create a temporary directory, and hook for its removal unless debugging.
+-$debug ||
+-{
+-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+-}
+-
+-# Create a (secure) tmp directory for tmp files.
+-: ${TMPDIR=/tmp}
+-{
+-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
+-  test -n "$tmp" && test -d "$tmp"
+-}  ||
+-{
+-  tmp=$TMPDIR/sed$$-$RANDOM
+-  (umask 077 && mkdir $tmp)
+-} ||
+-{
+-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+-   { (exit 1); exit 1; }
+-}
+-  _max=0
+-  _count=0
+-  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+-  # along with /bin/sed that truncates output.
+-  for _sed in $_sed_list /usr/xpg4/bin/sed; do
+-    test ! -f ${_sed} && break
+-    cat /dev/null > "$tmp/sed.in"
+-    _count=0
+-    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
+-    # Check for GNU sed and select it if it is found.
+-    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
+-      lt_cv_path_SED=${_sed}
+-      break
++IFS=$as_save_IFS
++lt_ac_max=0
++lt_ac_count=0
++# Add /usr/xpg4/bin/sed as it is typically found on Solaris
++# along with /bin/sed that truncates output.
++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
++  test ! -f $lt_ac_sed && continue
++  cat /dev/null > conftest.in
++  lt_ac_count=0
++  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
++  # Check for GNU sed and select it if it is found.
++  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
++    lt_cv_path_SED=$lt_ac_sed
++    break
++  fi
++  while true; do
++    cat conftest.in conftest.in >conftest.tmp
++    mv conftest.tmp conftest.in
++    cp conftest.in conftest.nl
++    echo >>conftest.nl
++    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
++    cmp -s conftest.out conftest.nl || break
++    # 10000 chars as input seems more than enough
++    test $lt_ac_count -gt 10 && break
++    lt_ac_count=`expr $lt_ac_count + 1`
++    if test $lt_ac_count -gt $lt_ac_max; then
++      lt_ac_max=$lt_ac_count
++      lt_cv_path_SED=$lt_ac_sed
+     fi
+-    while true; do
+-      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
+-      mv "$tmp/sed.tmp" "$tmp/sed.in"
+-      cp "$tmp/sed.in" "$tmp/sed.nl"
+-      echo >>"$tmp/sed.nl"
+-      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
+-      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
+-      # 40000 chars as input seems more than enough
+-      test $_count -gt 10 && break
+-      _count=`expr $_count + 1`
+-      if test $_count -gt $_max; then
+-        _max=$_count
+-        lt_cv_path_SED=$_sed
+-      fi
+-    done
+   done
+-  rm -rf "$tmp"
++done
+ ])
+-if test "X$SED" != "X"; then
+-  lt_cv_path_SED=$SED
+-else
+-  SED=$lt_cv_path_SED
+-fi
++SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+ 
+@@ -3807,7 +6602,7 @@
+ dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+ dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
+ dnl
+-AC_DEFUN(AM_PATH_SDL,
++AC_DEFUN([AM_PATH_SDL],
+ [dnl 
+ dnl Get the cflags and libraries from the sdl-config script
+ dnl
+@@ -3819,20 +6614,21 @@
+ 		    , enable_sdltest=yes)
+ 
+   if test x$sdl_exec_prefix != x ; then
+-     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
+-     fi
++    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
++    if test x${SDL_CONFIG+set} != xset ; then
++      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
++    fi
+   fi
+   if test x$sdl_prefix != x ; then
+-     sdl_args="$sdl_args --prefix=$sdl_prefix"
+-     if test x${SDL_CONFIG+set} != xset ; then
+-        SDL_CONFIG=$sdl_prefix/bin/sdl-config
+-     fi
++    sdl_args="$sdl_args --prefix=$sdl_prefix"
++    if test x${SDL_CONFIG+set} != xset ; then
++      SDL_CONFIG=$sdl_prefix/bin/sdl-config
++    fi
+   fi
+ 
+-  AC_REQUIRE([AC_CANONICAL_TARGET])
+-  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
++  if test "x$prefix" != xNONE; then
++    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
++  fi
+   AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+   min_sdl_version=ifelse([$1], ,0.11.0,$1)
+   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
+@@ -3851,8 +6647,10 @@
+            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+     if test "x$enable_sdltest" = "xyes" ; then
+       ac_save_CFLAGS="$CFLAGS"
++      ac_save_CXXFLAGS="$CXXFLAGS"
+       ac_save_LIBS="$LIBS"
+       CFLAGS="$CFLAGS $SDL_CFLAGS"
++      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+       LIBS="$LIBS $SDL_LIBS"
+ dnl
+ dnl Now check if the installed SDL is sufficiently new. (Also sanity
+@@ -3918,6 +6716,7 @@
+ 
+ ],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+        CFLAGS="$ac_save_CFLAGS"
++       CXXFLAGS="$ac_save_CXXFLAGS"
+        LIBS="$ac_save_LIBS"
+      fi
+   fi
+@@ -3937,6 +6736,7 @@
+        else
+           echo "*** Could not run SDL test program, checking why..."
+           CFLAGS="$CFLAGS $SDL_CFLAGS"
++          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
+           LIBS="$LIBS $SDL_LIBS"
+           AC_TRY_LINK([
+ #include <stdio.h>
+@@ -3961,6 +6761,7 @@
+           echo "*** or that you have moved SDL since it was installed. In the latter case, you"
+           echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
+           CFLAGS="$ac_save_CFLAGS"
++          CXXFLAGS="$ac_save_CXXFLAGS"
+           LIBS="$ac_save_LIBS"
+        fi
+      fi
+@@ -3973,3 +6774,881 @@
+   rm -f conf.sdltest
+ ])
+ 
++# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_AUTOMAKE_VERSION(VERSION)
++# ----------------------------
++# Automake X.Y traces this macro to ensure aclocal.m4 has been
++# generated from the m4 files accompanying Automake X.Y.
++AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
++
++# AM_SET_CURRENT_AUTOMAKE_VERSION
++# -------------------------------
++# 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.9.6])])
++
++# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
++
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
++# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
++# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
++#
++# Of course, Automake must honor this variable whenever it calls a
++# tool from the auxiliary directory.  The problem is that $srcdir (and
++# therefore $ac_aux_dir as well) can be either absolute or relative,
++# depending on how configure is run.  This is pretty annoying, since
++# it makes $ac_aux_dir quite unusable in subdirectories: in the top
++# source directory, any form will work fine, but in subdirectories a
++# relative path needs to be adjusted first.
++#
++# $ac_aux_dir/missing
++#    fails when called from a subdirectory if $ac_aux_dir is relative
++# $top_srcdir/$ac_aux_dir/missing
++#    fails if $ac_aux_dir is absolute,
++#    fails when called from a subdirectory in a VPATH build with
++#          a relative $ac_aux_dir
++#
++# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
++# are both prefixed by $srcdir.  In an in-source build this is usually
++# harmless because $srcdir is `.', but things will broke when you
++# start a VPATH build or use an absolute $srcdir.
++#
++# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
++# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
++#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
++# and then we would define $MISSING as
++#   MISSING="\${SHELL} $am_aux_dir/missing"
++# This will work as long as MISSING is not called from configure, because
++# unfortunately $(top_srcdir) has no meaning in configure.
++# However there are other variables, like CC, which are often used in
++# configure, and could therefore not use this "fixed" $ac_aux_dir.
++#
++# Another solution, used here, is to always expand $ac_aux_dir to an
++# absolute PATH.  The drawback is that using absolute paths prevent a
++# configured tree to be moved without reconfiguration.
++
++AC_DEFUN([AM_AUX_DIR_EXPAND],
++[dnl Rely on autoconf to set up CDPATH properly.
++AC_PREREQ([2.50])dnl
++# expand $ac_aux_dir to an absolute path
++am_aux_dir=`cd $ac_aux_dir && pwd`
++])
++
++# AM_CONDITIONAL                                            -*- Autoconf -*-
++
++# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 7
++
++# AM_CONDITIONAL(NAME, SHELL-CONDITION)
++# -------------------------------------
++# Define a conditional.
++AC_DEFUN([AM_CONDITIONAL],
++[AC_PREREQ(2.52)dnl
++ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
++	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
++AC_SUBST([$1_TRUE])
++AC_SUBST([$1_FALSE])
++if $2; then
++  $1_TRUE=
++  $1_FALSE='#'
++else
++  $1_TRUE='#'
++  $1_FALSE=
++fi
++AC_CONFIG_COMMANDS_PRE(
++[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
++  AC_MSG_ERROR([[conditional "$1" was never defined.
++Usually this means the macro was only invoked conditionally.]])
++fi])])
++
++
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 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...
++
++
++# _AM_DEPENDENCIES(NAME)
++# ----------------------
++# See how the compiler implements dependency checking.
++# NAME is "CC", "CXX", "GCJ", or "OBJC".
++# We try a few techniques and use that to set a single cache variable.
++#
++# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
++# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
++# dependency, and given that the user is not expected to run this macro,
++# just rely on AC_PROG_CC.
++AC_DEFUN([_AM_DEPENDENCIES],
++[AC_REQUIRE([AM_SET_DEPDIR])dnl
++AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
++AC_REQUIRE([AM_MAKE_INCLUDE])dnl
++AC_REQUIRE([AM_DEP_TRACK])dnl
++
++ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
++       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
++       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
++       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
++                   [depcc="$$1"   am_compiler_list=])
++
++AC_CACHE_CHECK([dependency style of $depcc],
++               [am_cv_$1_dependencies_compiler_type],
++[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
++  # We make a subdir and do the tests there.  Otherwise we can end up
++  # making bogus files that we don't know about and never remove.  For
++  # instance it was reported that on HP-UX the gcc test will end up
++  # making a dummy file named `D' -- because `-MD' means `put the output
++  # in D'.
++  mkdir conftest.dir
++  # Copy depcomp to subdir because otherwise we won't find it if we're
++  # 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
++
++  am_cv_$1_dependencies_compiler_type=none
++  if test "$am_compiler_list" = ""; then
++     am_compiler_list=`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.
++    : > sub/conftest.c
++    for i in 1 2 3 4 5 6; do
++      echo '#include "conftst'$i'.h"' >> sub/conftest.c
++      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
++      # Solaris 8's {/usr,}/bin/sh.
++      touch sub/conftst$i.h
++    done
++    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
++
++    case $depmode in
++    nosideeffect)
++      # after this tag, mechanisms are not by side-effect, so they'll
++      # only be used when explicitly requested
++      if test "x$enable_dependency_tracking" = xyes; then
++	continue
++      else
++	break
++      fi
++      ;;
++    none) break ;;
++    esac
++    # We check with `-c' and `-o' for the sake of the "dashmstdout"
++    # mode.  It turns out that the SunPro C++ compiler does not properly
++    # handle `-M -o', and we need to detect this.
++    if depmode=$depmode \
++       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
++       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
++       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
++         >/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
++      # icc doesn't choke on unknown options, it will just issue warnings
++      # or remarks (even with -Werror).  So we grep stderr for any message
++      # that says an option was ignored or not supported.
++      # When given -MP, icc 7.0 and 7.1 complain thusly:
++      #   icc: Command line warning: ignoring option '-M'; no argument required
++      # The diagnosis changed in icc 8.0:
++      #   icc: Command line remark: option '-MP' not supported
++      if (grep 'ignoring option' conftest.err ||
++          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
++        am_cv_$1_dependencies_compiler_type=$depmode
++        break
++      fi
++    fi
++  done
++
++  cd ..
++  rm -rf conftest.dir
++else
++  am_cv_$1_dependencies_compiler_type=none
++fi
++])
++AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
++AM_CONDITIONAL([am__fastdep$1], [
++  test "x$enable_dependency_tracking" != xno \
++  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
++])
++
++
++# AM_SET_DEPDIR
++# -------------
++# Choose a directory name for dependency files.
++# This macro is AC_REQUIREd in _AM_DEPENDENCIES
++AC_DEFUN([AM_SET_DEPDIR],
++[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
++])
++
++
++# AM_DEP_TRACK
++# ------------
++AC_DEFUN([AM_DEP_TRACK],
++[AC_ARG_ENABLE(dependency-tracking,
++[  --disable-dependency-tracking  speeds up one-time build
++  --enable-dependency-tracking   do not reject slow dependency extractors])
++if test "x$enable_dependency_tracking" != xno; then
++  am_depcomp="$ac_aux_dir/depcomp"
++  AMDEPBACKSLASH='\'
++fi
++AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
++AC_SUBST([AMDEPBACKSLASH])
++])
++
++# Generate code to set up dependency tracking.              -*- Autoconf -*-
++
++# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++#serial 3
++
++# _AM_OUTPUT_DEPENDENCY_COMMANDS
++# ------------------------------
++AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
++[for mf in $CONFIG_FILES; do
++  # Strip MF so we end up with the name of the file.
++  mf=`echo "$mf" | sed -e 's/:.*$//'`
++  # Check whether this is an Automake generated Makefile or not.
++  # We used to match only the files named `Makefile.in', but
++  # some people rename them; so instead we look at the file content.
++  # Grep'ing the first line is not enough: some people post-process
++  # each Makefile.in and add a new line on top of each file to say so.
++  # So let's grep whole file.
++  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
++    dirpart=`AS_DIRNAME("$mf")`
++  else
++    continue
++  fi
++  # Extract the definition of DEPDIR, am__include, and am__quote
++  # from the Makefile without running `make'.
++  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
++  test -z "$DEPDIR" && continue
++  am__include=`sed -n 's/^am__include = //p' < "$mf"`
++  test -z "am__include" && continue
++  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
++  # When using ansi2knr, U may be empty or an underscore; expand it
++  U=`sed -n 's/^U = //p' < "$mf"`
++  # Find all dependency output files, they are included files with
++  # $(DEPDIR) in their names.  We invoke sed twice because it is the
++  # simplest approach to changing $(DEPDIR) to its actual value in the
++  # expansion.
++  for file in `sed -n "
++    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
++       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
++    # Make sure the directory exists.
++    test -f "$dirpart/$file" && continue
++    fdir=`AS_DIRNAME(["$file"])`
++    AS_MKDIR_P([$dirpart/$fdir])
++    # echo "creating $dirpart/$file"
++    echo '# dummy' > "$dirpart/$file"
++  done
++done
++])# _AM_OUTPUT_DEPENDENCY_COMMANDS
++
++
++# AM_OUTPUT_DEPENDENCY_COMMANDS
++# -----------------------------
++# This macro should only be invoked once -- use via AC_REQUIRE.
++#
++# This code is only required when automatic dependency tracking
++# is enabled.  FIXME.  This creates each `.P' file that we will
++# need in order to bootstrap the dependency handling code.
++AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
++[AC_CONFIG_COMMANDS([depfiles],
++     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
++     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
++])
++
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 8
++
++# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
++AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
++
++# Do all the work for Automake.                             -*- Autoconf -*-
++
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 12
++
++# 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.
++
++# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
++# AM_INIT_AUTOMAKE([OPTIONS])
++# -----------------------------------------------
++# The call with PACKAGE and VERSION arguments is the old style
++# call (pre autoconf-2.50), which is being phased out.  PACKAGE
++# and VERSION should now be passed to AC_INIT and removed from
++# the call to AM_INIT_AUTOMAKE.
++# We support both call styles for the transition.  After
++# the next Automake release, Autoconf can make the AC_INIT
++# arguments mandatory, and then we can depend on a new Autoconf
++# release and drop the old call support.
++AC_DEFUN([AM_INIT_AUTOMAKE],
++[AC_PREREQ([2.58])dnl
++dnl Autoconf wants to disallow AM_ names.  We explicitly allow
++dnl the ones we care about.
++m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
++AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
++AC_REQUIRE([AC_PROG_INSTALL])dnl
++# test to see if srcdir already configured
++if test "`cd $srcdir && pwd`" != "`pwd`" &&
++   test -f $srcdir/config.status; then
++  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
++fi
++
++# test whether we have cygpath
++if test -z "$CYGPATH_W"; then
++  if (cygpath --version) >/dev/null 2>/dev/null; then
++    CYGPATH_W='cygpath -w'
++  else
++    CYGPATH_W=echo
++  fi
++fi
++AC_SUBST([CYGPATH_W])
++
++# Define the identity of the package.
++dnl Distinguish between old-style and new-style calls.
++m4_ifval([$2],
++[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
++ 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
++
++_AM_IF_OPTION([no-define],,
++[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
++ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
++
++# Some tools Automake needs.
++AC_REQUIRE([AM_SANITY_CHECK])dnl
++AC_REQUIRE([AC_ARG_PROGRAM])dnl
++AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
++AM_MISSING_PROG(AUTOCONF, autoconf)
++AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
++AM_MISSING_PROG(AUTOHEADER, autoheader)
++AM_MISSING_PROG(MAKEINFO, makeinfo)
++AM_PROG_INSTALL_SH
++AM_PROG_INSTALL_STRIP
++AC_REQUIRE([AM_PROG_MKDIR_P])dnl
++# We need awk for the "check" target.  The system "awk" is bad on
++# some platforms.
++AC_REQUIRE([AC_PROG_AWK])dnl
++AC_REQUIRE([AC_PROG_MAKE_SET])dnl
++AC_REQUIRE([AM_SET_LEADING_DOT])dnl
++_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
++              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
++	      		     [_AM_PROG_TAR([v7])])])
++_AM_IF_OPTION([no-dependencies],,
++[AC_PROVIDE_IFELSE([AC_PROG_CC],
++                  [_AM_DEPENDENCIES(CC)],
++                  [define([AC_PROG_CC],
++                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
++AC_PROVIDE_IFELSE([AC_PROG_CXX],
++                  [_AM_DEPENDENCIES(CXX)],
++                  [define([AC_PROG_CXX],
++                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
++])
++])
++
++
++# When config.status generates a header, we must update the stamp-h file.
++# This file resides in the same directory as the config header
++# that is generated.  The stamp files are numbered to have different names.
++
++# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
++# loop where config.status creates the headers, so we can generate
++# our stamp files there.
++AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
++[# Compute $1's index in $config_headers.
++_am_stamp_count=1
++for _am_header in $config_headers :; do
++  case $_am_header in
++    $1 | $1:* )
++      break ;;
++    * )
++      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
++  esac
++done
++echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
++
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_PROG_INSTALL_SH
++# ------------------
++# Define $install_sh.
++AC_DEFUN([AM_PROG_INSTALL_SH],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++install_sh=${install_sh-"$am_aux_dir/install-sh"}
++AC_SUBST(install_sh)])
++
++# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 2
++
++# 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=.
++else
++  am__leading_dot=_
++fi
++rmdir .tst 2>/dev/null
++AC_SUBST([am__leading_dot])])
++
++# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
++# From Jim Meyering
++
++# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++AC_DEFUN([AM_MAINTAINER_MODE],
++[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
++  dnl maintainer-mode is disabled by default
++  AC_ARG_ENABLE(maintainer-mode,
++[  --enable-maintainer-mode  enable make rules and dependencies not useful
++			  (and sometimes confusing) to the casual installer],
++      USE_MAINTAINER_MODE=$enableval,
++      USE_MAINTAINER_MODE=no)
++  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
++  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
++  MAINT=$MAINTAINER_MODE_TRUE
++  AC_SUBST(MAINT)dnl
++]
++)
++
++AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
++
++# Check to see how 'make' treats includes.	            -*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 3
++
++# AM_MAKE_INCLUDE()
++# -----------------
++# Check to see how make treats includes.
++AC_DEFUN([AM_MAKE_INCLUDE],
++[am_make=${MAKE-make}
++cat > confinc << 'END'
++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])
++am__include="#"
++am__quote=
++_am_result=none
++# First try GNU make style include.
++echo "include confinc" > confmf
++# We grep out `Entering directory' and `Leaving directory'
++# messages which can occur if `w' ends up in MAKEFLAGS.
++# In particular we don't look at `^make:' because GNU make might
++# be invoked under some other name (usually "gmake"), in which
++# case it prints its new name instead of `make'.
++if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
++   am__include=include
++   am__quote=
++   _am_result=GNU
++fi
++# Now try BSD make style include.
++if test "$am__include" = "#"; then
++   echo '.include "confinc"' > confmf
++   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
++      am__include=.include
++      am__quote="\""
++      _am_result=BSD
++   fi
++fi
++AC_SUBST([am__include])
++AC_SUBST([am__quote])
++AC_MSG_RESULT([$_am_result])
++rm -f confinc confmf
++])
++
++# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
++
++# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++# AM_MISSING_PROG(NAME, PROGRAM)
++# ------------------------------
++AC_DEFUN([AM_MISSING_PROG],
++[AC_REQUIRE([AM_MISSING_HAS_RUN])
++$1=${$1-"${am_missing_run}$2"}
++AC_SUBST($1)])
++
++
++# AM_MISSING_HAS_RUN
++# ------------------
++# Define MISSING if not defined so far and test if it supports --run.
++# If it does, set am_missing_run to use it, otherwise, to nothing.
++AC_DEFUN([AM_MISSING_HAS_RUN],
++[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
++test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
++# Use eval to expand $SHELL
++if eval "$MISSING --run true"; then
++  am_missing_run="$MISSING --run "
++else
++  am_missing_run=
++  AC_MSG_WARN([`missing' script is too old or missing])
++fi
++])
++
++# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_PROG_MKDIR_P
++# ---------------
++# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
++#
++# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
++# created by `make install' are always world readable, even if the
++# installer happens to have an overly restrictive umask (e.g. 077).
++# This was a mistake.  There are at least two reasons why we must not
++# use `-m 0755':
++#   - it causes special bits like SGID to be ignored,
++#   - it may be too restrictive (some setups expect 775 directories).
++#
++# Do not use -m 0755 and let people choose whatever they expect by
++# setting umask.
++#
++# We cannot accept any implementation of `mkdir' that recognizes `-p'.
++# Some implementations (such as Solaris 8's) are not thread-safe: if a
++# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
++# concurrently, both version can detect that a/ is missing, but only
++# one can create it and the other will error out.  Consequently we
++# restrict ourselves to GNU make (using the --version option ensures
++# this.)
++AC_DEFUN([AM_PROG_MKDIR_P],
++[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
++  # We used to keeping the `.' as first argument, in order to
++  # allow $(mkdir_p) to be used without argument.  As in
++  #   $(mkdir_p) $(somedir)
++  # where $(somedir) is conditionally defined.  However this is wrong
++  # for two reasons:
++  #  1. if the package is installed by a user who cannot write `.'
++  #     make install will fail,
++  #  2. the above comment should most certainly read
++  #     $(mkdir_p) $(DESTDIR)$(somedir)
++  #     so it does not work when $(somedir) is undefined and
++  #     $(DESTDIR) is not.
++  #  To support the latter case, we have to write
++  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
++  #  so the `.' trick is pointless.
++  mkdir_p='mkdir -p --'
++else
++  # On NextStep and OpenStep, the `mkdir' command does not
++  # recognize any option.  It will interpret all options as
++  # directories to create, and then abort because `.' already
++  # exists.
++  for d in ./-p ./--version;
++  do
++    test -d $d && rmdir $d
++  done
++  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
++  if test -f "$ac_aux_dir/mkinstalldirs"; then
++    mkdir_p='$(mkinstalldirs)'
++  else
++    mkdir_p='$(install_sh) -d'
++  fi
++fi
++AC_SUBST([mkdir_p])])
++
++# Helper functions for option handling.                     -*- Autoconf -*-
++
++# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 3
++
++# _AM_MANGLE_OPTION(NAME)
++# -----------------------
++AC_DEFUN([_AM_MANGLE_OPTION],
++[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
++
++# _AM_SET_OPTION(NAME)
++# ------------------------------
++# Set option NAME.  Presently that only means defining a flag for this option.
++AC_DEFUN([_AM_SET_OPTION],
++[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
++
++# _AM_SET_OPTIONS(OPTIONS)
++# ----------------------------------
++# OPTIONS is a space-separated list of Automake options.
++AC_DEFUN([_AM_SET_OPTIONS],
++[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
++
++# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
++# -------------------------------------------
++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
++AC_DEFUN([_AM_IF_OPTION],
++[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
++
++# Check to make sure that the build environment is sane.    -*- Autoconf -*-
++
++# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
++# Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 4
++
++# AM_SANITY_CHECK
++# ---------------
++AC_DEFUN([AM_SANITY_CHECK],
++[AC_MSG_CHECKING([whether build environment is sane])
++# Just in case
++sleep 1
++echo timestamp > conftest.file
++# Do `set' in a subshell so we don't clobber the current shell's
++# arguments.  Must try -L first in case configure is actually a
++# symlink; some systems play weird games with the mod time of symlinks
++# (eg FreeBSD returns the mod time of the symlink's containing
++# directory).
++if (
++   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
++   if test "$[*]" = "X"; then
++      # -L didn't work.
++      set X `ls -t $srcdir/configure conftest.file`
++   fi
++   rm -f conftest.file
++   if test "$[*]" != "X $srcdir/configure conftest.file" \
++      && test "$[*]" != "X conftest.file $srcdir/configure"; then
++
++      # If neither matched, then we have a broken ls.  This can happen
++      # if, for instance, CONFIG_SHELL is bash and it inherits a
++      # broken ls alias from the environment.  This has actually
++      # happened.  Such a system could not be considered "sane".
++      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
++alias in your environment])
++   fi
++
++   test "$[2]" = conftest.file
++   )
++then
++   # Ok.
++   :
++else
++   AC_MSG_ERROR([newly created file is older than distributed files!
++Check your system clock])
++fi
++AC_MSG_RESULT(yes)])
++
++# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# AM_PROG_INSTALL_STRIP
++# ---------------------
++# One issue with vendor `install' (even GNU) is that you can't
++# specify the program used to strip binaries.  This is especially
++# annoying in cross-compiling environments, where the build's strip
++# is unlikely to handle the host's binaries.
++# Fortunately install-sh will honor a STRIPPROG variable, so we
++# always use install-sh in `make install-strip', and initialize
++# STRIPPROG with the value of the STRIP variable (set by the user).
++AC_DEFUN([AM_PROG_INSTALL_STRIP],
++[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
++# Installed binaries are usually stripped using `strip' when the user
++# run `make install-strip'.  However `strip' might not be the right
++# tool to use in cross-compilation environments, therefore Automake
++# will honor the `STRIP' environment variable to overrule this program.
++dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
++if test "$cross_compiling" != no; then
++  AC_CHECK_TOOL([STRIP], [strip], :)
++fi
++INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
++AC_SUBST([INSTALL_STRIP_PROGRAM])])
++
++# Check how to create a tarball.                            -*- Autoconf -*-
++
++# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
++#
++# This file is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# serial 2
++
++# _AM_PROG_TAR(FORMAT)
++# --------------------
++# Check how to create a tarball in format FORMAT.
++# FORMAT should be one of `v7', `ustar', or `pax'.
++#
++# Substitute a variable $(am__tar) that is a command
++# writing to stdout a FORMAT-tarball containing the directory
++# $tardir.
++#     tardir=directory && $(am__tar) > result.tar
++#
++# Substitute a variable $(am__untar) that extract such
++# a tarball read from stdin.
++#     $(am__untar) < result.tar
++AC_DEFUN([_AM_PROG_TAR],
++[# Always define AMTAR for backward compatibility.
++AM_MISSING_PROG([AMTAR], [tar])
++m4_if([$1], [v7],
++     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
++     [m4_case([$1], [ustar],, [pax],,
++              [m4_fatal([Unknown tar format])])
++AC_MSG_CHECKING([how to create a $1 tar archive])
++# Loop over all known methods to create a tar archive until one works.
++_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
++_am_tools=${am_cv_prog_tar_$1-$_am_tools}
++# Do not fold the above two line into one, because Tru64 sh and
++# Solaris sh will not grok spaces in the rhs of `-'.
++for _am_tool in $_am_tools
++do
++  case $_am_tool in
++  gnutar)
++    for _am_tar in tar gnutar gtar;
++    do
++      AM_RUN_LOG([$_am_tar --version]) && break
++    done
++    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
++    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
++    am__untar="$_am_tar -xf -"
++    ;;
++  plaintar)
++    # Must skip GNU tar: if it does not support --format= it doesn't create
++    # ustar tarball either.
++    (tar --version) >/dev/null 2>&1 && continue
++    am__tar='tar chf - "$$tardir"'
++    am__tar_='tar chf - "$tardir"'
++    am__untar='tar xf -'
++    ;;
++  pax)
++    am__tar='pax -L -x $1 -w "$$tardir"'
++    am__tar_='pax -L -x $1 -w "$tardir"'
++    am__untar='pax -r'
++    ;;
++  cpio)
++    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
++    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
++    am__untar='cpio -i -H $1 -d'
++    ;;
++  none)
++    am__tar=false
++    am__tar_=false
++    am__untar=false
++    ;;
++  esac
++
++  # If the value was cached, stop now.  We just wanted to have am__tar
++  # and am__untar set.
++  test -n "${am_cv_prog_tar_$1}" && break
++
++  # tar/untar a dummy directory, and stop if the command works
++  rm -rf conftest.dir
++  mkdir conftest.dir
++  echo GrepMe > conftest.dir/file
++  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
++  rm -rf conftest.dir
++  if test -s conftest.tar; then
++    AM_RUN_LOG([$am__untar <conftest.tar])
++    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
++  fi
++done
++rm -rf conftest.dir
++
++AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
++AC_MSG_RESULT([$am_cv_prog_tar_$1])])
++AC_SUBST([am__tar])
++AC_SUBST([am__untar])
++]) # _AM_PROG_TAR
++
+diff -Nurd libparagui1.0-1.0.4.orig/bindings/Makefile.in libparagui1.0-1.0.4/bindings/Makefile.in
 --- libparagui1.0-1.0.4.orig/bindings/Makefile.in	2003-07-07 11:06:18.000000000 +0200
-+++ libparagui1.0-1.0.4/bindings/Makefile.in	2006-06-15 22:26:28.000000000 +0200
++++ libparagui1.0-1.0.4/bindings/Makefile.in	2007-12-21 23:59:15.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -1203,10 +10039,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,35 +147,110 @@
+@@ -110,35 +147,111 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -1275,17 +10112,9 @@
 -CONFIG_HEADER = ../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
 -DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +all: all-recursive
- 
--TAR = gtar
--GZIP_ENV = --best
--all: all-redirect
- .SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps bindings/Makefile
++
++.SUFFIXES:
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -1295,9 +10124,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  bindings/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  bindings/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  bindings/Makefile
++	  $(AUTOMAKE) --gnu  bindings/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -1307,15 +10136,22 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-TAR = gtar
+-GZIP_ENV = --best
+-all: all-redirect
+-.SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps bindings/Makefile
 +mostlyclean-libtool:
 +	-rm -f *.lo
  
@@ -1331,7 +10167,7 @@
  
  # This directory's subdirectories are mostly independent; you can cd
  # into them and run `make' without going through this Makefile.
-@@ -146,13 +258,14 @@
+@@ -146,13 +259,14 @@
  # (1) if the variable is set in `config.status', edit `config.status'
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
@@ -1353,7 +10189,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -164,7 +277,7 @@
+@@ -164,7 +278,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -1362,7 +10198,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -172,13 +285,24 @@
+@@ -172,13 +286,24 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -1392,7 +10228,7 @@
  	target=`echo $@ | sed s/-recursive//`; \
  	for subdir in $$rev; do \
  	  echo "Making $$target in $$subdir"; \
-@@ -188,141 +312,210 @@
+@@ -188,141 +313,210 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -1460,8 +10296,6 @@
 -	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 -
 -mostlyclean-tags:
--
--clean-tags:
 +	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  test -n "$$unique" || unique=$$empty_fix; \
 +	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -1481,7 +10315,8 @@
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -1642,20 +10477,6 @@
  maintainer-clean: maintainer-clean-recursive
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am: uninstall-info-am
  
 -.PHONY: install-data-recursive uninstall-data-recursive \
 -install-exec-recursive uninstall-exec-recursive installdirs-recursive \
@@ -1669,6 +10490,20 @@
 -uninstall-am uninstall all-redirect all-am all installdirs-am \
 -installdirs mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-recursive
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-recursive
++
++pdf-am:
++
++ps: ps-recursive
++
++ps-am:
++
++uninstall-am: uninstall-info-am
++
 +uninstall-info: uninstall-info-recursive
  
 +.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
@@ -1686,10 +10521,9 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libparagui1.0-1.0.4/bindings/python/Makefile.in
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/bindings/python/Makefile.in libparagui1.0-1.0.4/bindings/python/Makefile.in
 --- libparagui1.0-1.0.4.orig/bindings/python/Makefile.in	2003-07-07 11:06:19.000000000 +0200
-+++ libparagui1.0-1.0.4/bindings/python/Makefile.in	2006-06-15 22:26:28.000000000 +0200
++++ libparagui1.0-1.0.4/bindings/python/Makefile.in	2007-12-21 23:59:15.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -1862,10 +10696,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,155 +149,274 @@
+@@ -110,155 +149,277 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -1940,12 +10775,6 @@
 +	$(IMAGE_LIBS) \
 +	$(LIBSTDCPP) \
 +	-lparagui -L$(top_srcdir)/src
-+
-+INCLUDES = \
-+	$(SDL_CFLAGS) \
-+	-I$(top_srcdir)/include \
-+	-I$(PYTHON_INCLUDE_DIR) \
-+	-I../../include
  
 -LINK = $(COMPILE) -shared 	-L at prefix@/lib 	-lexpat 	-lz 	$(SDL_LIBS) 	$(IMAGE_LIBS) 	$(LIBSTDCPP) 	-lparagui -L$(top_srcdir)/src
 -
@@ -1954,7 +10783,12 @@
 -
 -
 -OBJECTS =  	paraguic_wrap.o
--
++INCLUDES = \
++	$(SDL_CFLAGS) \
++	-I$(top_srcdir)/include \
++	-I$(PYTHON_INCLUDE_DIR) \
++	-I../../include
+ 
 +OBJECTS = \
 +	paraguic_wrap.o
  
@@ -1964,33 +10798,24 @@
 +	paragui.py \
 +	paragui.pyc \
 +	paragui.pyo
-+
-+EXTRA_DIST = \
-+	swigcommon.h \
-+	python.h
  
 -parapython_DATA =  	paraguicmodule.so 	paragui.py 	paragui.pyc 	paragui.pyo
-+all: all-am
- 
 -
+-
 -EXTRA_DIST =  	swigcommon.h 	python.h
 -
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 -CONFIG_HEADER = ../../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
 -DATA =  $(parapython_DATA)
--
++EXTRA_DIST = \
++	swigcommon.h \
++	python.h
+ 
 -DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = gtar
--GZIP_ENV = --best
--all: all-redirect
- .SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps bindings/python/Makefile
++all: all-am
+ 
++.SUFFIXES:
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -2000,9 +10825,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  bindings/python/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  bindings/python/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  bindings/python/Makefile
++	  $(AUTOMAKE) --gnu  bindings/python/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -2012,10 +10837,17 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-TAR = gtar
+-GZIP_ENV = --best
+-all: all-redirect
+-.SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps bindings/python/Makefile
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -2158,6 +10990,8 @@
 +clean-am: clean-generic clean-libtool mostlyclean-am
  
 -mostlyclean: mostlyclean-am
++distclean: distclean-am
++	-rm -f Makefile
 +distclean-am: clean-am distclean-generic distclean-libtool
  
 -clean-am:  clean-generic mostlyclean-am
@@ -2191,8 +11025,6 @@
  maintainer-clean: maintainer-clean-am
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
  
 -.PHONY: uninstall-parapythonDATA install-parapythonDATA tags distdir \
 -info-am info dvi-am dvi check check-am installcheck-am installcheck \
@@ -2200,6 +11032,8 @@
 -install uninstall-am uninstall all-redirect all-am all installdirs \
 -mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-am
++
 +mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 +
 +pdf: pdf-am
@@ -2225,7 +11059,13 @@
  
  
  paraguicmodule.so: $(OBJECTS)
-@@ -284,7 +442,6 @@
+@@ -278,13 +439,10 @@
+ paraguic_wrap.o: paraguic_wrap.cpp
+ 	$(COMPILE) $(INCLUDES) -c $<
+ 
+-distclean: clean
+-
+ clean:
  	rm -f *.so *.c *.o *~ *. *.cpp *.py?
  
  .PHONY: clean
@@ -2233,10 +11073,21 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/bindings/ruby/Makefile.in
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/bindings/ruby/Makefile.am libparagui1.0-1.0.4/bindings/ruby/Makefile.am
+--- libparagui1.0-1.0.4.orig/bindings/ruby/Makefile.am	2003-01-03 11:16:45.000000000 +0100
++++ libparagui1.0-1.0.4/bindings/ruby/Makefile.am	2007-12-21 23:59:07.000000000 +0100
+@@ -30,8 +30,6 @@
+ paraguic_wrap.o: paraguic_wrap.cpp
+ 	$(COMPILE) $(INCLUDES) -c $<
+ 
+-distclean: clean
+-
+ clean:
+ 	rm -f *.so *.c *.o *~ *. *.cpp
+ 
+diff -Nurd libparagui1.0-1.0.4.orig/bindings/ruby/Makefile.in libparagui1.0-1.0.4/bindings/ruby/Makefile.in
 --- libparagui1.0-1.0.4.orig/bindings/ruby/Makefile.in	2003-07-07 11:06:20.000000000 +0200
-+++ libparagui1.0-1.0.4/bindings/ruby/Makefile.in	2006-06-15 22:26:29.000000000 +0200
++++ libparagui1.0-1.0.4/bindings/ruby/Makefile.in	2007-12-21 23:59:15.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -2409,10 +11260,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,157 +149,275 @@
+@@ -110,157 +149,278 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -2485,12 +11337,6 @@
 +	-L at prefix@/lib \
 +	-L$(top_srcdir)/src \
 +	$(PARAGUI_LIBS)
-+
-+INCLUDES = \
-+	$(SDL_CFLAGS) \
-+	-I$(top_srcdir)/include \
-+	-I$(RUBY_INCLUDE_DIR) \
-+	-I../../include
  
 -LINK = $(COMPILE) -shared 	-L at prefix@/lib 	-L$(top_srcdir)/src 	$(PARAGUI_LIBS)
 -
@@ -2499,7 +11345,12 @@
 -
 -
 -OBJECTS =  	paraguic_wrap.o
--
++INCLUDES = \
++	$(SDL_CFLAGS) \
++	-I$(top_srcdir)/include \
++	-I$(RUBY_INCLUDE_DIR) \
++	-I../../include
+ 
 +OBJECTS = \
 +	paraguic_wrap.o
  
@@ -2530,15 +11381,7 @@
 -DIST_COMMON =  Makefile.am Makefile.in TODO
 +all: all-am
  
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = gtar
--GZIP_ENV = --best
--all: all-redirect
- .SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps bindings/ruby/Makefile
++.SUFFIXES:
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -2548,9 +11391,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  bindings/ruby/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  bindings/ruby/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  bindings/ruby/Makefile
++	  $(AUTOMAKE) --gnu  bindings/ruby/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -2560,10 +11403,17 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-TAR = gtar
+-GZIP_ENV = --best
+-all: all-redirect
+-.SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps bindings/ruby/Makefile
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -2706,6 +11556,8 @@
 +clean-am: clean-generic clean-libtool mostlyclean-am
  
 -mostlyclean: mostlyclean-am
++distclean: distclean-am
++	-rm -f Makefile
 +distclean-am: clean-am distclean-generic distclean-libtool
  
 -clean-am:  clean-generic mostlyclean-am
@@ -2739,8 +11591,6 @@
  maintainer-clean: maintainer-clean-am
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
  
 -.PHONY: uninstall-pararubyDATA install-pararubyDATA tags distdir info-am \
 -info dvi-am dvi check check-am installcheck-am installcheck \
@@ -2748,6 +11598,8 @@
 -install uninstall-am uninstall all-redirect all-am all installdirs \
 -mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-am
++
 +mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 +
 +pdf: pdf-am
@@ -2773,7 +11625,13 @@
  
  
  paragui.so: $(OBJECTS)
-@@ -278,7 +435,6 @@
+@@ -272,13 +432,10 @@
+ paraguic_wrap.o: paraguic_wrap.cpp
+ 	$(COMPILE) $(INCLUDES) -c $<
+ 
+-distclean: clean
+-
+ clean:
  	rm -f *.so *.c *.o *~ *. *.cpp
  
  .PHONY: clean
@@ -2781,17 +11639,16 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/configure
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/configure libparagui1.0-1.0.4/configure
 --- libparagui1.0-1.0.4.orig/configure	2003-06-27 10:34:29.000000000 +0200
-+++ libparagui1.0-1.0.4/configure	2006-06-15 22:26:24.000000000 +0200
-@@ -1,36 +1,539 @@
++++ libparagui1.0-1.0.4/configure	2007-12-21 23:58:30.000000000 +0100
+@@ -1,37 +1,555 @@
  #! /bin/sh
 -
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated automatically using autoconf version 2.13 
 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-+# Generated by GNU Autoconf 2.59e.
++# Generated by GNU Autoconf 2.61.
  #
 +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -2800,8 +11657,21 @@
 +## --------------------- ##
 +## M4sh Initialization.  ##
 +## --------------------- ##
-+
-+# Be Bourne compatible
+ 
+-# Defaults:
+-ac_help=
+-ac_default_prefix=/usr/local
+-# Any additions from configure.in:
+-ac_help="$ac_help
+-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
+-ac_help="$ac_help
+-  --enable-static[=PKGS]  build static libraries [default=yes]"
+-ac_help="$ac_help
+-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
+-ac_help="$ac_help
+-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +  emulate sh
 +  NULLCMD=:
@@ -2810,10 +11680,22 @@
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
 +else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
+ 
+-# Find the correct PATH separator.  Usually this is `:', but
+-# DJGPP uses `;' like DOS.
+-if test "X${PATH_SEPARATOR+set}" != Xset; then
+-  UNAME=${UNAME-`uname 2>/dev/null`}
+-  case X$UNAME in
+-    *-DOS) lt_cv_sys_path_separator=';' ;;
+-    *)     lt_cv_sys_path_separator=':' ;;
+-  esac
+-  PATH_SEPARATOR=$lt_cv_sys_path_separator
+ fi
+ 
+ 
 +
 +
 +# PATH needs CR
@@ -2836,29 +11718,7 @@
 +  fi
 +  rm -f conf$$.sh
 +fi
- 
--# Defaults:
--ac_help=
--ac_default_prefix=/usr/local
--# Any additions from configure.in:
--ac_help="$ac_help
--  --enable-shared[=PKGS]  build shared libraries [default=yes]"
--ac_help="$ac_help
--  --enable-static[=PKGS]  build static libraries [default=yes]"
--ac_help="$ac_help
--  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
--ac_help="$ac_help
--  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
--
--# Find the correct PATH separator.  Usually this is `:', but
--# DJGPP uses `;' like DOS.
--if test "X${PATH_SEPARATOR+set}" != Xset; then
--  UNAME=${UNAME-`uname 2>/dev/null`}
--  case X$UNAME in
--    *-DOS) lt_cv_sys_path_separator=';' ;;
--    *)     lt_cv_sys_path_separator=':' ;;
--  esac
--  PATH_SEPARATOR=$lt_cv_sys_path_separator
++
 +# Support unset when possible.
 +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
 +  as_unset=unset
@@ -3028,7 +11888,7 @@
 +else
 +  as_candidate_shells=
 +    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
++for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
@@ -3043,10 +11903,9 @@
 +
 +
 +      for as_shell in $as_candidate_shells $SHELL; do
-+	 # Try only shells which exist, to save several forks.
-+	 if test -f "$as_shell" &&
++	 # Try only shells that exist, to save several forks.
++	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
 +		{ ("$as_shell") 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +  emulate sh
 +  NULLCMD=:
@@ -3055,18 +11914,19 @@
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
 +else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
 +fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
 +
++
 +:
 +_ASEOF
 +}; then
 +  CONFIG_SHELL=$as_shell
 +	       as_have_required=yes
 +	       if { "$as_shell" 2> /dev/null <<\_ASEOF
-+# Be Bourne compatible
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +  emulate sh
 +  NULLCMD=:
@@ -3075,11 +11935,13 @@
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
 +else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
++
 +fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
 +
++
 +:
 +(as_func_return () {
 +  (exit $1)
@@ -3204,8 +12066,8 @@
 +else
 +  exitcode=1
 +  echo as_func_ret_success failed.
- fi
- 
++fi
++
 +if as_func_ret_failure; then
 +  exitcode=1
 +  echo as_func_ret_failure succeeded.
@@ -3325,19 +12187,28 @@
 +  as_mkdir_p=false
 +fi
 +
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
-+#! /bin/sh
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
 +else
-+  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
++  else
++    as_ls_L_option=
++  fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
 +fi
-+rm -f conf$$.file
++as_executable_p=$as_test_x
 +
 +# Sed expression to map a string onto a valid CPP name.
 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -3347,10 +12218,11 @@
 +
 +
 +
- 
++
  # Check that we are running under the correct shell.
  SHELL=${CONFIG_SHELL-/bin/sh}
-@@ -49,7 +552,7 @@
+ 
+@@ -49,7 +567,7 @@
  elif test "X$1" = X--fallback-echo; then
    # Avoid inline document here, it may be left over
    :
@@ -3359,7 +12231,7 @@
    # Yippee, $echo works!
    :
  else
-@@ -61,22 +564,22 @@
+@@ -61,22 +579,22 @@
    # used as fallback echo
    shift
    cat <<EOF
@@ -3386,7 +12258,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -95,8 +598,9 @@
+@@ -95,8 +613,9 @@
    #
    # So, first we look for a working echo in the user's PATH.
  
@@ -3397,7 +12269,7 @@
      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-@@ -105,7 +609,7 @@
+@@ -105,7 +624,7 @@
        break
      fi
    done
@@ -3406,7 +12278,7 @@
  
    if test "X$echo" = Xecho; then
      # We didn't find a better echo, so look for alternatives.
-@@ -178,60 +682,253 @@
+@@ -178,60 +697,255 @@
  fi
  
  
@@ -3491,36 +12363,36 @@
 +# Factoring default headers for most tests.
 +ac_includes_default="\
 +#include <stdio.h>
-+#if HAVE_SYS_TYPES_H
++#ifdef HAVE_SYS_TYPES_H
 +# include <sys/types.h>
 +#endif
-+#if HAVE_SYS_STAT_H
++#ifdef HAVE_SYS_STAT_H
 +# include <sys/stat.h>
 +#endif
-+#if STDC_HEADERS
++#ifdef STDC_HEADERS
 +# include <stdlib.h>
 +# include <stddef.h>
 +#else
-+# if HAVE_STDLIB_H
++# ifdef HAVE_STDLIB_H
 +#  include <stdlib.h>
 +# endif
 +#endif
-+#if HAVE_STRING_H
-+# if !STDC_HEADERS && HAVE_MEMORY_H
++#ifdef HAVE_STRING_H
++# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
 +#  include <memory.h>
 +# endif
 +# include <string.h>
 +#endif
-+#if HAVE_STRINGS_H
++#ifdef HAVE_STRINGS_H
 +# include <strings.h>
 +#endif
-+#if HAVE_INTTYPES_H
++#ifdef HAVE_INTTYPES_H
 +# include <inttypes.h>
 +#endif
-+#if HAVE_STDINT_H
++#ifdef HAVE_STDINT_H
 +# include <stdint.h>
 +#endif
-+#if HAVE_UNISTD_H
++#ifdef HAVE_UNISTD_H
 +# include <unistd.h>
 +#endif"
 +
@@ -3624,6 +12496,7 @@
 +CCDEPMODE
 +am__fastdepCC_TRUE
 +am__fastdepCC_FALSE
++SED
 +GREP
 +EGREP
 +LN_S
@@ -3683,6 +12556,7 @@
 +CC
 +CFLAGS
 +LDFLAGS
++LIBS
 +CPPFLAGS
 +CPP
 +CXX
@@ -3708,7 +12582,7 @@
  no_recursion=
  prefix=NONE
  program_prefix=NONE
-@@ -240,94 +937,117 @@
+@@ -240,94 +954,117 @@
  silent=
  site=
  srcdir=
@@ -3831,10 +12705,10 @@
 -    fi
 -    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
 -    eval "enable_${ac_feature}=no" ;;
-+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
 +   { (exit 1); exit 1; }; }
-+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
 +    eval enable_$ac_feature=no ;;
 +
 +  -docdir | --docdir | --docdi | --doc | --do)
@@ -3860,15 +12734,15 @@
 -      *) ac_optarg=yes ;;
 -    esac
 -    eval "enable_${ac_feature}='$ac_optarg'" ;;
-+    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
 +   { (exit 1); exit 1; }; }
-+    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
++    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
 +    eval enable_$ac_feature=\$ac_optarg ;;
  
    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-@@ -336,116 +1056,77 @@
+@@ -336,116 +1073,77 @@
    -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
    | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
    | --exec=* | --exe=* | --ex=*)
@@ -4014,7 +12888,7 @@
      no_create=yes ;;
  
    -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-@@ -459,26 +1140,26 @@
+@@ -459,26 +1157,26 @@
    -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
    | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
    | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
@@ -4045,7 +12919,7 @@
  
    -program-transform-name | --program-transform-name \
    | --program-transform-nam | --program-transform-na \
-@@ -495,7 +1176,17 @@
+@@ -495,7 +1193,17 @@
    | --program-transfo=* | --program-transf=* \
    | --program-trans=* | --program-tran=* \
    | --progr-tra=* | --program-tr=* | --program-t=*)
@@ -4064,7 +12938,7 @@
  
    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
    | -silent | --silent | --silen | --sile | --sil)
-@@ -505,7 +1196,7 @@
+@@ -505,7 +1213,7 @@
      ac_prev=sbindir ;;
    -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
    | --sbi=* | --sb=*)
@@ -4073,7 +12947,7 @@
  
    -sharedstatedir | --sharedstatedir | --sharedstatedi \
    | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-@@ -516,58 +1207,53 @@
+@@ -516,58 +1224,53 @@
    | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
    | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
    | --sha=* | --sh=*)
@@ -4123,15 +12997,16 @@
 -    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
 -      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
 -    fi
-+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+      { echo "$as_me: error: invalid package name: $ac_package" >&2
-+   { (exit 1); exit 1; }; }
-     ac_package=`echo $ac_package| sed 's/-/_/g'`
+-    ac_package=`echo $ac_package| sed 's/-/_/g'`
 -    case "$ac_option" in
 -      *=*) ;;
 -      *) ac_optarg=yes ;;
 -    esac
 -    eval "with_${ac_package}='$ac_optarg'" ;;
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
++      { echo "$as_me: error: invalid package name: $ac_package" >&2
++   { (exit 1); exit 1; }; }
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
 +    eval with_$ac_package=\$ac_optarg ;;
  
    -without-* | --without-*)
@@ -4143,15 +13018,15 @@
 -    fi
 -    ac_package=`echo $ac_package| sed 's/-/_/g'`
 -    eval "with_${ac_package}=no" ;;
-+    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
++    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
 +      { echo "$as_me: error: invalid package name: $ac_package" >&2
 +   { (exit 1); exit 1; }; }
-+    ac_package=`echo $ac_package | sed 's/-/_/g'`
++    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
 +    eval with_$ac_package=no ;;
  
    --x)
      # Obsolete; use --with-x.
-@@ -578,157 +1264,688 @@
+@@ -578,157 +1281,689 @@
      ac_prev=x_includes ;;
    -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
    | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
@@ -4291,10 +13166,6 @@
 -rm -rf conftest* confdefs.h
 -# AIX cpp loses on an empty file, so make sure it contains at least a newline.
 -echo > confdefs.h
--
--# A filename unique to this package, relative to the directory that
--# configure is in, which we can look for to find out if srcdir is correct.
--ac_unique_file=README
 +ac_pwd=`pwd` && test -n "$ac_pwd" &&
 +ac_ls_di=`ls -di .` &&
 +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
@@ -4303,8 +13174,11 @@
 +test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
 +  { echo "$as_me: error: pwd does not report name of working directory" >&2
 +   { (exit 1); exit 1; }; }
-+
  
+-# A filename unique to this package, relative to the directory that
+-# configure is in, which we can look for to find out if srcdir is correct.
+-ac_unique_file=README
+ 
  # Find the source files, if location was not specified.
  if test -z "$srcdir"; then
    ac_srcdir_defaulted=yes
@@ -4350,27 +13224,12 @@
 -  else
 -    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
 -  fi
--fi
--srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
--
--# Prefer explicitly selected file to automatically selected ones.
--if test -z "$CONFIG_SITE"; then
--  if test "x$prefix" != xNONE; then
--    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
--  else
--    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
--  fi
--fi
--for ac_site_file in $CONFIG_SITE; do
--  if test -r "$ac_site_file"; then
--    echo "loading site script $ac_site_file"
--    . "$ac_site_file"
--  fi
 +if test ! -r "$srcdir/$ac_unique_file"; then
 +  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
 +  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
 +   { (exit 1); exit 1; }; }
-+fi
+ fi
+-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
 +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
 +ac_abs_confdir=`(
 +	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
@@ -4391,15 +13250,8 @@
 +  eval ac_env_${ac_var}_value=\$${ac_var}
 +  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
 +  eval ac_cv_env_${ac_var}_value=\$${ac_var}
- done
- 
--if test -r "$cache_file"; then
--  echo "loading cache $cache_file"
--  . $cache_file
--else
--  echo "creating cache $cache_file"
--  > $cache_file
--fi
++done
++
 +#
 +# Report the --help message.
 +#
@@ -4408,23 +13260,7 @@
 +  # This message is too long to be a string in the A/UX 3.1 sh.
 +  cat <<_ACEOF
 +\`configure' configures this package to adapt to many kinds of systems.
- 
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--ac_exeext=
--ac_objext=o
--if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
--  # Stardent Vistra SVR4 grep lacks -e, says ghazi at caip.rutgers.edu.
--  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
--    ac_n= ac_c='
--' ac_t='	'
--  else
--    ac_n=-n ac_c= ac_t=
++
 +Usage: $0 [OPTION]... [VAR=VALUE]...
 +
 +To assign environment variables (e.g., CC, CFLAGS...), specify them as
@@ -4542,6 +13378,7 @@
 +  CFLAGS      C compiler flags
 +  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
 +              nonstandard directory <lib dir>
++  LIBS        libraries to pass to the linker, e.g. -l<library>
 +  CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
 +              you have headers in a nonstandard directory <include dir>
 +  CPP         C preprocessor
@@ -4615,7 +13452,7 @@
 +if $ac_init_version; then
 +  cat <<\_ACEOF
 +configure
-+generated by GNU Autoconf 2.59e
++generated by GNU Autoconf 2.61
 +
 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -4629,7 +13466,7 @@
 +running configure, to aid debugging if configure makes a mistake.
 +
 +It was created by $as_me, which was
-+generated by GNU Autoconf 2.59e.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
 +
 +  $ $0 $@
 +
@@ -4679,8 +13516,8 @@
 +## ----------- ##
 +
 +_ACEOF
+ 
 +
-+
 +# Keep a trace of the command line.
 +# Strip out --no-create and --no-recursion so they do not pile up.
 +# Strip out --silent because we don't want to record it for future runs.
@@ -4864,7 +13701,13 @@
 +
 +
 +# Let the site file select an alternate cache file if it wants to.
-+# Prefer explicitly selected file to automatically selected ones.
+ # Prefer explicitly selected file to automatically selected ones.
+-if test -z "$CONFIG_SITE"; then
+-  if test "x$prefix" != xNONE; then
+-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
+-  else
+-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
+-  fi
 +if test -n "$CONFIG_SITE"; then
 +  set x "$CONFIG_SITE"
 +elif test "x$prefix" != xNONE; then
@@ -4872,19 +13715,23 @@
 +else
 +  set x "$ac_default_prefix/share/config.site" \
 +	"$ac_default_prefix/etc/config.site"
-+fi
+ fi
+-for ac_site_file in $CONFIG_SITE; do
 +shift
 +for ac_site_file
 +do
-+  if test -r "$ac_site_file"; then
+   if test -r "$ac_site_file"; then
+-    echo "loading site script $ac_site_file"
 +    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
 +echo "$as_me: loading site script $ac_site_file" >&6;}
 +    sed 's/^/| /' "$ac_site_file" >&5
-+    . "$ac_site_file"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
+     . "$ac_site_file"
+   fi
+ done
+ 
+ if test -r "$cache_file"; then
+-  echo "loading cache $cache_file"
+-  . $cache_file
 +  # Some versions of bash will fail to source /dev/null (special
 +  # files actually), so we avoid doing that.
 +  if test -f "$cache_file"; then
@@ -4894,14 +13741,31 @@
 +      [\\/]* | ?:[\\/]* ) . "$cache_file";;
 +      *)                      . "./$cache_file";;
 +    esac
-   fi
++  fi
  else
--  ac_n= ac_c='\c' ac_t=
+-  echo "creating cache $cache_file"
+-  > $cache_file
 +  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
 +echo "$as_me: creating cache $cache_file" >&6;}
 +  >$cache_file
-+fi
-+
+ fi
+ 
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-ac_exeext=
+-ac_objext=o
+-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
+-  # Stardent Vistra SVR4 grep lacks -e, says ghazi at caip.rutgers.edu.
+-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
+-    ac_n= ac_c='
+-' ac_t='	'
+-  else
+-    ac_n=-n ac_c= ac_t=
 +# Check that the precious variables saved in the cache have kept the same
 +# value.
 +ac_cache_corrupted=false
@@ -4941,7 +13805,9 @@
 +      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
 +      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
 +    esac
-+  fi
+   fi
+-else
+-  ac_n= ac_c='\c' ac_t=
 +done
 +if $ac_cache_corrupted; then
 +  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
@@ -4952,7 +13818,7 @@
  fi
  
  
-@@ -736,6 +1953,27 @@
+@@ -736,6 +1971,27 @@
  
  
  
@@ -4980,7 +13846,7 @@
  TOP_BUILDDIR=`pwd`
  
  
-@@ -776,71 +2014,164 @@
+@@ -776,71 +2032,164 @@
  
  
  ac_aux_dir=
@@ -5046,7 +13912,7 @@
 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
 +   { (exit 1); exit 1; }; }
 +
-+fi
+ fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
 +echo "${ECHO_T}$ac_cv_build" >&6; }
 +case $ac_cv_build in
@@ -5067,25 +13933,10 @@
 +build_os=$*
 +IFS=$ac_save_IFS
 +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-+
-+
-+{ echo "$as_me:$LINENO: checking host system type" >&5
-+echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
-+if test "${ac_cv_host+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "x$host_alias" = x; then
-+  ac_cv_host=$ac_cv_build
-+else
-+  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
-+    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
-+   { (exit 1); exit 1; }; }
- fi
  
 -echo $ac_n "checking host system type""... $ac_c" 1>&6
 -echo "configure:805: checking host system type" >&5
--
+ 
 -host_alias=$host
 -case "$host_alias" in
 -NONE)
@@ -5096,7 +13947,21 @@
 -    fi ;;
 -  *) host_alias=$nonopt ;;
 -  esac ;;
++{ echo "$as_me:$LINENO: checking host system type" >&5
++echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
++if test "${ac_cv_host+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++  if test "x$host_alias" = x; then
++  ac_cv_host=$ac_cv_build
++else
++  ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
++    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
++echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
++   { (exit 1); exit 1; }; }
 +fi
++
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
 +echo "${ECHO_T}$ac_cv_host" >&6; }
 +case $ac_cv_host in
@@ -5117,8 +13982,15 @@
 +host_os=$*
 +IFS=$ac_save_IFS
 +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
-+
+ 
+-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-echo "$ac_t""$host" 1>&6
+ 
+-echo $ac_n "checking target system type""... $ac_c" 1>&6
+-echo "configure:826: checking target system type" >&5
 +{ echo "$as_me:$LINENO: checking target system type" >&5
 +echo $ECHO_N "checking target system type... $ECHO_C" >&6; }
 +if test "${ac_cv_target+set}" = set; then
@@ -5133,15 +14005,6 @@
 +   { (exit 1); exit 1; }; }
 +fi
  
--host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
--host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
--echo "$ac_t""$host" 1>&6
--
--echo $ac_n "checking target system type""... $ac_c" 1>&6
--echo "configure:826: checking target system type" >&5
--
 -target_alias=$target
 -case "$target_alias" in
 -NONE)
@@ -5170,8 +14033,13 @@
 +target_os=$*
 +IFS=$ac_save_IFS
 +case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac
-+
-+
+ 
+-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
+-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-echo "$ac_t""$target" 1>&6
+ 
 +# The aliases save the names the user supplied, while $host etc.
 +# will get canonicalized.
 +test -n "$target_alias" &&
@@ -5179,19 +14047,12 @@
 +    NONENONEs,x,x, &&
 +  program_prefix=${target_alias}-
  
--target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
--target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
--echo "$ac_t""$target" 1>&6
--
--
 -am__api_version="1.4"
 +am__api_version="1.9"
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
  # incompatible versions:
-@@ -848,966 +2179,2132 @@
+@@ -848,683 +2197,1380 @@
  # SunOS /usr/etc/install
  # IRIX /sbin/install
  # AIX /bin/install
@@ -5239,7 +14100,7 @@
 +    # by default.
 +    for ac_prog in ginstall scoinst install; do
 +      for ac_exec_ext in '' $ac_executable_extensions; do
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
  	  if test $ac_prog = install &&
 -            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 +	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
@@ -5380,15 +14241,30 @@
 +_ACEOF
 +program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 +rm -f conftest.sed
-+
+ 
+-# sed with no file args requires a program.
+-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 +# expand $ac_aux_dir to an absolute path
 +am_aux_dir=`cd $ac_aux_dir && pwd`
-+
+ 
+-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
+-echo "configure:967: checking whether ${MAKE-make} sets \${MAKE}" >&5
+-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 +# Use eval to expand $SHELL
 +if eval "$MISSING --run true"; then
 +  am_missing_run="$MISSING --run "
-+else
+ else
+-  cat > conftestmake <<\EOF
+-all:
+-	@echo 'ac_maketemp="${MAKE}"'
+-EOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
+-if test -n "$ac_maketemp"; then
+-  eval ac_cv_prog_make_${ac_make}_set=yes
 +  am_missing_run=
 +  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
@@ -5410,7 +14286,8 @@
 +  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
 +  #  so the `.' trick is pointless.
 +  mkdir_p='mkdir -p --'
-+else
+ else
+-  eval ac_cv_prog_make_${ac_make}_set=no
 +  # On NextStep and OpenStep, the `mkdir' command does not
 +  # recognize any option.  It will interpret all options as
 +  # directories to create, and then abort because `.' already
@@ -5425,7 +14302,8 @@
 +  else
 +    mkdir_p='$(install_sh) -d'
 +  fi
-+fi
+ fi
+-rm -f conftestmake
 +
 +for ac_prog in gawk mawk nawk awk
 +do
@@ -5445,7 +14323,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_AWK="$ac_prog"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -5454,8 +14332,10 @@
 +done
 +IFS=$as_save_IFS
 +
+ fi
+-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
 +fi
-+fi
 +AWK=$ac_cv_prog_AWK
 +if test -n "$AWK"; then
 +  { echo "$as_me:$LINENO: result: $AWK" >&5
@@ -5464,40 +14344,23 @@
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +fi
- 
--# sed with no file args requires a program.
--test "$program_transform_name" = "" && program_transform_name="s,x,x,"
- 
--echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
--echo "configure:967: checking whether ${MAKE-make} sets \${MAKE}" >&5
--set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
++
++
 +  test -n "$AWK" && break
 +done
 +
 +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftestmake <<\EOF
++else
 +  cat >conftest.make <<\_ACEOF
 +SHELL = /bin/sh
- all:
--	@echo 'ac_maketemp="${MAKE}"'
--EOF
++all:
 +	@echo '@@@%%%=$(MAKE)=@@@%%%'
 +_ACEOF
- # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
--if test -n "$ac_maketemp"; then
--  eval ac_cv_prog_make_${ac_make}_set=yes
--else
--  eval ac_cv_prog_make_${ac_make}_set=no
--fi
--rm -f conftestmake
++# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
 +case `${MAKE-make} -f conftest.make 2>/dev/null` in
 +  *@@@%%%=?*=@@@%%%*)
 +    eval ac_cv_prog_make_${ac_make}_set=yes;;
@@ -5505,9 +14368,7 @@
 +    eval ac_cv_prog_make_${ac_make}_set=no;;
 +esac
 +rm -f conftest.make
- fi
--if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
++fi
 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
@@ -5527,7 +14388,10 @@
 +  am__leading_dot=_
 +fi
 +rmdir .tst 2>/dev/null
-+
+ 
+-PACKAGE=paragui
+-
+-VERSION=$PARAGUI_VERSION
 +# test to see if srcdir already configured
 +if test "`cd $srcdir && pwd`" != "`pwd`" &&
 +   test -f $srcdir/config.status; then
@@ -5535,7 +14399,9 @@
 +echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
-+
+ 
+-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
 +# test whether we have cygpath
 +if test -z "$CYGPATH_W"; then
 +  if (cygpath --version) >/dev/null 2>/dev/null; then
@@ -5543,40 +14409,31 @@
 +  else
 +    CYGPATH_W=echo
 +  fi
-+fi
+ fi
+-cat >> confdefs.h <<EOF
 +
- 
--PACKAGE=paragui
++
 +# Define the identity of the package.
 + PACKAGE=paragui
 + VERSION=$PARAGUI_VERSION
- 
--VERSION=$PARAGUI_VERSION
- 
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
--fi
--cat >> confdefs.h <<EOF
++
++
 +cat >>confdefs.h <<_ACEOF
  #define PACKAGE "$PACKAGE"
 -EOF
 +_ACEOF
-+
  
 -cat >> confdefs.h <<EOF
++
 +cat >>confdefs.h <<_ACEOF
  #define VERSION "$VERSION"
 -EOF
 +_ACEOF
-+
+ 
 +# Some tools Automake needs.
-+
+ 
 +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-+
  
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
- 
- 
 -missing_dir=`cd $ac_aux_dir && pwd`
 -echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6
 -echo "configure:1013: checking for working aclocal-${am__api_version}" >&5
@@ -5586,6 +14443,10 @@
 -if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then
 -   ACLOCAL=aclocal-${am__api_version}
 -   echo "$ac_t""found" 1>&6
++
++AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
++
++
 +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
 +
 +
@@ -5621,7 +14482,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -5682,7 +14543,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_STRIP="strip"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -5767,12 +14628,24 @@
 -echo "configure:1093: checking for Cygwin environment" >&5
 -if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
++
++
++
++{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
++echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
++    # Check whether --enable-maintainer-mode was given.
++if test "${enable_maintainer_mode+set}" = set; then
++  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
+ else
 -  cat > conftest.$ac_ext <<EOF
 -#line 1098 "configure"
 -#include "confdefs.h"
++  USE_MAINTAINER_MODE=no
++fi
  
 -int main() {
++  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
++echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
  
 -#ifndef __CYGWIN__
 -#define __CYGWIN__ __CYGWIN32__
@@ -5784,44 +14657,6 @@
 -  rm -rf conftest*
 -  ac_cv_cygwin=yes
 +
-+{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-+echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
-+    # Check whether --enable-maintainer-mode was given.
-+if test "${enable_maintainer_mode+set}" = set; then
-+  enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  ac_cv_cygwin=no
--fi
--rm -f conftest*
--rm -f conftest*
-+  USE_MAINTAINER_MODE=no
- fi
- 
--echo "$ac_t""$ac_cv_cygwin" 1>&6
--CYGWIN=
--test "$ac_cv_cygwin" = yes && CYGWIN=yes
--echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
--echo "configure:1126: checking for mingw32 environment" >&5
--if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 1131 "configure"
--#include "confdefs.h"
-+  { echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-+echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
- 
--int main() {
--return __MINGW32__;
--; return 0; }
--EOF
--if { (eval echo configure:1138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
--  ac_cv_mingw32=yes
-+
 +if test $USE_MAINTAINER_MODE = yes; then
 +  MAINTAINER_MODE_TRUE=
 +  MAINTAINER_MODE_FALSE='#'
@@ -5829,123 +14664,22 @@
 -  echo "configure: failed program was:" >&5
 -  cat conftest.$ac_ext >&5
 -  rm -rf conftest*
--  ac_cv_mingw32=no
--fi
--rm -f conftest*
--rm -f conftest*
+-  ac_cv_cygwin=no
 +  MAINTAINER_MODE_TRUE='#'
 +  MAINTAINER_MODE_FALSE=
  fi
- 
--echo "$ac_t""$ac_cv_mingw32" 1>&6
--MINGW32=
--test "$ac_cv_mingw32" = yes && MINGW32=yes
--echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:1155: checking how to run the C preprocessor" >&5
--# On Suns, sometimes $CPP names a directory.
--if test -n "$CPP" && test -d "$CPP"; then
--  CPP=
--fi
--if test -z "$CPP"; then
--if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--    # This must be in double quotes, not single quotes, because CPP may get
--  # substituted into the Makefile and "${CC-cc}" will confuse make.
--  CPP="${CC-cc} -E"
--  # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp.
--  cat > conftest.$ac_ext <<EOF
--#line 1170 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  :
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP="${CC-cc} -E -traditional-cpp"
--  cat > conftest.$ac_ext <<EOF
--#line 1187 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  :
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP="${CC-cc} -nologo -E"
--  cat > conftest.$ac_ext <<EOF
--#line 1204 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:1210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  :
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP=/lib/cpp
--fi
 -rm -f conftest*
--fi
 -rm -f conftest*
--fi
--rm -f conftest*
--  ac_cv_prog_CPP="$CPP"
--fi
--  CPP="$ac_cv_prog_CPP"
--else
--  ac_cv_prog_CPP="$CPP"
--fi
--echo "$ac_t""$CPP" 1>&6
++
 +  MAINT=$MAINTAINER_MODE_TRUE
 +
 +
 +
- 
--# Check whether --enable-shared or --disable-shared was given.
 +
 +
++
 +# Check whether --enable-shared was given.
- if test "${enable_shared+set}" = set; then
--  enableval="$enable_shared"
--  p=${PACKAGE-default}
--case $enableval in
--yes) enable_shared=yes ;;
--no) enable_shared=no ;;
--*)
--  enable_shared=no
--  # Look at the argument we got.  We use all the common list separators.
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
--  for pkg in $enableval; do
--    if test "X$pkg" = "X$p"; then
--      enable_shared=yes
--    fi
--  done
--  IFS="$ac_save_ifs"
--  ;;
--esac
++if test "${enable_shared+set}" = set; then
 +  enableval=$enable_shared; p=${PACKAGE-default}
 +    case $enableval in
 +    yes) enable_shared=yes ;;
@@ -5963,31 +14697,20 @@
 +      IFS="$lt_save_ifs"
 +      ;;
 +    esac
- else
-   enable_shared=yes
++else
++  enable_shared=yes
  fi
  
--# Check whether --enable-static or --disable-static was given.
+-echo "$ac_t""$ac_cv_cygwin" 1>&6
+-CYGWIN=
+-test "$ac_cv_cygwin" = yes && CYGWIN=yes
+-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
+-echo "configure:1126: checking for mingw32 environment" >&5
+-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +
 +# Check whether --enable-static was given.
- if test "${enable_static+set}" = set; then
--  enableval="$enable_static"
--  p=${PACKAGE-default}
--case $enableval in
--yes) enable_static=yes ;;
--no) enable_static=no ;;
--*)
--  enable_static=no
--  # Look at the argument we got.  We use all the common list separators.
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
--  for pkg in $enableval; do
--    if test "X$pkg" = "X$p"; then
--      enable_static=yes
--    fi
--  done
--  IFS="$ac_save_ifs"
--  ;;
--esac
++if test "${enable_static+set}" = set; then
 +  enableval=$enable_static; p=${PACKAGE-default}
 +    case $enableval in
 +    yes) enable_static=yes ;;
@@ -6006,30 +14729,22 @@
 +      ;;
 +    esac
  else
-   enable_static=yes
- fi
+-  cat > conftest.$ac_ext <<EOF
+-#line 1131 "configure"
+-#include "confdefs.h"
++  enable_static=yes
++fi
  
--# Check whether --enable-fast-install or --disable-fast-install was given.
+-int main() {
+-return __MINGW32__;
+-; return 0; }
+-EOF
+-if { (eval echo configure:1138: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-  ac_cv_mingw32=yes
 +
 +# Check whether --enable-fast-install was given.
- if test "${enable_fast_install+set}" = set; then
--  enableval="$enable_fast_install"
--  p=${PACKAGE-default}
--case $enableval in
--yes) enable_fast_install=yes ;;
--no) enable_fast_install=no ;;
--*)
--  enable_fast_install=no
--  # Look at the argument we got.  We use all the common list separators.
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
--  for pkg in $enableval; do
--    if test "X$pkg" = "X$p"; then
--      enable_fast_install=yes
--    fi
--  done
--  IFS="$ac_save_ifs"
--  ;;
--esac
++if test "${enable_fast_install+set}" = set; then
 +  enableval=$enable_fast_install; p=${PACKAGE-default}
 +    case $enableval in
 +    yes) enable_fast_install=yes ;;
@@ -6048,20 +14763,16 @@
 +      ;;
 +    esac
  else
-   enable_fast_install=yes
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  ac_cv_mingw32=no
++  enable_fast_install=yes
  fi
- 
--echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:1304: checking build system type" >&5
- 
--build_alias=$build
--case "$build_alias" in
--NONE)
--  case $nonopt in
--  NONE) build_alias=$host_alias ;;
--  *) build_alias=$nonopt ;;
--  esac ;;
--esac
+-rm -f conftest*
+-rm -f conftest*
++
++
 +DEPDIR="${am__leading_dot}deps"
 +
 +ac_config_commands="$ac_config_commands depfiles"
@@ -6099,9 +14810,17 @@
 +      am__quote="\""
 +      _am_result=BSD
 +   fi
-+fi
+ fi
+ 
+-echo "$ac_t""$ac_cv_mingw32" 1>&6
+-MINGW32=
+-test "$ac_cv_mingw32" = yes && MINGW32=yes
+-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1155: checking how to run the C preprocessor" >&5
+-# On Suns, sometimes $CPP names a directory.
+-if test -n "$CPP" && test -d "$CPP"; then
+-  CPP=
 +
-+
 +{ echo "$as_me:$LINENO: result: $_am_result" >&5
 +echo "${ECHO_T}$_am_result" >&6; }
 +rm -f confinc confmf
@@ -6109,7 +14828,27 @@
 +# Check whether --enable-dependency-tracking was given.
 +if test "${enable_dependency_tracking+set}" = set; then
 +  enableval=$enable_dependency_tracking;
-+fi
+ fi
+-if test -z "$CPP"; then
+-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-    # This must be in double quotes, not single quotes, because CPP may get
+-  # substituted into the Makefile and "${CC-cc}" will confuse make.
+-  CPP="${CC-cc} -E"
+-  # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp.
+-  cat > conftest.$ac_ext <<EOF
+-#line 1170 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1176: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
 +
 +if test "x$enable_dependency_tracking" != xno; then
 +  am_depcomp="$ac_aux_dir/depcomp"
@@ -6120,7 +14859,23 @@
 +if test "x$enable_dependency_tracking" != xno; then
 +  AMDEP_TRUE=
 +  AMDEP_FALSE='#'
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -E -traditional-cpp"
+-  cat > conftest.$ac_ext <<EOF
+-#line 1187 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
 +  AMDEP_TRUE='#'
 +  AMDEP_FALSE=
 +fi
@@ -6139,17 +14894,42 @@
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 +if test "${ac_cv_prog_CC+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -nologo -E"
+-  cat > conftest.$ac_ext <<EOF
+-#line 1204 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
 +  if test -n "$CC"; then
 +  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP=/lib/cpp
+-fi
+-rm -f conftest*
+-fi
+-rm -f conftest*
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_CC="${ac_tool_prefix}gcc"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -6158,33 +14938,49 @@
 +done
 +IFS=$as_save_IFS
 +
-+fi
-+fi
+ fi
+-rm -f conftest*
+-  ac_cv_prog_CPP="$CPP"
+ fi
+-  CPP="$ac_cv_prog_CPP"
 +CC=$ac_cv_prog_CC
 +if test -n "$CC"; then
 +  { echo "$as_me:$LINENO: result: $CC" >&5
 +echo "${ECHO_T}$CC" >&6; }
-+else
+ else
+-  ac_cv_prog_CPP="$CPP"
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+-echo "$ac_t""$CPP" 1>&6
  
--build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
--build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
--build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
--echo "$ac_t""$build" 1>&6
- 
--# Extract the first word of "gcc", so it can be a program name with args.
-+fi
+-# Check whether --enable-shared or --disable-shared was given.
+-if test "${enable_shared+set}" = set; then
+-  enableval="$enable_shared"
+-  p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_shared=yes ;;
+-no) enable_shared=no ;;
+-*)
+-  enable_shared=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_shared=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
+-else
+-  enable_shared=yes
++
+ fi
 +if test -z "$ac_cv_prog_CC"; then
 +  ac_ct_CC=$CC
 +  # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1324: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
++set dummy gcc; ac_word=$2
 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
@@ -6199,7 +14995,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_CC="gcc"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -6207,18 +15003,56 @@
 +done
 +done
 +IFS=$as_save_IFS
-+
+ 
+-# Check whether --enable-static or --disable-static was given.
+-if test "${enable_static+set}" = set; then
+-  enableval="$enable_static"
+-  p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_static=yes ;;
+-no) enable_static=no ;;
+-*)
+-  enable_static=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_static=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
 +fi
 +fi
 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
 +if test -n "$ac_ct_CC"; then
 +  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 +echo "${ECHO_T}$ac_ct_CC" >&6; }
-+else
+ else
+-  enable_static=yes
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
+ fi
+ 
+-# Check whether --enable-fast-install or --disable-fast-install was given.
+-if test "${enable_fast_install+set}" = set; then
+-  enableval="$enable_fast_install"
+-  p=${PACKAGE-default}
+-case $enableval in
+-yes) enable_fast_install=yes ;;
+-no) enable_fast_install=no ;;
+-*)
+-  enable_fast_install=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_fast_install=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
 +  if test "x$ac_ct_CC" = x; then
 +    CC=""
 +  else
@@ -6231,13 +15065,38 @@
 +whose name does not start with the host triplet.  If you think this
 +configuration is useful to you, please write to autoconf at gnu.org." >&2;}
 +ac_tool_warned=yes ;;
-+esac
+ esac
 +    CC=$ac_ct_CC
 +  fi
-+else
+ else
+-  enable_fast_install=yes
 +  CC="$ac_cv_prog_CC"
-+fi
-+
+ fi
+ 
+-echo $ac_n "checking build system type""... $ac_c" 1>&6
+-echo "configure:1304: checking build system type" >&5
+-
+-build_alias=$build
+-case "$build_alias" in
+-NONE)
+-  case $nonopt in
+-  NONE) build_alias=$host_alias ;;
+-  *) build_alias=$nonopt ;;
+-  esac ;;
+-esac
+-
+-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-echo "$ac_t""$build" 1>&6
+-
+-# Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1324: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +if test -z "$CC"; then
 +          if test -n "$ac_tool_prefix"; then
 +    # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
@@ -6266,7 +15125,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_CC="${ac_tool_prefix}cc"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -6328,7 +15187,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
 +       ac_prog_rejected=yes
 +       continue
@@ -6412,7 +15271,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -6431,76 +15290,16 @@
 +echo "${ECHO_T}$CC" >&6; }
  else
 -  echo "$ac_t""no" 1>&6
--fi
-- ;;
--    esac
--  fi
--  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
- 
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1437: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
--
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--cat > conftest.$ac_ext << EOF
--
--#line 1448 "configure"
--#include "confdefs.h"
- 
--main(){return(0);}
--EOF
--if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  ac_cv_prog_cc_works=yes
--  # If we can't run a trivial program, we are probably using a cross compiler.
--  if (./conftest; exit) 2>/dev/null; then
--    ac_cv_prog_cc_cross=no
--  else
--    ac_cv_prog_cc_cross=yes
--  fi
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  ac_cv_prog_cc_works=no
+- ;;
+-    esac
++
++
 +    test -n "$CC" && break
 +  done
- fi
--rm -fr conftest*
--ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
--if test $ac_cv_prog_cc_works = no; then
--  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
--fi
--echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1479: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
--echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
--cross_compiling=$ac_cv_prog_cc_cross
--
--echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:1484: checking whether we are using GNU C" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.c <<EOF
--#ifdef __GNUC__
--  yes;
--#endif
--EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
--  ac_cv_prog_gcc=yes
++fi
 +if test -z "$CC"; then
 +  ac_ct_CC=$CC
 +  for ac_prog in cl.exe
@@ -6514,76 +15313,50 @@
 +else
 +  if test -n "$ac_ct_CC"; then
 +  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
- else
--  ac_cv_prog_gcc=no
++else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_CC="$ac_prog"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
-+  fi
+   fi
+-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
 +done
 +done
 +IFS=$as_save_IFS
 +
- fi
- fi
--
--echo "$ac_t""$ac_cv_prog_gcc" 1>&6
--
--if test $ac_cv_prog_gcc = yes; then
--  GCC=yes
++fi
++fi
 +ac_ct_CC=$ac_cv_prog_ac_ct_CC
 +if test -n "$ac_ct_CC"; then
 +  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
 +echo "${ECHO_T}$ac_ct_CC" >&6; }
- else
--  GCC=
++else
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
  fi
  
--ac_test_CFLAGS="${CFLAGS+set}"
--ac_save_CFLAGS="$CFLAGS"
--CFLAGS=
--echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1512: checking whether ${CC-cc} accepts -g" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  echo 'void f(){}' > conftest.c
--if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
--  ac_cv_prog_cc_g=yes
--else
--  ac_cv_prog_cc_g=no
--fi
--rm -f conftest*
+-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:1437: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
--fi
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
 +  test -n "$ac_ct_CC" && break
 +done
  
--echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
--if test "$ac_test_CFLAGS" = set; then
--  CFLAGS="$ac_save_CFLAGS"
--elif test $ac_cv_prog_cc_g = yes; then
--  if test "$GCC" = yes; then
--    CFLAGS="-g -O2"
--  else
--    CFLAGS="-g"
--  fi
--else
--  if test "$GCC" = yes; then
--    CFLAGS="-O2"
+-cat > conftest.$ac_ext << EOF
 +  if test "x$ac_ct_CC" = x; then
 +    CC=""
-   else
--    CFLAGS=
++  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
@@ -6595,28 +15368,20 @@
 +ac_tool_warned=yes ;;
 +esac
 +    CC=$ac_ct_CC
-   fi
- fi
++  fi
++fi
  
--# Check whether --with-gnu-ld or --without-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
--  withval="$with_gnu_ld"
--  test "$withval" = no || with_gnu_ld=yes
--else
--  with_gnu_ld=no
- fi
+-#line 1448 "configure"
+-#include "confdefs.h"
++fi
  
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
--echo "configure:1555: checking for ld used by GCC" >&5
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+-main(){return(0);}
+-EOF
+-if { (eval echo configure:1453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  ac_cv_prog_cc_works=yes
+-  # If we can't run a trivial program, we are probably using a cross compiler.
+-  if (./conftest; exit) 2>/dev/null; then
+-    ac_cv_prog_cc_cross=no
 +
 +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
 +See \`config.log' for more details." >&5
@@ -6696,26 +15461,7 @@
 +  case $ac_file in
 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
 +    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-   esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [\\/]* | [A-Za-z]:[\\/]*)
--      re_direlt='/[^/][^/]*/\.\./'
--      # Canonicalize the path of ld
--      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
--      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
--	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
--      done
--      test -z "$LD" && LD="$ac_prog"
--      ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
--    ;;
--  *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
--    ;;
++  esac
 +done
 +rm -f $ac_rmfiles
 +
@@ -6734,7 +15480,7 @@
 +# in a Makefile.  We should not override ac_cv_exeext if it was cached,
 +# so that the user can short-circuit this test for compilers unknown to
 +# Autoconf.
-+for ac_file in $ac_files
++for ac_file in $ac_files ''
 +do
 +  test -f "$ac_file" || continue
 +  case $ac_file in
@@ -6757,16 +15503,17 @@
 +	break;;
 +    * )
 +	break;;
-   esac
--elif test "$with_gnu_ld" = yes; then
--  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
--echo "configure:1585: checking for GNU ld" >&5
++  esac
 +done
 +test "$ac_cv_exeext" = no && ac_cv_exeext=
 +
- else
--  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
--echo "configure:1588: checking for non-GNU ld" >&5
++else
++  ac_file=''
++fi
++
++{ echo "$as_me:$LINENO: result: $ac_file" >&5
++echo "${ECHO_T}$ac_file" >&6; }
++if test -z "$ac_file"; then
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
@@ -6778,8 +15525,6 @@
 +fi
 +
 +ac_exeext=$ac_cv_exeext
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
 +
 +# Check that the compiler produces executables we can run.  If not, either
 +# the compiler is broken, or we cross compile.
@@ -6799,7 +15544,8 @@
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; }; then
 +    cross_compiling=no
-+  else
+   else
+-    ac_cv_prog_cc_cross=yes
 +    if test "$cross_compiling" = maybe; then
 +	cross_compiling=yes
 +    else
@@ -6811,10 +15557,8 @@
 +See \`config.log' for more details." >&2;}
 +   { (exit 1); exit 1; }; }
 +    fi
-+  fi
- fi
--if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
+   fi
++fi
 +{ echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
 +
@@ -6853,30 +15597,26 @@
 +  esac
 +done
  else
--  if test -z "$LD"; then
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--  for ac_dir in $PATH; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      lt_cv_path_LD="$ac_dir/$ac_prog"
--      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
--      # Break only if it was the GNU/non-GNU ld that we prefer.
--      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
--	test "$with_gnu_ld" != no && break
--      else
--	test "$with_gnu_ld" != yes && break
--      fi
--    fi
--  done
--  IFS="$ac_save_ifs"
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_prog_cc_works=no
 +  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
 +See \`config.log' for more details." >&5
 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
 +See \`config.log' for more details." >&2;}
 +   { (exit 1); exit 1; }; }
-+fi
-+
+ fi
+-rm -fr conftest*
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+ 
+-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+-if test $ac_cv_prog_cc_works = no; then
+-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 +rm -f conftest$ac_cv_exeext
 +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
 +echo "${ECHO_T}$ac_cv_exeext" >&6; }
@@ -6923,8 +15663,7 @@
 +       break;;
 +  esac
 +done
- else
--  lt_cv_path_LD="$LD" # Let the user override the test with a path.
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
@@ -6934,9 +15673,17 @@
 +See \`config.log' for more details." >&2;}
 +   { (exit 1); exit 1; }; }
  fi
-+
+-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:1479: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+-cross_compiling=$ac_cv_prog_cc_cross
+ 
+-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:1484: checking whether we are using GNU C" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
 +echo "${ECHO_T}$ac_cv_objext" >&6; }
 +OBJEXT=$ac_cv_objext
@@ -6945,23 +15692,26 @@
 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
 +if test "${ac_cv_c_compiler_gnu+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  cat > conftest.c <<EOF
+-#ifdef __GNUC__
+-  yes;
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- 
--LD="$lt_cv_path_LD"
--if test -n "$LD"; then
--  echo "$ac_t""$LD" 1>&6
++
 +int
 +main ()
 +{
 +#ifndef __GNUC__
 +       choke me
-+#endif
+ #endif
+-EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1493: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-  ac_cv_prog_gcc=yes
 +
 +  ;
 +  return 0;
@@ -6980,39 +15730,23 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_compiler_gnu=yes
-+else
+ else
+-  ac_cv_prog_gcc=no
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_compiler_gnu=no
-+fi
+ fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +ac_cv_c_compiler_gnu=$ac_compiler_gnu
 +
-+fi
+ fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
 +GCC=`test $ac_compiler_gnu = yes && echo yes`
@@ -7033,11 +15767,14 @@
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-+
+ 
+-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
 +int
 +main ()
 +{
-+
+ 
+-if test $ac_cv_prog_gcc = yes; then
+-  GCC=yes
 +  ;
 +  return 0;
 +}
@@ -7055,39 +15792,24 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_cv_prog_cc_g=yes
  else
--  echo "$ac_t""no" 1>&6
+-  GCC=
 -fi
--test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
--echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
--echo "configure:1623: checking if the linker ($LD) is GNU ld" >&5
--if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-ac_test_CFLAGS="${CFLAGS+set}"
+-ac_save_CFLAGS="$CFLAGS"
+-CFLAGS=
+-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:1512: checking whether ${CC-cc} accepts -g" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +	CFLAGS=""
 +      cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
@@ -7117,32 +15839,14 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  :
  else
--  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
--if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
--  lt_cv_prog_gnu_ld=yes
+-  echo 'void f(){}' > conftest.c
+-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
@@ -7176,64 +15880,42 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_prog_cc_g=yes
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cc_g=yes
  else
--  lt_cv_prog_gnu_ld=no
+-  ac_cv_prog_cc_g=no
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
  fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-rm -f conftest*
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
--echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
--with_gnu_ld=$lt_cv_prog_gnu_ld
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
- 
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_c_werror_flag=$ac_save_c_werror_flag
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
-+if test "$ac_test_CFLAGS" = set; then
+ if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS="$ac_save_CFLAGS"
 +  CFLAGS=$ac_save_CFLAGS
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
+ elif test $ac_cv_prog_cc_g = yes; then
+   if test "$GCC" = yes; then
+     CFLAGS="-g -O2"
+@@ -1538,11 +3584,461 @@
+     CFLAGS=
+   fi
+ fi
 +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
 +if test "${ac_cv_prog_cc_c89+set}" = set; then
@@ -7270,10 +15952,7 @@
 +  return s;
 +}
  
--echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
--echo "configure:1640: checking for $LD option to reload object files" >&5
--if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
 +/* 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
@@ -7283,6 +15962,11 @@
 +   that's true only with -std.  */
 +int osf4_cc_array ['\x00' == 0 ? 1 : -1];
 +
++/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
++   inside strings and character constants.  */
++#define FOO(x) 'x'
++int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
++
 +int test (int i, double x);
 +struct s1 {int (*f) (int a);};
 +struct s2 {int (*f) (double a);};
@@ -7314,69 +15998,24 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_cv_prog_cc_c89=$ac_arg
- else
--  lt_cv_ld_reload_flag='-r'
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
- fi
- 
--echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
--reload_flag=$lt_cv_ld_reload_flag
--test -n "$reload_flag" && reload_flag=" $reload_flag"
-+rm -f conftest.err conftest.$ac_objext
++fi
++
++rm -f core conftest.err conftest.$ac_objext
 +  test "x$ac_cv_prog_cc_c89" != "xno" && break
 +done
 +rm -f conftest.$ac_ext
 +CC=$ac_save_CC
- 
--echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
--echo "configure:1652: checking for BSD-compatible nm" >&5
--if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test -n "$NM"; then
--  # Let the user override the test.
--  lt_cv_path_NM="$NM"
--else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
--    test -z "$ac_dir" && ac_dir=.
--    tmp_nm=$ac_dir/${ac_tool_prefix}nm
--    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
--      # Check to see if the nm accepts a BSD-compat flag.
--      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
--      #   nm: unknown option "B" ignored
--      # Tru64's nm complains that /dev/null is an invalid object file
--      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
--	lt_cv_path_NM="$tmp_nm -B"
--	break
--      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
--	lt_cv_path_NM="$tmp_nm -p"
--	break
++
 +fi
 +# AC_CACHE_VAL
 +case "x$ac_cv_prog_cc_c89" in
@@ -7452,9 +16091,7 @@
 +      # only be used when explicitly requested
 +      if test "x$enable_dependency_tracking" = xyes; then
 +	continue
-       else
--	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
--	continue # so that we can try to find one that supports BSD flags
++      else
 +	break
 +      fi
 +      ;;
@@ -7482,11 +16119,9 @@
 +          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
 +        am_cv_CC_dependencies_compiler_type=$depmode
 +        break
-       fi
-     fi
-   done
--  IFS="$ac_save_ifs"
--  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
++      fi
++    fi
++  done
 +
 +  cd ..
 +  rm -rf conftest.dir
@@ -7494,7 +16129,7 @@
 +  am_cv_CC_dependencies_compiler_type=none
 +fi
 +
- fi
++fi
 +{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
 +echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
 +CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
@@ -7509,39 +16144,30 @@
 +else
 +  am__fastdepCC_TRUE='#'
 +  am__fastdepCC_FALSE=
- fi
- 
--NM="$lt_cv_path_NM"
--echo "$ac_t""$NM" 1>&6
- 
--echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
--echo "configure:1690: checking for a sed that does not truncate output" >&5
--if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
++fi
++
++
 +{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
 +echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
 +if test "${lt_cv_path_SED+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # Loop through the user's path and test for sed and gsed.
- # Then use that list of sed's as ones to test for truncation.
--as_executable_p="test -f"
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in sed gsed; do
++else
++  # Loop through the user's path and test for sed and gsed.
++# Then use that list of sed's as ones to test for truncation.
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++  IFS=$as_save_IFS
++  test -z "$as_dir" && as_dir=.
 +  for lt_ac_prog in sed gsed; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
--      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
--        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
-+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++    for ac_exec_ext in '' $ac_executable_extensions; do
++      if { test -f "$as_dir/$lt_ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$lt_ac_prog$ac_exec_ext"; }; then
 +        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-       fi
-     done
-   done
- done
++      fi
++    done
++  done
++done
++IFS=$as_save_IFS
 +lt_ac_max=0
 +lt_ac_count=0
 +# Add /usr/xpg4/bin/sed as it is typically found on Solaris
@@ -7572,43 +16198,11 @@
 +    fi
 +  done
 +done
- 
--  # Create a temporary directory, and hook for its removal unless debugging.
--$debug ||
--{
--  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
--  trap '{ (exit 1); exit 1; }' 1 2 13 15
--}
++
 +fi
- 
--# Create a (secure) tmp directory for tmp files.
--: ${TMPDIR=/tmp}
--{
--  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
--  test -n "$tmp" && test -d "$tmp"
--}  ||
--{
--  tmp=$TMPDIR/sed$$-$RANDOM
--  (umask 077 && mkdir $tmp)
--} ||
--{
--   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
--   { (exit 1); exit 1; }
--}
--  _max=0
--  _count=0
--  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
--  # along with /bin/sed that truncates output.
--  for _sed in $_sed_list /usr/xpg4/bin/sed; do
--    test ! -f ${_sed} && break
--    cat /dev/null > "$tmp/sed.in"
--    _count=0
--    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
--    # Check for GNU sed and select it if it is found.
--    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
--      lt_cv_path_SED=${_sed}
--      break
++
 +SED=$lt_cv_path_SED
++
 +{ echo "$as_me:$LINENO: result: $SED" >&5
 +echo "${ECHO_T}$SED" >&6; }
 +
@@ -7633,7 +16227,7 @@
 +  for ac_prog in grep ggrep; do
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
++    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 +    # Check for GNU ac_path_GREP and select it if it is found.
 +  # Check for GNU $ac_path_GREP
 +case `"$ac_path_GREP" --version 2>&1` in
@@ -7655,22 +16249,7 @@
 +      # Best one so far, save it but keep looking for a better one
 +      ac_cv_path_GREP="$ac_path_GREP"
 +      ac_path_GREP_max=$ac_count
-     fi
--    while true; do
--      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
--      mv "$tmp/sed.tmp" "$tmp/sed.in"
--      cp "$tmp/sed.in" "$tmp/sed.nl"
--      echo >>"$tmp/sed.nl"
--      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
--      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
--      # 40000 chars as input seems more than enough
--      test $_count -gt 10 && break
--      _count=`expr $_count + 1`
--      if test $_count -gt $_max; then
--        _max=$_count
--        lt_cv_path_SED=$_sed
--      fi
--    done
++    fi
 +    # 10*(2^10) chars as input seems more than enough
 +    test $ac_count -gt 10 && break
 +  done
@@ -7679,8 +16258,7 @@
 +
 +
 +    $ac_path_GREP_found && break 3
-   done
--  rm -rf "$tmp"
++  done
 +done
 +
 +done
@@ -7688,27 +16266,19 @@
 +
 +
 +fi
- 
++
 +GREP="$ac_cv_path_GREP"
 +if test -z "$GREP"; then
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
- fi
- 
--if test "X$SED" != "X"; then
--  lt_cv_path_SED=$SED
- else
--  SED=$lt_cv_path_SED
++fi
++
++else
 +  ac_cv_path_GREP=$GREP
- fi
--echo "$ac_t""$SED" 1>&6
- 
--echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:1774: checking whether ln -s works" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
++fi
 +
++
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
@@ -7719,12 +16289,7 @@
 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
 +if test "${ac_cv_path_EGREP+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  rm -f conftestdata
--if ln -s X conftestdata 2>/dev/null
--then
--  rm -f conftestdata
--  ac_cv_prog_LN_S="ln -s"
++else
 +  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
 +   then ac_cv_path_EGREP="$GREP -E"
 +   else
@@ -7733,8 +16298,7 @@
 +set dummy egrep; ac_prog_name=$2
 +if test "${ac_cv_path_EGREP+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  ac_cv_prog_LN_S=ln
++else
 +  ac_path_EGREP_found=false
 +# Loop through the user's path and test for each of PROGNAME-LIST
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -7745,7 +16309,7 @@
 +  for ac_prog in egrep; do
 +  for ac_exec_ext in '' $ac_executable_extensions; do
 +    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-+    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
++    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 +    # Check for GNU ac_path_EGREP and select it if it is found.
 +  # Check for GNU $ac_path_EGREP
 +case `"$ac_path_EGREP" --version 2>&1` in
@@ -7783,42 +16347,20 @@
 +IFS=$as_save_IFS
 +
 +
- fi
++fi
 +
 +EGREP="$ac_cv_path_EGREP"
 +if test -z "$EGREP"; then
 +  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 +   { (exit 1); exit 1; }; }
- fi
--LN_S="$ac_cv_prog_LN_S"
--if test "$ac_cv_prog_LN_S" = "ln -s"; then
--  echo "$ac_t""yes" 1>&6
++fi
 +
- else
--  echo "$ac_t""no" 1>&6
++else
 +  ac_cv_path_EGREP=$EGREP
- fi
- 
--echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
--echo "configure:1795: checking how to recognise dependent libraries" >&5
--if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  lt_cv_file_magic_cmd='$MAGIC_CMD'
--lt_cv_file_magic_test_file=
--lt_cv_deplibs_check_method='unknown'
--# Need to set the preceding variable on all platforms that support
--# interlibrary dependencies.
--# 'none' -- dependencies not supported.
--# `unknown' -- same as none, but documents that we really don't know.
--# 'pass_all' -- all dependencies passed with no checks.
--# 'test_compile' -- check by making test program.
--# 'file_magic [[regex]]' -- check by looking for files in library path
--# which responds to the $file_magic_cmd with a given egrep regex.
--# If you have `file' or equivalent on your system and you're not sure
--# whether `pass_all' will *always* work, you probably want this one.
++fi
 +
++
 +   fi
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
@@ -7828,88 +16370,107 @@
 +
 +
 +# Check whether --with-gnu-ld was given.
-+if test "${with_gnu_ld+set}" = set; then
+ if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
 +  withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-+else
-+  with_gnu_ld=no
-+fi
-+
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
+ else
+   with_gnu_ld=no
+ fi
+@@ -1550,8 +4046,8 @@
+ ac_prog=ld
+ if test "$GCC" = yes; then
+   # Check if gcc -print-prog-name=ld gives a path.
+-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
+-echo "configure:1555: checking for ld used by GCC" >&5
 +  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
 +echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-+  esac
-+  case $ac_prog in
-+    # Accept absolute paths.
+   case $host in
+   *-*-mingw*)
+     # gcc leaves a trailing carriage return which upsets mingw
+@@ -1561,12 +4057,12 @@
+   esac
+   case $ac_prog in
+     # Accept absolute paths.
+-    [\\/]* | [A-Za-z]:[\\/]*)
 +    [\\/]* | ?:[\\/]*)
-+      re_direlt='/[^/][^/]*/\.\./'
+       re_direlt='/[^/][^/]*/\.\./'
+-      # Canonicalize the path of ld
+-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
 +      # Canonicalize the pathname of ld
 +      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+       while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
 +	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-+    ;;
-+  *)
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-+    ;;
-+  esac
-+elif test "$with_gnu_ld" = yes; then
+       done
+       test -z "$LD" && LD="$ac_prog"
+       ;;
+@@ -1580,32 +4076,36 @@
+     ;;
+   esac
+ elif test "$with_gnu_ld" = yes; then
+-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
+-echo "configure:1585: checking for GNU ld" >&5
 +  { echo "$as_me:$LINENO: checking for GNU ld" >&5
 +echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
-+else
+ else
+-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+-echo "configure:1588: checking for non-GNU ld" >&5
 +  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
 +echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
-+fi
+ fi
+-if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +if test "${lt_cv_path_LD+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -z "$LD"; then
+ else
+   if test -z "$LD"; then
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 +  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
+   for ac_dir in $PATH; do
 +    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
+     test -z "$ac_dir" && ac_dir=.
+     if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+       lt_cv_path_LD="$ac_dir/$ac_prog"
+       # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
 +      # but apparently some variants of GNU ld only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
+       # Break only if it was the GNU/non-GNU ld that we prefer.
+-      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
 +      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
 +      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
+ 	test "$with_gnu_ld" != no && break
+-      else
 +	;;
 +      *)
-+	test "$with_gnu_ld" != yes && break
+ 	test "$with_gnu_ld" != yes && break
+-      fi
 +	;;
 +      esac
-+    fi
-+  done
+     fi
+   done
+-  IFS="$ac_save_ifs"
 +  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi
-+fi
-+
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
+ else
+   lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ fi
+@@ -1613,187 +4113,128 @@
+ 
+ LD="$lt_cv_path_LD"
+ if test -n "$LD"; then
+-  echo "$ac_t""$LD" 1>&6
 +  { echo "$as_me:$LINENO: result: $LD" >&5
 +echo "${ECHO_T}$LD" >&6; }
-+else
+ else
+-  echo "$ac_t""no" 1>&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
+ fi
+-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
+-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
+-echo "configure:1623: checking if the linker ($LD) is GNU ld" >&5
+-if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
 +echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
 +   { (exit 1); exit 1; }; }
@@ -7917,32 +16478,45 @@
 +echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
 +if test "${lt_cv_prog_gnu_ld+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
 +  # I'd rather use --version here, but apparently some GNU lds only accept -v.
 +case `$LD -v 2>&1 </dev/null` in
 +*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
+   lt_cv_prog_gnu_ld=yes
+-else
 +  ;;
 +*)
-+  lt_cv_prog_gnu_ld=no
+   lt_cv_prog_gnu_ld=no
 +  ;;
 +esac
-+fi
+ fi
+-fi
+-
+-echo "$ac_t""$lt_cv_prog_gnu_ld" 1>&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
 +echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+
-+
+ with_gnu_ld=$lt_cv_prog_gnu_ld
+ 
+ 
+-echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6
+-echo "configure:1640: checking for $LD option to reload object files" >&5
+-if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
 +echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
 +if test "${lt_cv_ld_reload_flag+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_ld_reload_flag='-r'
-+fi
+ else
+   lt_cv_ld_reload_flag='-r'
+ fi
+-
+-echo "$ac_t""$lt_cv_ld_reload_flag" 1>&6
 +{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
 +echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
-+reload_flag=$lt_cv_ld_reload_flag
+ reload_flag=$lt_cv_ld_reload_flag
+-test -n "$reload_flag" && reload_flag=" $reload_flag"
 +case $reload_flag in
 +"" | " "*) ;;
 +*) reload_flag=" $reload_flag" ;;
@@ -7957,16 +16531,38 @@
 +    fi
 +    ;;
 +esac
-+
+ 
+-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
+-echo "configure:1652: checking for BSD-compatible nm" >&5
+-if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +{ echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
 +echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6; }
 +if test "${lt_cv_path_NM+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test -n "$NM"; then
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
+ else
+   if test -n "$NM"; then
+   # Let the user override the test.
+   lt_cv_path_NM="$NM"
+ else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    test -z "$ac_dir" && ac_dir=.
+-    tmp_nm=$ac_dir/${ac_tool_prefix}nm
+-    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      # Tru64's nm complains that /dev/null is an invalid object file
+-      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
+-	lt_cv_path_NM="$tmp_nm -B"
+-	break
+-      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	lt_cv_path_NM="$tmp_nm -p"
+-	break
+-      else
+-	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+-	continue # so that we can try to find one that supports BSD flags
 +  lt_nm_to_check="${ac_tool_prefix}nm"
 +  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
 +    lt_nm_to_check="$lt_nm_to_check nm"
@@ -8000,50 +16596,155 @@
 +	  esac
 +	  ;;
 +	esac
-+      fi
+       fi
+-    fi
 +    done
 +    IFS="$lt_save_ifs"
-+  done
-+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi
-+fi
+   done
+-  IFS="$ac_save_ifs"
+   test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi
+ fi
+-
 +{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
 +echo "${ECHO_T}$lt_cv_path_NM" >&6; }
-+NM="$lt_cv_path_NM"
-+
+ NM="$lt_cv_path_NM"
+-echo "$ac_t""$NM" 1>&6
+ 
+-echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6
+-echo "configure:1690: checking for a sed that does not truncate output" >&5
+-if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  # Loop through the user's path and test for sed and gsed.
+-# Then use that list of sed's as ones to test for truncation.
+-as_executable_p="test -f"
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_prog in sed gsed; do
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+-        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
+-      fi
+-    done
+-  done
+-done
+-
+-  # Create a temporary directory, and hook for its removal unless debugging.
+-$debug ||
+-{
+-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
+-  trap '{ (exit 1); exit 1; }' 1 2 13 15
+-}
+-
+-# Create a (secure) tmp directory for tmp files.
+-: ${TMPDIR=/tmp}
+-{
+-  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
+-  test -n "$tmp" && test -d "$tmp"
+-}  ||
+-{
+-  tmp=$TMPDIR/sed$$-$RANDOM
+-  (umask 077 && mkdir $tmp)
+-} ||
+-{
+-   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
+-   { (exit 1); exit 1; }
+-}
+-  _max=0
+-  _count=0
+-  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+-  # along with /bin/sed that truncates output.
+-  for _sed in $_sed_list /usr/xpg4/bin/sed; do
+-    test ! -f ${_sed} && break
+-    cat /dev/null > "$tmp/sed.in"
+-    _count=0
+-    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
+-    # Check for GNU sed and select it if it is found.
+-    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
+-      lt_cv_path_SED=${_sed}
+-      break
+-    fi
+-    while true; do
+-      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
+-      mv "$tmp/sed.tmp" "$tmp/sed.in"
+-      cp "$tmp/sed.in" "$tmp/sed.nl"
+-      echo >>"$tmp/sed.nl"
+-      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
+-      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
+-      # 40000 chars as input seems more than enough
+-      test $_count -gt 10 && break
+-      _count=`expr $_count + 1`
+-      if test $_count -gt $_max; then
+-        _max=$_count
+-        lt_cv_path_SED=$_sed
+-      fi
+-    done
+-  done
+-  rm -rf "$tmp"
+-
+-fi
+-
+-if test "X$SED" != "X"; then
+-  lt_cv_path_SED=$SED
+-else
+-  SED=$lt_cv_path_SED
+-fi
+-echo "$ac_t""$SED" 1>&6
+-
+-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+-echo "configure:1774: checking whether ln -s works" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  rm -f conftestdata
+-if ln -s X conftestdata 2>/dev/null
+-then
+-  rm -f conftestdata
+-  ac_cv_prog_LN_S="ln -s"
+-else
+-  ac_cv_prog_LN_S=ln
+-fi
+-fi
+-LN_S="$ac_cv_prog_LN_S"
+-if test "$ac_cv_prog_LN_S" = "ln -s"; then
+-  echo "$ac_t""yes" 1>&6
 +{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
 +echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
 +LN_S=$as_ln_s
 +if test "$LN_S" = "ln -s"; then
 +  { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
-+else
+ else
+-  echo "$ac_t""no" 1>&6
 +  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
 +echo "${ECHO_T}no, using $LN_S" >&6; }
-+fi
-+
-+{ echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-+echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6; }
+ fi
+ 
+-echo $ac_n "checking how to recognise dependent libraries""... $ac_c" 1>&6
+-echo "configure:1795: checking how to recognise dependent libraries" >&5
+-if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
++echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
 +if test "${lt_cv_deplibs_check_method+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
+ else
+   lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -1805,7 +4246,7 @@
+ # 'pass_all' -- all dependencies passed with no checks.
+ # 'test_compile' -- check by making test program.
+ # 'file_magic [[regex]]' -- check by looking for files in library path
+-# which responds to the $file_magic_cmd with a given egrep regex.
 +# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
+ # If you have `file' or equivalent on your system and you're not sure
+ # whether `pass_all' will *always* work, you probably want this one.
  
- case $host_os in
- aix4* | aix5*)
-@@ -1818,37 +4315,36 @@
+@@ -1818,37 +4259,42 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -8055,6 +16756,8 @@
    ;;
  
 -cygwin* | mingw* | pw32*)
+-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+-  lt_cv_file_magic_cmd='$OBJDUMP -f'
 +cygwin*)
 +  # func_win32_libid is a shell function defined in ltmain.sh
 +  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
@@ -8063,9 +16766,15 @@
 +
 +mingw* | pw32*)
 +  # Base MSYS/MinGW do not provide the 'file' command needed by
-+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-   lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-   lt_cv_file_magic_cmd='$OBJDUMP -f'
++  # func_win32_libid shell function, so use a weaker test based on 'objdump',
++  # unless we find 'file', for example because we are cross-compiling.
++  if ( file / ) >/dev/null 2>&1; then
++    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++    lt_cv_file_magic_cmd='func_win32_libid'
++  else
++    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++    lt_cv_file_magic_cmd='$OBJDUMP -f'
++  fi
    ;;
  
  darwin* | rhapsody*)
@@ -8094,7 +16803,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -1862,50 +4358,49 @@
+@@ -1862,50 +4308,49 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -8135,7 +16844,7 @@
 -  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
 +  ;;
 +
-+interix3*)
++interix[3-9]*)
 +  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
 +  lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|\.a)$'
 +  ;;
@@ -8175,7 +16884,7 @@
    fi
    ;;
  
-@@ -1915,37 +4410,27 @@
+@@ -1915,37 +4360,31 @@
    lt_cv_file_magic_test_file=/usr/lib/libnls.so
    ;;
  
@@ -8199,28 +16908,29 @@
 -  # this will be overridden with pass_all, but let us keep it just in case
 -  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
 -  lt_cv_file_magic_test_file=/shlib/libc.so
--  lt_cv_deplibs_check_method=pass_all
--  ;;
--
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
 -sco3.2v5*)
++rdos*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
 -  lt_cv_file_magic_test_file=/lib/libc.so
--  ;;
--
--sysv5uw[78]* | sysv4*uw2*)
--  lt_cv_deplibs_check_method=pass_all
    ;;
  
+-sysv5uw[78]* | sysv4*uw2*)
+-  lt_cv_deplibs_check_method=pass_all
+-  ;;
+-
 -sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +sysv4 | sysv4.3*)
    case $host_vendor in
    motorola)
      lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-@@ -1966,2229 +4451,14070 @@
+@@ -1966,89 +4405,2260 @@
    siemens)
      lt_cv_deplibs_check_method=pass_all
      ;;
@@ -8248,77 +16958,26 @@
 -echo "configure:1981: checking for object suffix" >&5
 -if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  rm -f conftest*
--echo 'int i = 1;' > conftest.$ac_ext
--if { (eval echo configure:1987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  for ac_file in conftest.*; do
--    case $ac_file in
--    *.c) ;;
--    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
--    esac
--  done
--else
--  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
--fi
--rm -f conftest*
--fi
- 
--echo "$ac_t""$ac_cv_objext" 1>&6
--OBJEXT=$ac_cv_objext
--ac_objext=$ac_cv_objext
- 
- 
++
++
++
 +# If no C compiler was specified, use CC.
 +LTCC=${LTCC-"$CC"}
- 
--echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
--echo "configure:2007: checking for executable suffix" >&5
--if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
--  ac_cv_exeext=.exe
--else
--  rm -f conftest*
--  echo 'int main () { return 0; }' > conftest.$ac_ext
--  ac_cv_exeext=
--  if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
--    for file in conftest.*; do
--      case $file in
--      *.c | *.o | *.obj) ;;
--      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
--      esac
--    done
--  else
--    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
--  fi
--  rm -f conftest*
--  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
--fi
--fi
++
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- 
--EXEEXT=""
--test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
--echo "$ac_t""${ac_cv_exeext}" 1>&6
--ac_exeext=$EXEEXT
++
 +# Allow CC to be a program name with arguments.
 +compiler=$CC
- 
--if test $host != $build; then
--  ac_tool_prefix=${host_alias}-
--else
--  ac_tool_prefix=
 +
++
 +# Check whether --enable-libtool-lock was given.
 +if test "${enable_libtool_lock+set}" = set; then
 +  enableval=$enable_libtool_lock;
- fi
- 
++fi
++
 +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
++
 +# Some flags need to be propagated to the compiler or linker for good
 +# libtool support.
 +case $host in
@@ -8343,7 +17002,7 @@
 +  ;;
 +*-*-irix6*)
 +  # Find out which ABI we are using.
-+  echo '#line 4516 "configure"' > conftest.$ac_ext
++  echo '#line 4470 "configure"' > conftest.$ac_ext
 +  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
@@ -8377,8 +17036,9 @@
 +  fi
 +  rm -rf conftest*
 +  ;;
- 
-+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
 +  # Find out which ABI we are using.
 +  echo 'int i;' > conftest.$ac_ext
 +  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -8389,6 +17049,9 @@
 +    case `/usr/bin/file conftest.o` in
 +    *32-bit*)
 +      case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_i386_fbsd"
++          ;;
 +        x86_64-*linux*)
 +          LD="${LD-ld} -m elf_i386"
 +          ;;
@@ -8405,6 +17068,9 @@
 +      ;;
 +    *64-bit*)
 +      case $host in
++        x86_64-*kfreebsd*-gnu)
++          LD="${LD-ld} -m elf_x86_64_fbsd"
++          ;;
 +        x86_64-*linux*)
 +          LD="${LD-ld} -m elf_x86_64"
 +          ;;
@@ -8423,12 +17089,7 @@
 +  fi
 +  rm -rf conftest*
 +  ;;
- 
--# Check for command to grab the raw symbol name followed by C symbol from nm.
--echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
--echo "configure:2048: checking command to parse $NM output" >&5
--if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
++
 +*-*-sco3.2v5*)
 +  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
 +  SAVE_CFLAGS="$CFLAGS"
@@ -8438,15 +17099,13 @@
 +if test "${lt_cv_cc_needs_belf+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  
--# These are sane defaults that work on at least a few old systems.
--# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
--
--# Character class describing NM global symbol codes.
--symcode='[BCDEGRST]'
--
--# Regexp to match symbols that can be accessed directly from C.
--sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
+-  rm -f conftest*
+-echo 'int i = 1;' > conftest.$ac_ext
+-if { (eval echo configure:1987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  for ac_file in conftest.*; do
+-    case $ac_file in
+-    *.c) ;;
+-    *) ac_cv_objext=`echo $ac_file | sed -e s/conftest.//` ;;
 +  ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -8459,43 +17118,11 @@
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- 
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
++
 +int
 +main ()
 +{
- 
--# Transform an extracted symbol line into a proper C declaration
--lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
--
--# Transform an extracted symbol line into symbol name and symbol address
--lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
--
--# Define system-specific variables.
--case $host_os in
--aix*)
--  symcode='[BCDT]'
--  ;;
--cygwin* | mingw* | pw32*)
--  symcode='[ABCDGISTW]'
--  ;;
--hpux*) # Its linker distinguishes data from code symbols
--  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
--  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
--  ;;
--irix* | nonstopux*)
--  symcode='[BCDEGRST]'
--  ;;
--osf*)
--  symcode='[BCDEGQRST]'
--  ;;
--solaris* | sysv5*)
--  symcode='[BDT]'
--  ;;
--sysv4)
--  symcode='[DFNSTU]'
--  ;;
++
 +  ;
 +  return 0;
 +}
@@ -8505,14 +17132,7 @@
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
- esac
--
--# Handle CRLF in mingw tool chain
--opt_cr=
--case $host_os in
--mingw*)
--  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
--  ;;
++esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_link") 2>conftest.er1
 +  ac_status=$?
@@ -8520,65 +17140,27 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
- esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  lt_cv_cc_needs_belf=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
--# If we're using GNU nm, then use its standard symbol codes.
--if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
--  symcode='[ABCDGISTW]'
++
 +	lt_cv_cc_needs_belf=no
- fi
- 
--# Try without a prefix undercore, then with it.
--for ac_symprfx in "" "_"; do
--
--  # Write the raw and C identifiers.
--lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-+rm -f conftest.err conftest.$ac_objext \
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +     ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  # Check to see that the pipe works correctly.
--  pipe_works=no
--  rm -f conftest*
--  cat > conftest.$ac_ext <<EOF
--#ifdef __cplusplus
--extern "C" {
--#endif
--char nm_test_var;
--void nm_test_func(){}
--#ifdef __cplusplus
--}
--#endif
--int main(){nm_test_var='a';nm_test_func();return(0);}
--EOF
++
 +fi
 +{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
 +echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
@@ -8602,21 +17184,12 @@
 +      *)    LD="${LD-ld} -64" ;;
 +      esac
 +      ;;
-+    esac
+     esac
+-  done
 +  fi
 +  rm -rf conftest*
 +  ;;
- 
--  if { (eval echo configure:2131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--    # Now try to grab the symbols.
--    nlist=conftest.nm
--    if { (eval echo configure:2134: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
--      # Try sorting and uniquifying the output.
--      if sort "$nlist" | uniq > "$nlist"T; then
--	mv -f "$nlist"T "$nlist"
--      else
--	rm -f "$nlist"T
--      fi
++
 +*-*-cygwin* | *-*-mingw* | *-*-pw32*)
 +  if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
@@ -8625,7 +17198,8 @@
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 +if test "${ac_cv_prog_DLLTOOL+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  { echo "configure: error: installation or configuration problem; compiler does not work" 1>&2; exit 1; }
 +  if test -n "$DLLTOOL"; then
 +  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 +else
@@ -8635,7 +17209,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -8643,14 +17217,7 @@
 +done
 +done
 +IFS=$as_save_IFS
- 
--      # Make sure that we snagged all the symbols we need.
--      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
--	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
--	  cat <<EOF > conftest.$ac_ext
--#ifdef __cplusplus
--extern "C" {
--#endif
++
 +fi
 +fi
 +DLLTOOL=$ac_cv_prog_DLLTOOL
@@ -8661,18 +17228,8 @@
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +fi
- 
--EOF
--	  # Now generate the symbol file.
--	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
- 
--	  cat <<EOF >> conftest.$ac_ext
--#if defined (__STDC__) && __STDC__
--# define lt_ptr void *
--#else
--# define lt_ptr char *
--# define const
--#endif
++
++
 +fi
 +if test -z "$ac_cv_prog_DLLTOOL"; then
 +  ac_ct_DLLTOOL=$DLLTOOL
@@ -8692,7 +17249,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -8700,19 +17257,7 @@
 +done
 +done
 +IFS=$as_save_IFS
- 
--/* The mapping between symbol names and symbols. */
--const struct {
--  const char *name;
--  lt_ptr address;
--}
--lt_preloaded_symbols[] =
--{
--EOF
--	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
--	  cat <<\EOF >> conftest.$ac_ext
--  {0, (lt_ptr) 0}
--};
++
 +fi
 +fi
 +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
@@ -8723,36 +17268,10 @@
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +fi
- 
--#ifdef __cplusplus
--}
--#endif
--EOF
--	  # Now try linking the two files.
--	  mv conftest.$ac_objext conftstm.$ac_objext
--	  save_LIBS="$LIBS"
--	  save_CFLAGS="$CFLAGS"
--	  LIBS="conftstm.$ac_objext"
--	  CFLAGS="$CFLAGS$no_builtin_flag"
--	  if { (eval echo configure:2185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
--	    pipe_works=yes
--	  fi
--	  LIBS="$save_LIBS"
--	  CFLAGS="$save_CFLAGS"
--	else
--	  echo "cannot find nm_test_func in $nlist" >&5
--	fi
--      else
--	echo "cannot find nm_test_var in $nlist" >&5
--      fi
--    else
--      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
--    fi
++
 +  if test "x$ac_ct_DLLTOOL" = x; then
 +    DLLTOOL="false"
-   else
--    echo "$progname: failed program was:" >&5
--    cat conftest.$ac_ext >&5
++  else
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
@@ -8764,17 +17283,11 @@
 +ac_tool_warned=yes ;;
 +esac
 +    DLLTOOL=$ac_ct_DLLTOOL
-   fi
--  rm -f conftest* conftst*
++  fi
 +else
 +  DLLTOOL="$ac_cv_prog_DLLTOOL"
 +fi
- 
--  # Do not use the global_symbol_pipe unless it works.
--  if test "$pipe_works" = yes; then
--    break
--  else
--    lt_cv_sys_global_symbol_pipe=
++
 +  if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}as; ac_word=$2
@@ -8792,46 +17305,27 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_AS="${ac_tool_prefix}as"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
-   fi
- done
++  fi
 +done
++done
 +IFS=$as_save_IFS
- 
- fi
--
--global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
--if test -z "$lt_cv_sys_global_symbol_pipe"; then
--  global_symbol_to_cdecl=
--  global_symbol_to_c_name_address=
--else
--  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
--  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
- fi
--if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
--then
--  echo "$ac_t""failed" 1>&6
++
++fi
++fi
 +AS=$ac_cv_prog_AS
 +if test -n "$AS"; then
 +  { echo "$as_me:$LINENO: result: $AS" >&5
 +echo "${ECHO_T}$AS" >&6; }
- else
--  echo "$ac_t""ok" 1>&6
++else
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
- fi
- 
--for ac_hdr in dlfcn.h
--do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:2234: checking for $ac_hdr" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
++fi
 +
++
 +fi
 +if test -z "$ac_cv_prog_AS"; then
 +  ac_ct_AS=$AS
@@ -8841,33 +17335,17 @@
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 +if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  cat > conftest.$ac_ext <<EOF
--#line 2239 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
++else
 +  if test -n "$ac_ct_AS"; then
 +  ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
++else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_AS="as"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -8876,27 +17354,17 @@
 +done
 +IFS=$as_save_IFS
 +
- fi
--rm -f conftest*
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
--EOF
-- 
++fi
++fi
 +ac_ct_AS=$ac_cv_prog_ac_ct_AS
 +if test -n "$ac_ct_AS"; then
 +  { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
 +echo "${ECHO_T}$ac_ct_AS" >&6; }
- else
--  echo "$ac_t""no" 1>&6
++else
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
- fi
--done
- 
++fi
++
 +  if test "x$ac_ct_AS" = x; then
 +    AS="false"
 +  else
@@ -8915,7 +17383,7 @@
 +else
 +  AS="$ac_cv_prog_AS"
 +fi
- 
++
 +  if test -n "$ac_tool_prefix"; then
 +  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 +set dummy ${ac_tool_prefix}objdump; ac_word=$2
@@ -8933,7 +17401,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -8941,7 +17409,7 @@
 +done
 +done
 +IFS=$as_save_IFS
- 
++
 +fi
 +fi
 +OBJDUMP=$ac_cv_prog_OBJDUMP
@@ -8952,8 +17420,8 @@
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +fi
- 
- 
++
++
 +fi
 +if test -z "$ac_cv_prog_OBJDUMP"; then
 +  ac_ct_OBJDUMP=$OBJDUMP
@@ -8973,7 +17441,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_OBJDUMP="objdump"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -8981,75 +17449,18 @@
 +done
 +done
 +IFS=$as_save_IFS
- 
--# Only perform the check for file, if the check method requires it
--case $deplibs_check_method in
--file_magic*)
--  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
--echo "configure:2280: checking for ${ac_tool_prefix}file" >&5
--if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
++
 +fi
 +fi
 +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 +if test -n "$ac_ct_OBJDUMP"; then
 +  { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
 +echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
- else
--  case $MAGIC_CMD in
--  /*)
--  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
--  ;;
--  ?:/*)
--  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
--  ;;
--  *)
--  ac_save_MAGIC_CMD="$MAGIC_CMD"
--  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="/usr/bin:$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/${ac_tool_prefix}file; then
--      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
--      if test -n "$file_magic_test_file"; then
--	case $deplibs_check_method in
--	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
--	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
--	    egrep "$file_magic_regex" > /dev/null; then
--	    :
--	  else
--	    cat <<EOF 1>&2
--
--*** Warning: the command libtool uses to detect shared libraries,
--*** $file_magic_cmd, produces output that libtool cannot recognize.
--*** The result is that libtool may fail to recognize shared libraries
--*** as such.  This will affect the creation of libtool libraries that
--*** depend on shared libraries, but programs linked with such libtool
--*** libraries will work regardless of this problem.  Nevertheless, you
--*** may want to report the problem to your system manager and/or to
--*** bug-libtool at gnu.org
--
--EOF
--	  fi ;;
--	esac
--      fi
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  MAGIC_CMD="$ac_save_MAGIC_CMD"
--  ;;
--esac
++else
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
- fi
- 
--MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--if test -n "$MAGIC_CMD"; then
--  echo "$ac_t""$MAGIC_CMD" 1>&6
++fi
++
 +  if test "x$ac_ct_OBJDUMP" = x; then
 +    OBJDUMP="false"
 +  else
@@ -9065,64 +17476,14 @@
 +esac
 +    OBJDUMP=$ac_ct_OBJDUMP
 +  fi
- else
--  echo "$ac_t""no" 1>&6
++else
 +  OBJDUMP="$ac_cv_prog_OBJDUMP"
- fi
- 
--if test -z "$lt_cv_path_MAGIC_CMD"; then
--  if test -n "$ac_tool_prefix"; then
--    echo $ac_n "checking for file""... $ac_c" 1>&6
--echo "configure:2342: checking for file" >&5
--if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  case $MAGIC_CMD in
--  /*)
--  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
--  ;;
--  ?:/*)
--  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
-   ;;
--  *)
--  ac_save_MAGIC_CMD="$MAGIC_CMD"
--  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="/usr/bin:$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/file; then
--      lt_cv_path_MAGIC_CMD="$ac_dir/file"
--      if test -n "$file_magic_test_file"; then
--	case $deplibs_check_method in
--	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
--	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
--	    egrep "$file_magic_regex" > /dev/null; then
--	    :
--	  else
--	    cat <<EOF 1>&2
- 
--*** Warning: the command libtool uses to detect shared libraries,
--*** $file_magic_cmd, produces output that libtool cannot recognize.
--*** The result is that libtool may fail to recognize shared libraries
--*** as such.  This will affect the creation of libtool libraries that
--*** depend on shared libraries, but programs linked with such libtool
--*** libraries will work regardless of this problem.  Nevertheless, you
--*** may want to report the problem to your system manager and/or to
--*** bug-libtool at gnu.org
++fi
++
++  ;;
++
 +esac
- 
--EOF
--	  fi ;;
--	esac
--      fi
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  MAGIC_CMD="$ac_save_MAGIC_CMD"
--  ;;
++
 +need_locks="$enable_libtool_lock"
 +
 +
@@ -9170,7 +17531,7 @@
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
- esac
++esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 +  ac_status=$?
@@ -9178,31 +17539,19 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
- fi
--
--MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--if test -n "$MAGIC_CMD"; then
--  echo "$ac_t""$MAGIC_CMD" 1>&6
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  :
- else
--  echo "$ac_t""no" 1>&6
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  # Broken: fails on valid input.
 +continue
- fi
- 
++fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent headers
@@ -9227,41 +17576,21 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
--    MAGIC_CMD=:
-+    ac_cpp_err=
-   fi
-+else
-+  ac_cpp_err=yes
- fi
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  # Broken: success on invalid input.
 +continue
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
--  fi
--  ;;
--esac
++
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
- 
--# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
--set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2413: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test -n "$RANLIB"; then
--  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -9276,19 +17605,9 @@
 +
 +fi
 +  CPP=$ac_cv_prog_CPP
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
++else
 +  ac_cv_prog_CPP=$CPP
- fi
++fi
 +{ echo "$as_me:$LINENO: result: $CPP" >&5
 +echo "${ECHO_T}$CPP" >&6; }
 +ac_preproc_ok=false
@@ -9325,43 +17644,21 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
- fi
--RANLIB="$ac_cv_prog_RANLIB"
--if test -n "$RANLIB"; then
--  echo "$ac_t""$RANLIB" 1>&6
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  :
- else
--  echo "$ac_t""no" 1>&6
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  # Broken: fails on valid input.
 +continue
- fi
- 
++fi
++
 +rm -f conftest.err conftest.$ac_ext
- 
--if test -z "$ac_cv_prog_RANLIB"; then
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "ranlib", so it can be a program name with args.
--set dummy ranlib; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2445: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test -n "$RANLIB"; then
--  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
++
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
@@ -9384,44 +17681,21 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_RANLIB="ranlib"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-+  ac_cpp_err=yes
- fi
--fi
--RANLIB="$ac_cv_prog_RANLIB"
--if test -n "$RANLIB"; then
--  echo "$ac_t""$RANLIB" 1>&6
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  # Broken: success on invalid input.
 +continue
- else
--  echo "$ac_t""no" 1>&6
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
- fi
- 
++fi
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +done
@@ -9429,25 +17703,14 @@
 +rm -f conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then
 +  :
- else
--  RANLIB=":"
--fi
++else
 +  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 +See \`config.log' for more details." >&5
 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 +See \`config.log' for more details." >&2;}
 +   { (exit 1); exit 1; }; }
- fi
- 
--# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
--set dummy ${ac_tool_prefix}strip; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2480: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test -n "$STRIP"; then
--  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
++fi
++
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9492,27 +17755,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_cv_header_stdc=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -9521,7 +17767,7 @@
 +	ac_cv_header_stdc=no
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +
 +if test $ac_cv_header_stdc = yes; then
 +  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
@@ -9537,29 +17783,16 @@
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "memchr" >/dev/null 2>&1; then
 +  :
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
++else
 +  ac_cv_header_stdc=no
  fi
--fi
--STRIP="$ac_cv_prog_STRIP"
--if test -n "$STRIP"; then
--  echo "$ac_t""$STRIP" 1>&6
--else
--  echo "$ac_t""no" 1>&6
-+rm -f conftest*
+ rm -f conftest*
 +
  fi
  
+-echo "$ac_t""$ac_cv_objext" 1>&6
+-OBJEXT=$ac_cv_objext
+-ac_objext=$ac_cv_objext
 +if test $ac_cv_header_stdc = yes; then
 +  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 +  cat >conftest.$ac_ext <<_ACEOF
@@ -9570,49 +17803,28 @@
 +/* end confdefs.h.  */
 +#include <stdlib.h>
  
--if test -z "$ac_cv_prog_STRIP"; then
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "strip", so it can be a program name with args.
--set dummy strip; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2512: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test -n "$STRIP"; then
--  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
 +_ACEOF
 +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
 +  $EGREP "free" >/dev/null 2>&1; then
 +  :
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_STRIP="strip"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
++else
 +  ac_cv_header_stdc=no
- fi
++fi
 +rm -f conftest*
-+
- fi
--STRIP="$ac_cv_prog_STRIP"
--if test -n "$STRIP"; then
--  echo "$ac_t""$STRIP" 1>&6
-+
+ 
++fi
+ 
+-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
+-echo "configure:2007: checking for executable suffix" >&5
+-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +if test $ac_cv_header_stdc = yes; then
 +  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 +  if test "$cross_compiling" = yes; then
 +  :
  else
--  echo "$ac_t""no" 1>&6
--fi
+-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
+-  ac_cv_exeext=.exe
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -9631,7 +17843,7 @@
 +		     || ('s' <= (c) && (c) <= 'z'))
 +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
 +#endif
- 
++
 +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
 +int
 +main ()
@@ -9666,22 +17878,28 @@
 +  (exit $ac_status); }; }; then
 +  :
  else
--  STRIP=":"
+-  rm -f conftest*
+-  echo 'int main () { return 0; }' > conftest.$ac_ext
+-  ac_cv_exeext=
+-  if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+-    for file in conftest.*; do
+-      case $file in
+-      *.c | *.o | *.obj) ;;
+-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
+-      esac
 +  echo "$as_me: program exited with status $ac_status" >&5
 +echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +( exit $ac_status )
 +ac_cv_header_stdc=no
- fi
++fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- 
- 
--enable_dlopen=no
--enable_win32_dll=yes
 +fi
++
++
 +fi
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
 +if test $ac_cv_header_stdc = yes; then
@@ -9689,132 +17907,19 @@
 +cat >>confdefs.h <<\_ACEOF
 +#define STDC_HEADERS 1
 +_ACEOF
- 
--# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
--if test "${enable_libtool_lock+set}" = set; then
--  enableval="$enable_libtool_lock"
--  :
- fi
- 
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
++
++fi
++
 +# On IRIX 5.3, sys/types and inttypes.h are conflicting.
- 
--# Some flags need to be propagated to the compiler or linker for good
--# libtool support.
--case $host in
--*-*-irix6*)
--  # Find out which ABI we are using.
--  echo '#line 2561 "configure"' > conftest.$ac_ext
--  if { (eval echo configure:2562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--    case `/usr/bin/file conftest.$ac_objext` in
--    *32-bit*)
--      LD="${LD-ld} -32"
--      ;;
--    *N32*)
--      LD="${LD-ld} -n32"
--      ;;
--    *64-bit*)
--      LD="${LD-ld} -64"
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
- 
--*-*-linux*)
--  # Test if the compiler is 64bit
--  echo 'int i;' > conftest.$ac_ext
--  lt_cv_cc_64bit_output=no
--  if { (eval echo configure:2582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--    case `/usr/bin/file conftest.$ac_objext` in
--    *"ELF 64"*)
--      lt_cv_cc_64bit_output=yes
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--  
--*-*-sco3.2v5*)
--  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
--  SAVE_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -belf"
--  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
--echo "configure:2597: checking whether the C compiler needs -belf" >&5
--if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  
--     ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
- 
--     cat > conftest.$ac_ext <<EOF
--#line 2610 "configure"
--#include "confdefs.h"
- 
--int main() {
- 
--; return 0; }
--EOF
--if { (eval echo configure:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  lt_cv_cc_needs_belf=yes
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  lt_cv_cc_needs_belf=no
--fi
--rm -f conftest*
--     ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
- 
--fi
- 
--echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
--  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
--    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
--    CFLAGS="$SAVE_CFLAGS"
--  fi
--  ;;
- 
--*-*-cygwin* | *-*-mingw* | *-*-pw32*)
--  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
--set dummy ${ac_tool_prefix}dlltool; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2647: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test -n "$DLLTOOL"; then
--  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
--else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--fi
--fi
--DLLTOOL="$ac_cv_prog_DLLTOOL"
--if test -n "$DLLTOOL"; then
--  echo "$ac_t""$DLLTOOL" 1>&6
--else
--  echo "$ac_t""no" 1>&6
 +
++
++
++
++
++
++
++
++
 +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 +		  inttypes.h stdint.h unistd.h
 +do
@@ -9847,27 +17952,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  eval "$as_ac_Header=yes"
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -9876,7 +17964,7 @@
 +	eval "$as_ac_Header=no"
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
@@ -9886,23 +17974,12 @@
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
 +
- fi
- 
++fi
++
 +done
- 
--if test -z "$ac_cv_prog_DLLTOOL"; then
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "dlltool", so it can be a program name with args.
--set dummy dlltool; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2679: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test -n "$DLLTOOL"; then
--  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 +
 +
++
 +for ac_header in dlfcn.h
 +do
 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -9941,27 +18018,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -9970,7 +18030,7 @@
 +	ac_header_compiler=no
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
 +
@@ -9997,43 +18057,17 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_DLLTOOL="dlltool"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
--fi
-+  ac_cpp_err=yes
- fi
--DLLTOOL="$ac_cv_prog_DLLTOOL"
--if test -n "$DLLTOOL"; then
--  echo "$ac_t""$DLLTOOL" 1>&6
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
--fi
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
--else
--  DLLTOOL="false"
++
 +  ac_header_preproc=no
- fi
++fi
 +
 +rm -f conftest.err conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -10081,14 +18115,8 @@
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
 +
- fi
- 
--  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
--set dummy ${ac_tool_prefix}as; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2714: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
++fi
++
 +done
 +
 +ac_ext=cpp
@@ -10109,29 +18137,17 @@
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 +if test "${ac_cv_prog_CXX+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if test -n "$AS"; then
--  ac_cv_prog_AS="$AS" # Let the user override the test.
++else
 +  if test -n "$CXX"; then
 +  ac_cv_prog_CXX="$CXX" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_AS="${ac_tool_prefix}as"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
++else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -10140,30 +18156,18 @@
 +done
 +IFS=$as_save_IFS
 +
- fi
- fi
--AS="$ac_cv_prog_AS"
--if test -n "$AS"; then
--  echo "$ac_t""$AS" 1>&6
++fi
++fi
 +CXX=$ac_cv_prog_CXX
 +if test -n "$CXX"; then
 +  { echo "$as_me:$LINENO: result: $CXX" >&5
 +echo "${ECHO_T}$CXX" >&6; }
- else
--  echo "$ac_t""no" 1>&6
++else
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
- fi
- 
- 
--if test -z "$ac_cv_prog_AS"; then
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "as", so it can be a program name with args.
--set dummy as; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2746: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
++fi
++
++
 +    test -n "$CXX" && break
 +  done
 +fi
@@ -10177,30 +18181,17 @@
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if test -n "$AS"; then
--  ac_cv_prog_AS="$AS" # Let the user override the test.
++else
 +  if test -n "$ac_ct_CXX"; then
 +  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_AS="as"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
++else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_CXX="$ac_prog"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -10209,24 +18200,18 @@
 +done
 +IFS=$as_save_IFS
 +
- fi
- fi
--AS="$ac_cv_prog_AS"
--if test -n "$AS"; then
--  echo "$ac_t""$AS" 1>&6
++fi
++fi
 +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 +if test -n "$ac_ct_CXX"; then
 +  { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 +echo "${ECHO_T}$ac_ct_CXX" >&6; }
- else
--  echo "$ac_t""no" 1>&6
++else
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
- fi
- 
--else
--  AS="false"
++fi
 +
++
 +  test -n "$ac_ct_CXX" && break
 +done
 +
@@ -10245,10 +18230,10 @@
 +esac
 +    CXX=$ac_ct_CXX
 +  fi
- fi
++fi
 +
 +  fi
- fi
++fi
 +# Provide some information about the compiler.
 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5
 +ac_compiler=`set X $ac_compile; echo $2`
@@ -10294,13 +18279,7 @@
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- 
--  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
--set dummy ${ac_tool_prefix}objdump; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2781: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
++
 +int
 +main ()
 +{
@@ -10325,27 +18304,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_compiler_gnu=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -10354,7 +18316,7 @@
 +	ac_compiler_gnu=no
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 +
 +fi
@@ -10400,31 +18362,12 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_cv_prog_cxx_g=yes
- else
--  if test -n "$OBJDUMP"; then
--  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
@@ -10457,44 +18400,12 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  :
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--fi
--fi
--OBJDUMP="$ac_cv_prog_OBJDUMP"
--if test -n "$OBJDUMP"; then
--  echo "$ac_t""$OBJDUMP" 1>&6
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
@@ -10528,71 +18439,27 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_cv_prog_cxx_g=yes
- else
--  echo "$ac_t""no" 1>&6
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
- fi
- 
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
- 
--if test -z "$ac_cv_prog_OBJDUMP"; then
--if test -n "$ac_tool_prefix"; then
--  # Extract the first word of "objdump", so it can be a program name with args.
--set dummy objdump; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2813: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test -n "$OBJDUMP"; then
--  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
--else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_OBJDUMP="objdump"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false"
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
- fi
--OBJDUMP="$ac_cv_prog_OBJDUMP"
--if test -n "$OBJDUMP"; then
--  echo "$ac_t""$OBJDUMP" 1>&6
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
 +if test "$ac_test_CXXFLAGS" = set; then
@@ -10603,14 +18470,13 @@
 +  else
 +    CXXFLAGS="-g"
 +  fi
- else
--  echo "$ac_t""no" 1>&6
++else
 +  if test "$GXX" = yes; then
 +    CXXFLAGS="-O2"
 +  else
 +    CXXFLAGS=
 +  fi
- fi
++fi
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10701,79 +18567,33 @@
 +      fi
 +    fi
 +  done
- 
++
 +  cd ..
 +  rm -rf conftest.dir
- else
--  OBJDUMP="false"
++else
 +  am_cv_CXX_dependencies_compiler_type=none
- fi
++fi
 +
- fi
++fi
 +{ echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
 +echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6; }
 +CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
- 
- 
--  # recent cygwin and mingw systems supply a stub DllMain which the user
--  # can override, but on older systems we have to supply one
--  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
--echo "configure:2849: checking if libtool should supply DllMain function" >&5
--if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 2854 "configure"
--#include "confdefs.h"
- 
--int main() {
--extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
--      DllMain (0, 0, 0);
--; return 0; }
--EOF
--if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  lt_cv_need_dllmain=no
++
++
++
 +if
 +  test "x$enable_dependency_tracking" != xno \
 +  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
 +  am__fastdepCXX_TRUE=
 +  am__fastdepCXX_FALSE='#'
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  lt_cv_need_dllmain=yes
--fi
--rm -f conftest*
++else
 +  am__fastdepCXX_TRUE='#'
 +  am__fastdepCXX_FALSE=
- fi
- 
--echo "$ac_t""$lt_cv_need_dllmain" 1>&6
- 
--  case $host/$CC in
--  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
--    # old mingw systems require "-dll" to link a DLL, while more recent ones
--    # require "-mdll"
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$CFLAGS -mdll"
--    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
--echo "configure:2883: checking how to link DLLs" >&5
--if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 2888 "configure"
--#include "confdefs.h"
- 
--int main() {
- 
--; return 0; }
--EOF
--if { (eval echo configure:2895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  lt_cv_cc_dll_switch=-mdll
++fi
++
++
++
++
 +if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
 +    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
 +    (test "X$CXX" != "Xg++"))) ; then
@@ -10787,11 +18607,7 @@
 +if test -z "$CXXCPP"; then
 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  lt_cv_cc_dll_switch=-dll
++else
 +      # Double quotes because CXXCPP needs to be expanded
 +    for CXXCPP in "$CXX -E" "/lib/cpp"
 +    do
@@ -10829,18 +18645,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  :
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -10848,34 +18656,10 @@
 +
 +  # Broken: fails on valid input.
 +continue
- fi
- 
--echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
--    CFLAGS="$SAVE_CFLAGS" ;;
--  *-*-cygwin* | *-*-pw32*)
--    # cygwin systems need to pass --dll to the linker, and not link
--    # crt.o which will require a WinMain at 16 definition.
--    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
--  esac
--  ;;
--  
--esac
++fi
++
 +rm -f conftest.err conftest.$ac_ext
- 
--# Sed substitution that helps us do robust quoting.  It backslashifies
--# metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
--sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
--
--# Same as above, but do not quote variable references.
--double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
--
--# Constants:
--rm="rm -f"
++
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
@@ -10898,79 +18682,38 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  # Broken: success on invalid input.
 +continue
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
--# Global variables:
--default_ofile=libtool
--can_build_shared=yes
++
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
- 
--# All known linkers require a `.a' archive for static linking (except M$VC,
--# which needs '.lib').
--libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
--ofile="$default_ofile"
--with_gnu_ld="$lt_cv_prog_gnu_ld"
--need_locks="$enable_libtool_lock"
++
 +rm -f conftest.err conftest.$ac_ext
- 
--old_CC="$CC"
--old_CFLAGS="$CFLAGS"
++
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then
 +  break
 +fi
- 
--# Set sane defaults for various variables
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
--test -z "$AS" && AS=as
--test -z "$CC" && CC=cc
--test -z "$DLLTOOL" && DLLTOOL=dlltool
--test -z "$LD" && LD=ld
--test -z "$LN_S" && LN_S="ln -s"
--test -z "$MAGIC_CMD" && MAGIC_CMD=file
--test -z "$NM" && NM=nm
--test -z "$OBJDUMP" && OBJDUMP=objdump
--test -z "$RANLIB" && RANLIB=:
--test -z "$STRIP" && STRIP=:
--test -z "$ac_objext" && ac_objext=o
-+    done
++
+     done
 +    ac_cv_prog_CXXCPP=$CXXCPP
- 
--if test x"$host" != x"$build"; then
--  ac_tool_prefix=${host_alias}-
++
 +fi
 +  CXXCPP=$ac_cv_prog_CXXCPP
- else
--  ac_tool_prefix=
++else
 +  ac_cv_prog_CXXCPP=$CXXCPP
- fi
--
--# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
--case $host_os in
--linux-gnu*) ;;
--linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
++fi
 +{ echo "$as_me:$LINENO: result: $CXXCPP" >&5
 +echo "${ECHO_T}$CXXCPP" >&6; }
 +ac_preproc_ok=false
@@ -10999,16 +18742,7 @@
 +case "(($ac_try" in
 +  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 +  *) ac_try_echo=$ac_try;;
- esac
--
--case $host_os in
--aix3*)
--  # AIX sometimes has problems with the GCC collect2 program.  For some
--  # reason, if we set the COLLECT_NAMES environment variable, the problems
--  # vanish in a puff of smoke.
--  if test "X${COLLECT_NAMES+set}" != Xset; then
--    COLLECT_NAMES=
--    export COLLECT_NAMES
++esac
 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 +  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 +  ac_status=$?
@@ -11016,65 +18750,21 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-   fi
--  ;;
--esac
--
--# Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
--old_postinstall_cmds='chmod 644 $oldlib'
--old_postuninstall_cmds=
--
--if test -n "$RANLIB"; then
--  case $host_os in
--  openbsd*)
--    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
--    ;;
--  *)
--    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
--    ;;
--  esac
--  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+else
-+  ac_cpp_err=yes
- fi
--
--# Allow CC to be a program name with arguments.
--set dummy $CC
--compiler="$2"
--
--echo $ac_n "checking for objdir""... $ac_c" 1>&6
--echo "configure:3009: checking for objdir" >&5
--rm -f .libs 2>/dev/null
--mkdir .libs 2>/dev/null
--if test -d .libs; then
--  objdir=.libs
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  :
- else
--  # MS-DOS does not allow filenames that begin with a dot.
--  objdir=_libs
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  # Broken: fails on valid input.
 +continue
- fi
--rmdir .libs 2>/dev/null
--echo "$ac_t""$objdir" 1>&6
- 
++fi
++
 +rm -f conftest.err conftest.$ac_ext
- 
--# Check whether --with-pic or --without-pic was given.
--if test "${with_pic+set}" = set; then
--  withval="$with_pic"
--  pic_mode="$withval"
++
 +  # OK, works on sane cases.  Now check whether nonexistent headers
 +  # can be detected and how.
 +  cat >conftest.$ac_ext <<_ACEOF
@@ -11097,108 +18787,23 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  pic_mode=default
-+  ac_cpp_err=yes
- fi
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  # Broken: success on invalid input.
 +continue
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
--test -z "$pic_mode" && pic_mode=default
--
--# We assume here that the value for lt_cv_prog_cc_pic will not be cached
--# in isolation, and that seeing it set (from the cache) indicates that
--# the associated values are set (in the cache) correctly too.
--echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
--echo "configure:3036: checking for $compiler option to produce PIC" >&5
--if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--   lt_cv_prog_cc_pic=
--  lt_cv_prog_cc_shlib=
--  lt_cv_prog_cc_wl=
--  lt_cv_prog_cc_static=
--  lt_cv_prog_cc_no_builtin=
--  lt_cv_prog_cc_can_build_shared=$can_build_shared
--
--  if test "$GCC" = yes; then
--    lt_cv_prog_cc_wl='-Wl,'
--    lt_cv_prog_cc_static='-static'
++
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
 +fi
- 
--    case $host_os in
--    aix*)
--      # Below there is a dirty hack to force normal static linking with -ldl
--      # The problem is because libdl dynamically linked with both libc and
--      # libC (AIX C++ library), which obviously doesn't included in libraries
--      # list by gcc. This cause undefined symbols with -static flags.
--      # This hack allows C programs to be linked with "-static -ldl", but
--      # not sure about C++ programs.
--      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
--      ;;
--    amigaos*)
--      # FIXME: we need at least 68020 code to build shared libraries, but
--      # adding the `-m68020' flag to GCC prevents building anything better,
--      # like `-m68040'.
--      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
--      ;;
--    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      lt_cv_prog_cc_pic='-fno-common'
--      ;;
--    cygwin* | mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_cv_prog_cc_pic='-DDLL_EXPORT'
--      ;;
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	 lt_cv_prog_cc_pic=-Kconform_pic
--      fi
--      ;;
--    *)
--      lt_cv_prog_cc_pic='-fPIC'
--      ;;
--    esac
--  else
--    # PORTME Check for PIC flags for the system compiler.
--    case $host_os in
--    aix3* | aix4* | aix5*)
--      lt_cv_prog_cc_wl='-Wl,'
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	lt_cv_prog_cc_static='-Bstatic'
--      else
--	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
--      fi
--      ;;
++
 +rm -f conftest.err conftest.$ac_ext
- 
--    hpux9* | hpux10* | hpux11*)
--      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
--      lt_cv_prog_cc_wl='-Wl,'
--      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
--      lt_cv_prog_cc_pic='+Z'
--      ;;
++
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.err conftest.$ac_ext
@@ -11211,41 +18816,22 @@
 +See \`config.log' for more details." >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
- 
--    irix5* | irix6* | nonstopux*)
--      lt_cv_prog_cc_wl='-Wl,'
--      lt_cv_prog_cc_static='-non_shared'
--      # PIC (with -KPIC) is the default.
--      ;;
++
 +ac_ext=cpp
 +ac_cpp='$CXXCPP $CPPFLAGS'
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
- 
--    cygwin* | mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_cv_prog_cc_pic='-DDLL_EXPORT'
--      ;;
++
 +fi
- 
--    newsos6)
--      lt_cv_prog_cc_pic='-KPIC'
--      lt_cv_prog_cc_static='-Bstatic'
--      ;;
- 
--    osf3* | osf4* | osf5*)
--      # All OSF/1 code is PIC.
--      lt_cv_prog_cc_wl='-Wl,'
--      lt_cv_prog_cc_static='-non_shared'
--      ;;
++
++
 +ac_ext=f
 +ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
 +ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_f77_compiler_gnu
 +if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
 +  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=$2
@@ -11263,7 +18849,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -11271,12 +18857,7 @@
 +done
 +done
 +IFS=$as_save_IFS
- 
--    sco3.2v5*)
--      lt_cv_prog_cc_pic='-Kpic'
--      lt_cv_prog_cc_static='-dn'
--      lt_cv_prog_cc_shlib='-belf'
--      ;;
++
 +fi
 +fi
 +F77=$ac_cv_prog_F77
@@ -11287,24 +18868,14 @@
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +fi
- 
--    solaris*)
--      lt_cv_prog_cc_pic='-KPIC'
--      lt_cv_prog_cc_static='-Bstatic'
--      lt_cv_prog_cc_wl='-Wl,'
--      ;;
- 
--    sunos4*)
--      lt_cv_prog_cc_pic='-PIC'
--      lt_cv_prog_cc_static='-Bstatic'
--      lt_cv_prog_cc_wl='-Qoption ld '
--      ;;
++
++
 +    test -n "$F77" && break
 +  done
 +fi
 +if test -z "$F77"; then
 +  ac_ct_F77=$F77
-+  for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
++  for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
 +do
 +  # Extract the first word of "$ac_prog", so it can be a program name with args.
 +set dummy $ac_prog; ac_word=$2
@@ -11322,7 +18893,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_F77="$ac_prog"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -11330,12 +18901,7 @@
 +done
 +done
 +IFS=$as_save_IFS
- 
--    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--      lt_cv_prog_cc_pic='-KPIC'
--      lt_cv_prog_cc_static='-Bstatic'
--      lt_cv_prog_cc_wl='-Wl,'
--      ;;
++
 +fi
 +fi
 +ac_ct_F77=$ac_cv_prog_ac_ct_F77
@@ -11346,28 +18912,15 @@
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +fi
- 
--    uts4*)
--      lt_cv_prog_cc_pic='-pic'
--      lt_cv_prog_cc_static='-Bstatic'
--      ;;
- 
--    sysv4*MP*)
--      if test -d /usr/nec ;then
--	lt_cv_prog_cc_pic='-Kconform_pic'
--	lt_cv_prog_cc_static='-Bstatic'
--      fi
--      ;;
++
++
 +  test -n "$ac_ct_F77" && break
 +done
- 
--    *)
--      lt_cv_prog_cc_can_build_shared=no
--      ;;
--    esac
++
 +  if test "x$ac_ct_F77" = x; then
 +    F77=""
-+  else
+   else
+-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
@@ -11380,27 +18933,11 @@
 +esac
 +    F77=$ac_ct_F77
    fi
--
+-  rm -f conftest*
+-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
  fi
- 
--if test -z "$lt_cv_prog_cc_pic"; then
--  echo "$ac_t""none" 1>&6
--else
--  echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
--
--  # Check to make sure the pic_flag actually works.
--  echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
--echo "configure:3184: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
--  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--      save_CFLAGS="$CFLAGS"
--    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
--    cat > conftest.$ac_ext <<EOF
--#line 3191 "configure"
--#include "confdefs.h"
- 
--int main() {
++
++
 +# Provide some information about the compiler.
 +echo "$as_me:$LINENO: checking for Fortran 77 compiler version" >&5
 +ac_compiler=`set X $ac_compile; echo $2`
@@ -11450,27 +18987,7 @@
 +#ifndef __GNUC__
 +       choke me
 +#endif
- 
--; return 0; }
--EOF
--if { (eval echo configure:3198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
--        case $host_os in
--      hpux9* | hpux10* | hpux11*)
--	# On HP-UX, both CC and GCC only warn that PIC is supported... then
--	# they create non-PIC objects.  So, if there were any warnings, we
--	# assume that PIC is not supported.
--	if test -s conftest.err; then
--	  lt_cv_prog_cc_pic_works=no
--	else
--	  lt_cv_prog_cc_pic_works=yes
--	fi
--	;;
--      *)
--	lt_cv_prog_cc_pic_works=yes
--	;;
--      esac
--    
++
 +      end
 +_ACEOF
 +rm -f conftest.$ac_objext
@@ -11486,27 +19003,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_compiler_gnu=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -11515,10 +19015,10 @@
 +	ac_compiler_gnu=no
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +ac_cv_f77_compiler_gnu=$ac_compiler_gnu
 +
-+fi
+ fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
 +echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6; }
 +ac_ext=$ac_save_ext
@@ -11533,7 +19033,11 @@
 +  FFLAGS=-g
 +cat >conftest.$ac_ext <<_ACEOF
 +      program main
-+
+ 
+-EXEEXT=""
+-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
+-echo "$ac_t""${ac_cv_exeext}" 1>&6
+-ac_exeext=$EXEEXT
 +      end
 +_ACEOF
 +rm -f conftest.$ac_objext
@@ -11549,50 +19053,23 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_cv_prog_f77_g=yes
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--        lt_cv_prog_cc_pic_works=no
--    
--fi
--rm -f conftest*
--    CFLAGS="$save_CFLAGS"
--  
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_prog_f77_g=no
- fi
  
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
- 
--  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
--    lt_cv_prog_cc_pic=
--    lt_cv_prog_cc_can_build_shared=no
+-if test $host != $build; then
+-  ac_tool_prefix=${host_alias}-
++	ac_cv_prog_f77_g=no
 +fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
 +echo "${ECHO_T}$ac_cv_prog_f77_g" >&6; }
 +if test "$ac_test_FFLAGS" = set; then
@@ -11600,61 +19077,27 @@
 +elif test $ac_cv_prog_f77_g = yes; then
 +  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
 +    FFLAGS="-g -O2"
-   else
--    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
++  else
 +    FFLAGS="-g"
-   fi
--
--  echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
--fi
--
--# Check for any special shared library compilation flags.
--if test -n "$lt_cv_prog_cc_shlib"; then
--  echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
--  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
-+else
++  fi
+ else
+-  ac_tool_prefix=
 +  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
 +    FFLAGS="-O2"
-   else
--   echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
--    lt_cv_prog_cc_can_build_shared=no
++  else
 +    FFLAGS=
-   fi
- fi
- 
--echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
--echo "configure:3250: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
--if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--    lt_cv_prog_cc_static_works=no
--  save_LDFLAGS="$LDFLAGS"
--  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
--  cat > conftest.$ac_ext <<EOF
--#line 3258 "configure"
--#include "confdefs.h"
++  fi
++fi
++
 +G77=`test $ac_compiler_gnu = yes && echo yes`
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--int main() {
- 
--; return 0; }
--EOF
--if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  lt_cv_prog_cc_static_works=yes
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--fi
--rm -f conftest*
--  LDFLAGS="$save_LDFLAGS"
- 
--fi
++
++
++
 +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
 +
 +# find the maximum length of command line arguments
@@ -11674,89 +19117,14 @@
 +    # check would be larger than it should be.
 +    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
 +    ;;
- 
++
 +  gnu*)
 +    # Under GNU Hurd, this test is not required because there is
 +    # no limit to the length of command line arguments.
 +    # Libtool will interpret -1 as no limit whatsoever
 +    lt_cv_sys_max_cmd_len=-1;
 +    ;;
- 
--# Belt *and* braces to stop my trousers falling down:
--test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
--echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
--
--pic_flag="$lt_cv_prog_cc_pic"
--special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
--wl="$lt_cv_prog_cc_wl"
--link_static_flag="$lt_cv_prog_cc_static"
--no_builtin_flag="$lt_cv_prog_cc_no_builtin"
--can_build_shared="$lt_cv_prog_cc_can_build_shared"
--
--
--# Check to see if options -o and -c are simultaneously supported by compiler
--echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
--echo "configure:3292: checking if $compiler supports -c -o file.$ac_objext" >&5
--if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  
--$rm -r conftest 2>/dev/null
--mkdir conftest
--cd conftest
--echo "int some_variable = 0;" > conftest.$ac_ext
--mkdir out
--# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
--# that will create temporary files in the current directory regardless of
--# the output directory.  Thus, making CWD read-only will cause this test
--# to fail, enabling locking or at least warning the user not to do parallel
--# builds.
--chmod -w .
--save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
--compiler_c_o=no
--if { (eval echo configure:3311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
--  # The compiler can only warn and ignore the option if not recognized
--  # So say no if there are warnings
--  if test -s out/conftest.err; then
--    lt_cv_compiler_c_o=no
--  else
--    lt_cv_compiler_c_o=yes
--  fi
--else
--  # Append any errors to the config.log.
--  cat out/conftest.err 1>&5
--  lt_cv_compiler_c_o=no
--fi
--CFLAGS="$save_CFLAGS"
--chmod u+w .
--$rm conftest* out/*
--rmdir out
--cd ..
--rmdir conftest
--$rm -r conftest 2>/dev/null
--
--fi
--
--compiler_c_o=$lt_cv_compiler_c_o
--echo "$ac_t""$compiler_c_o" 1>&6
--
--if test x"$compiler_c_o" = x"yes"; then
--  # Check to see if we can write to a .lo
--  echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
--echo "configure:3340: checking if $compiler supports -c -o file.lo" >&5
--  if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  
--  lt_cv_compiler_o_lo=no
--  save_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -c -o conftest.lo"
--  save_objext="$ac_objext"
--  ac_objext=lo
--  cat > conftest.$ac_ext <<EOF
--#line 3351 "configure"
--#include "confdefs.h"
++
 +  cygwin* | mingw*)
 +    # On Win9x/ME, this test blows up -- it succeeds, but takes
 +    # about 5 minutes as the teststring grows exponentially.
@@ -11767,30 +19135,7 @@
 +    # all of the supported platforms: 8192 (on NT/2K/XP).
 +    lt_cv_sys_max_cmd_len=8192;
 +    ;;
- 
--int main() {
--int some_variable = 0;
--; return 0; }
--EOF
--if { (eval echo configure:3358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
--      # The compiler can only warn and ignore the option if not recognized
--    # So say no if there are warnings
--    if test -s conftest.err; then
--      lt_cv_compiler_o_lo=no
--    else
--      lt_cv_compiler_o_lo=yes
--    fi
--  
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--fi
--rm -f conftest*
--  ac_objext="$save_objext"
--  CFLAGS="$save_CFLAGS"
--  
--fi
++
 +  amigaos*)
 +    # On AmigaOS with pdksh, this test takes hours, literally.
 +    # So we just punt and use a minimum line length of 8192.
@@ -11841,196 +19186,103 @@
 +    fi
 +    ;;
 +  *)
-+    # If test is not a shell built-in, we'll probably end up computing a
-+    # maximum length that is only half of the actual maximum length, but
-+    # we can't tell.
-+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+    while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
++    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++    if test -n "$lt_cv_sys_max_cmd_len"; then
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++    else
++      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++      while (test "X"`$SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
 +	       = "XX$teststring") >/dev/null 2>&1 &&
-+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+	    lt_cv_sys_max_cmd_len=$new_result &&
-+	    test $i != 17 # 1/2 MB should be enough
-+    do
-+      i=`expr $i + 1`
-+      teststring=$teststring$teststring
-+    done
-+    teststring=
-+    # Add a significant safety factor because C++ compilers can tack on massive
-+    # amounts of additional arguments before passing them to the linker.
-+    # It appears as though 1/2 is a usable value.
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++	      new_result=`expr "X$teststring" : ".*" 2>&1` &&
++	      lt_cv_sys_max_cmd_len=$new_result &&
++	      test $i != 17 # 1/2 MB should be enough
++      do
++        i=`expr $i + 1`
++        teststring=$teststring$teststring
++      done
++      teststring=
++      # Add a significant safety factor because C++ compilers can tack on massive
++      # amounts of additional arguments before passing them to the linker.
++      # It appears as though 1/2 is a usable value.
++      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++    fi
 +    ;;
 +  esac
- 
--  compiler_o_lo=$lt_cv_compiler_o_lo
--  echo "$ac_t""$compiler_o_lo" 1>&6
--else
--  compiler_o_lo=no
++
  fi
  
--# Check to see if we can do hard links to lock some files if needed
--hard_links="nottested"
--if test "$compiler_c_o" = no && test "$need_locks" != no; then
--  # do not overwrite the value of need_locks provided by the user
--  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
--echo "configure:3389: checking if we can lock with hard links" >&5
--  hard_links=yes
--  $rm conftest*
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  touch conftest.a
--  ln conftest.a conftest.b 2>&5 || hard_links=no
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  echo "$ac_t""$hard_links" 1>&6
--  if test "$hard_links" = no; then
--    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
--    need_locks=warn
--  fi
 +if test -n $lt_cv_sys_max_cmd_len ; then
 +  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
 +echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
- else
--  need_locks=no
++else
 +  { echo "$as_me:$LINENO: result: none" >&5
 +echo "${ECHO_T}none" >&6; }
- fi
- 
--if test "$GCC" = yes; then
--  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
--  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
--echo "configure:3408: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
--  echo "int some_variable = 0;" > conftest.$ac_ext
--  save_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
--  compiler_rtti_exceptions=no
--  cat > conftest.$ac_ext <<EOF
--#line 3414 "configure"
--#include "confdefs.h"
- 
--int main() {
--int some_variable = 0;
--; return 0; }
--EOF
--if { (eval echo configure:3421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
--      # The compiler can only warn and ignore the option if not recognized
--    # So say no if there are warnings
--    if test -s conftest.err; then
--      compiler_rtti_exceptions=no
--    else
--      compiler_rtti_exceptions=yes
--    fi
--  
++fi
 +
 +
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
+ 
+ 
+ 
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+-echo $ac_n "checking command to parse $NM output""... $ac_c" 1>&6
+-echo "configure:2048: checking command to parse $NM output" >&5
+-if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
 +echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
 +if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--fi
--rm -f conftest*
--  CFLAGS="$save_CFLAGS"
--  echo "$ac_t""$compiler_rtti_exceptions" 1>&6
+-  
++
+ # These are sane defaults that work on at least a few old systems.
+ # [They come from Ultrix.  What could be older than Ultrix?!! ;)]
  
--  if test "$compiler_rtti_exceptions" = "yes"; then
--    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
--  else
--    no_builtin_flag=' -fno-builtin'
--  fi
--fi
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+@@ -2058,14 +6668,11 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
--# See if the linker supports building shared libraries.
--echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
--echo "configure:3448: checking whether the linker ($LD) supports shared libraries" >&5
-+# Character class describing NM global symbol codes.
-+symcode='[BCDEGRST]'
- 
--allow_undefined_flag=
--no_undefined_flag=
--need_lib_prefix=unknown
--need_version=unknown
--# when you set need_version to no, make sure it does not cause -set_version
--# flags to be left without arguments
--archive_cmds=
--archive_expsym_cmds=
--old_archive_from_new_cmds=
--old_archive_from_expsyms_cmds=
--export_dynamic_flag_spec=
--whole_archive_flag_spec=
--thread_safe_flag_spec=
--hardcode_into_libs=no
--hardcode_libdir_flag_spec=
--hardcode_libdir_separator=
--hardcode_direct=no
--hardcode_minus_L=no
--hardcode_shlibpath_var=unsupported
--runpath_var=
--link_all_deplibs=unknown
--always_export_symbols=no
--export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
--# include_expsyms should be a list of space-separated symbols to be *always*
--# included in the symbol list
--include_expsyms=
--# exclude_expsyms can be an egrep regular expression of symbols to exclude
--# it will be wrapped by ` (' and `)$', so one must not match beginning or
--# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
--# as well as any symbol that contains `d'.
--exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
--# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
--# platforms (ab)use it in PIC code, but their linkers get confused if
--# the symbol is explicitly referenced.  Since portable code cannot
--# rely on this symbol name, it's probably fine to never include it in
--# preloaded symbol tables.
--extract_expsyms_cmds=
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
- 
-+# Transform an extracted symbol line into a proper C declaration
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+-lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
 +lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-+
-+# Transform an extracted symbol line into symbol name and symbol address
+ 
+ # Transform an extracted symbol line into symbol name and symbol address
+-lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 +lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+
-+# Define system-specific variables.
+ 
+ # Define system-specific variables.
  case $host_os in
-+aix*)
-+  symcode='[BCDT]'
-+  ;;
- cygwin* | mingw* | pw32*)
--  # FIXME: the MSVC++ port hasn't been tested in a loooong time
--  # When not using gcc, we currently assume that we are using
--  # Microsoft Visual C++.
--  if test "$GCC" != yes; then
--    with_gnu_ld=no
-+  symcode='[ABCDGISTW]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
+@@ -2076,8 +6683,18 @@
+   symcode='[ABCDGISTW]'
+   ;;
+ hpux*) # Its linker distinguishes data from code symbols
+-  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+-  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 +  if test "$host_cpu" = ia64; then
 +    symcode='[ABCDEGRST]'
-   fi
++  fi
 +  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 +  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
--openbsd*)
--  with_gnu_ld=no
++  ;;
 +linux* | k*bsd*-gnu)
 +  if test "$host_cpu" = ia64; then
 +    symcode='[ABCDGIRSTW]'
 +    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 +    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
 +  fi
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[BCDEGRST]'
-+  ;;
-+osf*)
-+  symcode='[BCDEGQRST]'
-+  ;;
+   ;;
+ irix* | nonstopux*)
+   symcode='[BCDEGRST]'
+@@ -2085,8 +6702,17 @@
+ osf*)
+   symcode='[BCDEGQRST]'
+   ;;
+-solaris* | sysv5*)
+-  symcode='[BDT]'
 +solaris*)
 +  symcode='[BDRT]'
 +  ;;
@@ -12042,359 +19294,166 @@
 +  ;;
 +sysv5* | sco5v6* | unixware* | OpenUNIX*)
 +  symcode='[ABDT]'
-+  ;;
-+sysv4)
-+  symcode='[DFNSTU]'
    ;;
- esac
+ sysv4)
+   symcode='[DFNSTU]'
+@@ -2095,25 +6721,30 @@
  
--ld_shlibs=yes
--if test "$with_gnu_ld" = yes; then
--  # If archive_cmds runs LD, not CC, wlarc should be empty
--  wlarc='${wl}'
-+# Handle CRLF in mingw tool chain
-+opt_cr=
+ # Handle CRLF in mingw tool chain
+ opt_cr=
+-case $host_os in
 +case $build_os in
-+mingw*)
-+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
+ mingw*)
+   opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+   ;;
+ esac
  
--  # See if GNU ld supports shared libraries.
--  case $host_os in
--  aix3* | aix4* | aix5*)
--    # On AIX, the GNU linker is very broken
--    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
--    ld_shlibs=no
--    cat <<EOF 1>&2
-+# If we're using GNU nm, then use its standard symbol codes.
+ # If we're using GNU nm, then use its standard symbol codes.
+-if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
+-  symcode='[ABCDGISTW]'
+-fi
 +case `$NM -V 2>&1` in
 +*GNU* | *'with BFD'*)
 +  symcode='[ABCDGIRSTW]' ;;
 +esac
  
--*** Warning: the GNU linker, at least up to release 2.9.1, is reported
--*** to be unable to reliably create shared libraries on AIX.
--*** Therefore, libtool is disabling shared libraries support.  If you
--*** really care for shared libraries, you may want to modify your PATH
--*** so that a non-GNU linker is found, and then restart.
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
  
--EOF
--    ;;
 +  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
 +  symxfrm="\\1 $ac_symprfx\\2 \\2"
- 
--  amigaos*)
--    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_minus_L=yes
--
--    # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
--    # that the semantics of dynamic libraries on AmigaOS, at least up
--    # to version 4, is to share data among multiple programs linked
--    # with the same dynamic library.  Since this doesn't match the
--    # behavior of shared libraries on other platforms, we can use
--    # them.
--    ld_shlibs=no
--    ;;
-+  # Write the raw and C identifiers.
++
+   # Write the raw and C identifiers.
+-lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
 +  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
  
--  beos*)
--    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--      allow_undefined_flag=unsupported
--      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
--      # support --undefined.  This deserves some investigation.  FIXME
--      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--    else
--      ld_shlibs=no
--    fi
--    ;;
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
+   # Check to see that the pipe works correctly.
+   pipe_works=no
++
+   rm -f conftest*
+   cat > conftest.$ac_ext <<EOF
+ #ifdef __cplusplus
+@@ -2127,10 +6758,18 @@
+ int main(){nm_test_var='a';nm_test_func();return(0);}
+ EOF
  
--  cygwin* | mingw* | pw32*)
--    # hardcode_libdir_flag_spec is actually meaningless, as there is
--    # no search path for DLLs.
--    hardcode_libdir_flag_spec='-L$libdir'
--    allow_undefined_flag=unsupported
--    always_export_symbols=yes
--
--    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
--      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
--      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
--      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
--      else $CC -o impgen impgen.c ; fi)~
--      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
--
--    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
--
--    # cygwin and mingw dlls have different entry points and sets of symbols
--    # to exclude.
--    # FIXME: what about values for MSVC?
--    dll_entry=__cygwin_dll_entry at 12
--    dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12~
--    case $host_os in
--    mingw*)
--      # mingw values
--      dll_entry=_DllMainCRTStartup at 12
--      dll_exclude_symbols=DllMain at 12,DllMainCRTStartup at 12,DllEntryPoint at 12~
--      ;;
--    esac
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
- 
--    # mingw and cygwin differ, and it's simplest to just exclude the union
--    # of the two symbol sets.
--    dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12,DllMainCRTStartup at 12,DllEntryPoint at 12
--
--    # recent cygwin and mingw systems supply a stub DllMain which the user
--    # can override, but on older systems we have to supply one (in ltdll.c)
--    if test "x$lt_cv_need_dllmain" = "xyes"; then
--      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
--      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
--	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
--    else
--      ltdll_obj=
--      ltdll_cmds=
--    fi
+-  if { (eval echo configure:2131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }; then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
+     # Now try to grab the symbols.
+     nlist=conftest.nm
+-    if { (eval echo configure:2134: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then
 +    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
 +  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
+       # Try sorting and uniquifying the output.
+       if sort "$nlist" | uniq > "$nlist"T; then
+ 	mv -f "$nlist"T "$nlist"
+@@ -2139,8 +6778,8 @@
+       fi
  
--    # Extract the symbol export list from an `--export-all' def file,
--    # then regenerate the def file from the symbol export list, so that
--    # the compiled dll only exports the symbol export list.
--    # Be careful not to strip the DATA tag left be newer dlltools.
--    export_symbols_cmds="$ltdll_cmds"'
--      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
--      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
--
--    # If the export-symbols file already is a .def file (1st line
--    # is EXPORTS), use it as is.
--    # If DATA tags from a recent dlltool are present, honour them!
--    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
--	cp $export_symbols $output_objdir/$soname-def;
--      else
--	echo EXPORTS > $output_objdir/$soname-def;
--	_lt_hint=1;
--	cat $export_symbols | while read symbol; do
--	 set dummy \$symbol;
--	 case \$# in
--	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
--	   4) echo "   \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
--	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
--	 esac;
--	 _lt_hint=`expr 1 + \$_lt_hint`;
--	done;
--      fi~
--      '"$ltdll_cmds"'
--      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
--      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
--      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
--      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
--      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
--    ;;
-+      # Make sure that we snagged all the symbols we need.
+       # Make sure that we snagged all the symbols we need.
+-      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
+-	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
 +      if grep ' nm_test_var$' "$nlist" >/dev/null; then
 +	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
+ 	  cat <<EOF > conftest.$ac_ext
+ #ifdef __cplusplus
+ extern "C" {
+@@ -2148,27 +6787,27 @@
  
--  netbsd*)
--    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
--      wlarc=
--    else
--      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--    fi
--    ;;
-+EOF
-+	  # Now generate the symbol file.
+ EOF
+ 	  # Now generate the symbol file.
+-	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
 +	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
  
--  solaris* | sysv5*)
--    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
--      ld_shlibs=no
--      cat <<EOF 1>&2
-+	  cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
+ 	  cat <<EOF >> conftest.$ac_ext
+ #if defined (__STDC__) && __STDC__
+-# define lt_ptr void *
 +# define lt_ptr_t void *
-+#else
+ #else
+-# define lt_ptr char *
 +# define lt_ptr_t char *
-+# define const
-+#endif
+ # define const
+ #endif
  
--*** Warning: The releases 2.8.* of the GNU linker cannot reliably
--*** create shared libraries on Solaris systems.  Therefore, libtool
--*** is disabling shared libraries support.  We urge you to upgrade GNU
--*** binutils to release 2.9.1 or newer.  Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
+ /* The mapping between symbol names and symbols. */
+ const struct {
+   const char *name;
+-  lt_ptr address;
 +  lt_ptr_t address;
-+}
-+lt_preloaded_symbols[] =
-+{
-+EOF
+ }
+ lt_preloaded_symbols[] =
+ {
+ EOF
+-	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
 +	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-+	  cat <<\EOF >> conftest.$ac_ext
+ 	  cat <<\EOF >> conftest.$ac_ext
+-  {0, (lt_ptr) 0}
 +  {0, (lt_ptr_t) 0}
-+};
+ };
  
-+#ifdef __cplusplus
-+}
-+#endif
+ #ifdef __cplusplus
+@@ -2177,15 +6816,19 @@
  EOF
--    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
+ 	  # Now try linking the two files.
+ 	  mv conftest.$ac_objext conftstm.$ac_objext
+-	  save_LIBS="$LIBS"
+-	  save_CFLAGS="$CFLAGS"
 +	  lt_save_LIBS="$LIBS"
 +	  lt_save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
+ 	  LIBS="conftstm.$ac_objext"
+-	  CFLAGS="$CFLAGS$no_builtin_flag"
+-	  if { (eval echo configure:2185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest$ac_exeext; then
 +	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 +	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-+	    pipe_works=yes
-+	  fi
+ 	    pipe_works=yes
+ 	  fi
+-	  LIBS="$save_LIBS"
+-	  CFLAGS="$save_CFLAGS"
 +	  LIBS="$lt_save_LIBS"
 +	  CFLAGS="$lt_save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&5
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&5
-+      fi
-     else
--      ld_shlibs=no
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-     fi
--    ;;
-+  else
-+    echo "$progname: failed program was:" >&5
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -f conftest* conftst*
+ 	else
+ 	  echo "cannot find nm_test_func in $nlist" >&5
+ 	fi
+@@ -2211,97 +6854,448 @@
  
--  sunos4*)
--    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--    wlarc=
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    ;;
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
+ fi
  
--  *)
--    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--    else
--      ld_shlibs=no
--    fi
--    ;;
--  esac
-+fi
- 
--  if test "$ld_shlibs" = yes; then
--    runpath_var=LD_RUN_PATH
--    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec='${wl}--export-dynamic'
--    case $host_os in
--    cygwin* | mingw* | pw32*)
--      # dlltool doesn't understand --whole-archive et. al.
--      whole_archive_flag_spec=
--      ;;
--    *)
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
--	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--	whole_archive_flag_spec=
--      fi
--      ;;
--    esac
--  fi
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+-global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
+ if test -z "$lt_cv_sys_global_symbol_pipe"; then
+-  global_symbol_to_cdecl=
+-  global_symbol_to_c_name_address=
 +  lt_cv_sys_global_symbol_to_cdecl=
 +fi
 +if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
 +  { echo "$as_me:$LINENO: result: failed" >&5
 +echo "${ECHO_T}failed" >&6; }
  else
--  # PORTME fill in a description of your system's linker (not GNU ld)
--  case $host_os in
--  aix3*)
--    allow_undefined_flag=unsupported
--    always_export_symbols=yes
--    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
--    # Note: this linker hardcodes the directories in LIBPATH if there
--    # are no directories specified by -L.
--    hardcode_minus_L=yes
--    if test "$GCC" = yes && test -z "$link_static_flag"; then
--      # Neither direct hardcoding nor static linking is supported with a
--      # broken collect2.
--      hardcode_direct=unsupported
--    fi
--    ;;
+-  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
+-  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
 +  { echo "$as_me:$LINENO: result: ok" >&5
 +echo "${ECHO_T}ok" >&6; }
-+fi
- 
--  aix4* | aix5*)
--    if test "$host_cpu" = ia64; then
--      # On IA64, the linker does run time linking by default, so we don't
--      # have to do anything special.
--      aix_use_runtimelinking=no
--      exp_sym_flag='-Bexport'
--      no_entry_flag=""
+ fi
+-if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
+-then
+-  echo "$ac_t""failed" 1>&6
++
 +{ echo "$as_me:$LINENO: checking for objdir" >&5
 +echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
 +if test "${lt_cv_objdir+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  echo "$ac_t""ok" 1>&6
 +  rm -f .libs 2>/dev/null
 +mkdir .libs 2>/dev/null
 +if test -d .libs; then
@@ -12402,17 +19461,18 @@
 +else
 +  # MS-DOS does not allow filenames that begin with a dot.
 +  lt_cv_objdir=_libs
-+fi
+ fi
 +rmdir .libs 2>/dev/null
 +fi
 +{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
 +echo "${ECHO_T}$lt_cv_objdir" >&6; }
 +objdir=$lt_cv_objdir
+ 
+-for ac_hdr in dlfcn.h
 +
 +
 +
 +
-+
 +case $host_os in
 +aix3*)
 +  # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -12467,11 +19527,16 @@
 +else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
-+do
+ do
+-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:2234: checking for $ac_hdr" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_AR="${ac_tool_prefix}ar"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -12486,7 +19551,18 @@
 +if test -n "$AR"; then
 +  { echo "$as_me:$LINENO: result: $AR" >&5
 +echo "${ECHO_T}$AR" >&6; }
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 2239 "configure"
+-#include "confdefs.h"
+-#include <$ac_hdr>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=yes"
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +fi
@@ -12501,7 +19577,12 @@
 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 +if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
 +  if test -n "$ac_ct_AR"; then
 +  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 +else
@@ -12511,7 +19592,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_AR="ar"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -12520,13 +19601,22 @@
 +done
 +IFS=$as_save_IFS
 +
-+fi
-+fi
+ fi
+-rm -f conftest*
+ fi
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_hdr 1
+-EOF
+- 
 +ac_ct_AR=$ac_cv_prog_ac_ct_AR
 +if test -n "$ac_ct_AR"; then
 +  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
 +echo "${ECHO_T}$ac_ct_AR" >&6; }
-+else
+ else
+-  echo "$ac_t""no" 1>&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +fi
@@ -12567,7 +19657,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -12607,7 +19697,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_RANLIB="ranlib"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -12617,7 +19707,7 @@
 +IFS=$as_save_IFS
 +
 +fi
-+fi
+ fi
 +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 +if test -n "$ac_ct_RANLIB"; then
 +  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
@@ -12663,15 +19753,15 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
 +  fi
 +done
-+done
+ done
 +IFS=$as_save_IFS
-+
+ 
 +fi
 +fi
 +STRIP=$ac_cv_prog_STRIP
@@ -12682,8 +19772,8 @@
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
 +fi
-+
-+
+ 
+ 
 +fi
 +if test -z "$ac_cv_prog_STRIP"; then
 +  ac_ct_STRIP=$STRIP
@@ -12703,7 +19793,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_STRIP="strip"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -12711,7 +19801,7 @@
 +done
 +done
 +IFS=$as_save_IFS
-+
+ 
 +fi
 +fi
 +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
@@ -12765,7 +19855,7 @@
 +test -z "$ac_objext" && ac_objext=o
 +
 +# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
 +old_postinstall_cmds='chmod 644 $oldlib'
 +old_postuninstall_cmds=
 +
@@ -12790,163 +19880,585 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
-+
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+ 
+ 
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+-    echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6
+-echo "configure:2280: checking for ${ac_tool_prefix}file" >&5
+-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
 +echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $MAGIC_CMD in
+ else
+   case $MAGIC_CMD in
+-  /*)
 +[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
+   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+   ;;
+-  ?:/*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC_CMD="$MAGIC_CMD"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="/usr/bin:$PATH"
 +*)
 +  lt_save_MAGIC_CMD="$MAGIC_CMD"
 +  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 +  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
+   for ac_dir in $ac_dummy; do
 +    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/${ac_tool_prefix}file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/${ac_tool_prefix}file; then
+       lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
 +	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
 +	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool at gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
+ 	    :
+ 	  else
+ 	    cat <<EOF 1>&2
+@@ -2322,48 +7316,48 @@
+       break
+     fi
+   done
+-  IFS="$ac_save_ifs"
+-  MAGIC_CMD="$ac_save_MAGIC_CMD"
 +  IFS="$lt_save_ifs"
 +  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
+   ;;
+ esac
+ fi
+ 
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  echo "$ac_t""$MAGIC_CMD" 1>&6
 +  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 +echo "${ECHO_T}$MAGIC_CMD" >&6; }
-+else
+ else
+-  echo "$ac_t""no" 1>&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
+ fi
+ 
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+   if test -n "$ac_tool_prefix"; then
+-    echo $ac_n "checking for file""... $ac_c" 1>&6
+-echo "configure:2342: checking for file" >&5
+-if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +    { echo "$as_me:$LINENO: checking for file" >&5
 +echo $ECHO_N "checking for file... $ECHO_C" >&6; }
 +if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  case $MAGIC_CMD in
+ else
+   case $MAGIC_CMD in
+-  /*)
 +[\\/*] |  ?:[\\/]*)
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-+  ;;
+   lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+   ;;
+-  ?:/*)
+-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
+-  ;;
+-  *)
+-  ac_save_MAGIC_CMD="$MAGIC_CMD"
+-  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="/usr/bin:$PATH"
 +*)
 +  lt_save_MAGIC_CMD="$MAGIC_CMD"
 +  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
 +  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-+  for ac_dir in $ac_dummy; do
+   for ac_dir in $ac_dummy; do
 +    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/file; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/file; then
+       lt_cv_path_MAGIC_CMD="$ac_dir/file"
+       if test -n "$file_magic_test_file"; then
+ 	case $deplibs_check_method in
+ 	"file_magic "*)
+-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
 +	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ 	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ 	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+-	    egrep "$file_magic_regex" > /dev/null; then
 +	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
-+
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool at gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
+ 	    :
+ 	  else
+ 	    cat <<EOF 1>&2
+@@ -2384,17 +7378,19 @@
+       break
+     fi
+   done
+-  IFS="$ac_save_ifs"
+-  MAGIC_CMD="$ac_save_MAGIC_CMD"
 +  IFS="$lt_save_ifs"
 +  MAGIC_CMD="$lt_save_MAGIC_CMD"
-+  ;;
-+esac
-+fi
-+
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
+   ;;
+ esac
+ fi
+ 
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if test -n "$MAGIC_CMD"; then
+-  echo "$ac_t""$MAGIC_CMD" 1>&6
 +  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
 +echo "${ECHO_T}$MAGIC_CMD" >&6; }
-+else
+ else
+-  echo "$ac_t""no" 1>&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+
-+  fi
-+  ;;
-+esac
-+
-+enable_dlopen=no
-+enable_win32_dll=yes
-+
+ fi
+ 
+   else
+@@ -2406,1110 +7402,646 @@
+   ;;
+ esac
+ 
+-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2413: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$RANLIB"; then
+-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-fi
+-fi
+-RANLIB="$ac_cv_prog_RANLIB"
+-if test -n "$RANLIB"; then
+-  echo "$ac_t""$RANLIB" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-
+-if test -z "$ac_cv_prog_RANLIB"; then
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "ranlib", so it can be a program name with args.
+-set dummy ranlib; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2445: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$RANLIB"; then
+-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_RANLIB="ranlib"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
+-fi
+-fi
+-RANLIB="$ac_cv_prog_RANLIB"
+-if test -n "$RANLIB"; then
+-  echo "$ac_t""$RANLIB" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-else
+-  RANLIB=":"
+-fi
+-fi
+-
+-# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}strip; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2480: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-fi
+-fi
+-STRIP="$ac_cv_prog_STRIP"
+-if test -n "$STRIP"; then
+-  echo "$ac_t""$STRIP" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-
+-if test -z "$ac_cv_prog_STRIP"; then
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "strip", so it can be a program name with args.
+-set dummy strip; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2512: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$STRIP"; then
+-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_STRIP="strip"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_prog_STRIP" && ac_cv_prog_STRIP=":"
+-fi
+-fi
+-STRIP="$ac_cv_prog_STRIP"
+-if test -n "$STRIP"; then
+-  echo "$ac_t""$STRIP" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-else
+-  STRIP=":"
+-fi
+-fi
+-
+-
+ enable_dlopen=no
+ enable_win32_dll=yes
+ 
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
 +# Check whether --enable-libtool-lock was given.
-+if test "${enable_libtool_lock+set}" = set; then
+ if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
+-  :
 +  enableval=$enable_libtool_lock;
-+fi
-+
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+
-+
+ fi
+ 
+ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+ 
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case $host in
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '#line 2561 "configure"' > conftest.$ac_ext
+-  if { (eval echo configure:2562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+ 
+-*-*-linux*)
+-  # Test if the compiler is 64bit
+-  echo 'int i;' > conftest.$ac_ext
+-  lt_cv_cc_64bit_output=no
+-  if { (eval echo configure:2582: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-    case `/usr/bin/file conftest.$ac_objext` in
+-    *"ELF 64"*)
+-      lt_cv_cc_64bit_output=yes
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+-  
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
+-echo "configure:2597: checking whether the C compiler needs -belf" >&5
+-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  
+-     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-     cat > conftest.$ac_ext <<EOF
+-#line 2610 "configure"
+-#include "confdefs.h"
+-
+-int main() {
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  lt_cv_cc_needs_belf=yes
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  lt_cv_cc_needs_belf=no
+-fi
+-rm -f conftest*
+-     ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-fi
+-
+-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
+-
+-*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2647: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$DLLTOOL"; then
+-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-fi
+-fi
+-DLLTOOL="$ac_cv_prog_DLLTOOL"
+-if test -n "$DLLTOOL"; then
+-  echo "$ac_t""$DLLTOOL" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-
+-if test -z "$ac_cv_prog_DLLTOOL"; then
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "dlltool", so it can be a program name with args.
+-set dummy dlltool; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2679: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$DLLTOOL"; then
+-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_DLLTOOL="dlltool"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
+-fi
+-fi
+-DLLTOOL="$ac_cv_prog_DLLTOOL"
+-if test -n "$DLLTOOL"; then
+-  echo "$ac_t""$DLLTOOL" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-else
+-  DLLTOOL="false"
+-fi
+-fi
+-
+-  # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}as; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2714: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$AS"; then
+-  ac_cv_prog_AS="$AS" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_AS="${ac_tool_prefix}as"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-fi
+-fi
+-AS="$ac_cv_prog_AS"
+-if test -n "$AS"; then
+-  echo "$ac_t""$AS" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-
+-if test -z "$ac_cv_prog_AS"; then
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "as", so it can be a program name with args.
+-set dummy as; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2746: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$AS"; then
+-  ac_cv_prog_AS="$AS" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_AS="as"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
+-fi
+-fi
+-AS="$ac_cv_prog_AS"
+-if test -n "$AS"; then
+-  echo "$ac_t""$AS" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-else
+-  AS="false"
+-fi
+-fi
+-
+-  # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
+-set dummy ${ac_tool_prefix}objdump; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2781: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$OBJDUMP"; then
+-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-fi
+-fi
+-OBJDUMP="$ac_cv_prog_OBJDUMP"
+-if test -n "$OBJDUMP"; then
+-  echo "$ac_t""$OBJDUMP" 1>&6
 +# Check whether --with-pic was given.
 +if test "${with_pic+set}" = set; then
 +  withval=$with_pic; pic_mode="$withval"
-+else
+ else
+-  echo "$ac_t""no" 1>&6
 +  pic_mode=default
-+fi
-+
+ fi
+ 
 +test -z "$pic_mode" && pic_mode=default
-+
+ 
+-if test -z "$ac_cv_prog_OBJDUMP"; then
+-if test -n "$ac_tool_prefix"; then
+-  # Extract the first word of "objdump", so it can be a program name with args.
+-set dummy objdump; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2813: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$OBJDUMP"; then
+-  ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_OBJDUMP="objdump"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_prog_OBJDUMP" && ac_cv_prog_OBJDUMP="false"
+-fi
+-fi
+-OBJDUMP="$ac_cv_prog_OBJDUMP"
+-if test -n "$OBJDUMP"; then
+-  echo "$ac_t""$OBJDUMP" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
 +# Use C for the default configuration in the libtool script
 +tagname=
 +lt_save_CC="$CC"
@@ -12955,61 +20467,194 @@
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
+ 
+-else
+-  OBJDUMP="false"
+-fi
+-fi
+ 
 +# Source file extension for C test sources.
 +ac_ext=c
-+
+ 
+-  # recent cygwin and mingw systems supply a stub DllMain which the user
+-  # can override, but on older systems we have to supply one
+-  echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6
+-echo "configure:2849: checking if libtool should supply DllMain function" >&5
+-if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 2854 "configure"
+-#include "confdefs.h"
 +# Object file extension for compiled C test sources.
 +objext=o
 +objext=$objext
-+
+ 
+-int main() {
+-extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
+-      DllMain (0, 0, 0);
+-; return 0; }
+-EOF
+-if { (eval echo configure:2862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  lt_cv_need_dllmain=no
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  lt_cv_need_dllmain=yes
+-fi
+-rm -f conftest*
+-fi
 +# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
++lt_simple_compile_test_code="int some_variable = 0;"
+ 
+-echo "$ac_t""$lt_cv_need_dllmain" 1>&6
 +# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}\n'
-+
-+
++lt_simple_link_test_code='int main(){return(0);}'
+ 
+-  case $host/$CC in
+-  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
+-    # old mingw systems require "-dll" to link a DLL, while more recent ones
+-    # require "-mdll"
+-    SAVE_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS -mdll"
+-    echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6
+-echo "configure:2883: checking how to link DLLs" >&5
+-if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 2888 "configure"
+-#include "confdefs.h"
+ 
+-int main() {
 +# If no C compiler was specified, use CC.
 +LTCC=${LTCC-"$CC"}
-+
+ 
+-; return 0; }
+-EOF
+-if { (eval echo configure:2895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  lt_cv_cc_dll_switch=-mdll
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  lt_cv_cc_dll_switch=-dll
+-fi
+-rm -f conftest*
+-fi
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
-+
+ 
+-echo "$ac_t""$lt_cv_cc_dll_switch" 1>&6
+-    CFLAGS="$SAVE_CFLAGS" ;;
+-  *-*-cygwin* | *-*-pw32*)
+-    # cygwin systems need to pass --dll to the linker, and not link
+-    # crt.o which will require a WinMain at 16 definition.
+-    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
+-  esac
+-  ;;
+-  
+-esac
 +# Allow CC to be a program name with arguments.
 +compiler=$CC
-+
-+
+ 
+-# Sed substitution that helps us do robust quoting.  It backslashifies
+-# metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
+-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
+ 
+-# Same as above, but do not quote variable references.
+-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
-+
+ 
+-# Sed substitution to delay expansion of an escaped shell variable in a
+-# double_quote_subst'ed string.
+-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
 +ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
-+
-+
-+
+ 
+-# Constants:
+-rm="rm -f"
+ 
+-# Global variables:
+-default_ofile=libtool
+-can_build_shared=yes
+ 
+-# All known linkers require a `.a' archive for static linking (except M$VC,
+-# which needs '.lib').
+-libext=a
+-ltmain="$ac_aux_dir/ltmain.sh"
+-ofile="$default_ofile"
+-with_gnu_ld="$lt_cv_prog_gnu_ld"
+-need_locks="$enable_libtool_lock"
 +lt_prog_compiler_no_builtin_flag=
-+
+ 
+-old_CC="$CC"
+-old_CFLAGS="$CFLAGS"
 +if test "$GCC" = yes; then
 +  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-+
-+
+ 
+-# Set sane defaults for various variables
+-test -z "$AR" && AR=ar
+-test -z "$AR_FLAGS" && AR_FLAGS=cru
+-test -z "$AS" && AS=as
+-test -z "$CC" && CC=cc
+-test -z "$DLLTOOL" && DLLTOOL=dlltool
+-test -z "$LD" && LD=ld
+-test -z "$LN_S" && LN_S="ln -s"
+-test -z "$MAGIC_CMD" && MAGIC_CMD=file
+-test -z "$NM" && NM=nm
+-test -z "$OBJDUMP" && OBJDUMP=objdump
+-test -z "$RANLIB" && RANLIB=:
+-test -z "$STRIP" && STRIP=:
+-test -z "$ac_objext" && ac_objext=o
+ 
+-if test x"$host" != x"$build"; then
+-  ac_tool_prefix=${host_alias}-
 +{ echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 +echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
 +if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  ac_tool_prefix=
+-fi
+-
+-# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
+-case $host_os in
+-linux-gnu*) ;;
+-linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
+-esac
+-
+-case $host_os in
+-aix3*)
+-  # AIX sometimes has problems with the GCC collect2 program.  For some
+-  # reason, if we set the COLLECT_NAMES environment variable, the problems
+-  # vanish in a puff of smoke.
+-  if test "X${COLLECT_NAMES+set}" != Xset; then
+-    COLLECT_NAMES=
+-    export COLLECT_NAMES
+-  fi
+-  ;;
+-esac
+-
+-# Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+-old_postinstall_cmds='chmod 644 $oldlib'
+-old_postuninstall_cmds=
 +  lt_cv_prog_compiler_rtti_exceptions=no
 +  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +   lt_compiler_flag="-fno-rtti -fno-exceptions"
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
@@ -13020,11 +20665,11 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:7765: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7498: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:7769: \$? = $ac_status" >&5
++   echo "$as_me:7502: \$? = $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 other than the usual output.
@@ -13035,63 +20680,127 @@
 +     fi
 +   fi
 +   $rm conftest*
-+
-+fi
+ 
+-if test -n "$RANLIB"; then
+-  case $host_os in
+-  openbsd*)
+-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  *)
+-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+-    ;;
+-  esac
+-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
 +echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
-+
+ 
+-# Allow CC to be a program name with arguments.
+-set dummy $CC
+-compiler="$2"
+-
+-echo $ac_n "checking for objdir""... $ac_c" 1>&6
+-echo "configure:3009: checking for objdir" >&5
+-rm -f .libs 2>/dev/null
+-mkdir .libs 2>/dev/null
+-if test -d .libs; then
+-  objdir=.libs
 +if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
 +    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-+else
+ else
+-  # MS-DOS does not allow filenames that begin with a dot.
+-  objdir=_libs
 +    :
-+fi
-+
-+fi
-+
+ fi
+-rmdir .libs 2>/dev/null
+-echo "$ac_t""$objdir" 1>&6
+-
+ 
+-# Check whether --with-pic or --without-pic was given.
+-if test "${with_pic+set}" = set; then
+-  withval="$with_pic"
+-  pic_mode="$withval"
+-else
+-  pic_mode=default
+ fi
+ 
+-test -z "$pic_mode" && pic_mode=default
 +lt_prog_compiler_wl=
 +lt_prog_compiler_pic=
 +lt_prog_compiler_static=
-+
+ 
+-# We assume here that the value for lt_cv_prog_cc_pic will not be cached
+-# in isolation, and that seeing it set (from the cache) indicates that
+-# the associated values are set (in the cache) correctly too.
+-echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6
+-echo "configure:3036: checking for $compiler option to produce PIC" >&5
+-if eval "test \"`echo '$''{'lt_cv_prog_cc_pic'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-   lt_cv_prog_cc_pic=
+-  lt_cv_prog_cc_shlib=
+-  lt_cv_prog_cc_wl=
+-  lt_cv_prog_cc_static=
+-  lt_cv_prog_cc_no_builtin=
+-  lt_cv_prog_cc_can_build_shared=$can_build_shared
 +{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
 +echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
-+
-+  if test "$GCC" = yes; then
+ 
+   if test "$GCC" = yes; then
+-    lt_cv_prog_cc_wl='-Wl,'
+-    lt_cv_prog_cc_static='-static'
 +    lt_prog_compiler_wl='-Wl,'
 +    lt_prog_compiler_static='-static'
-+
-+    case $host_os in
+ 
+     case $host_os in
+-    aix*)
+-      # Below there is a dirty hack to force normal static linking with -ldl
+-      # The problem is because libdl dynamically linked with both libc and
+-      # libC (AIX C++ library), which obviously doesn't included in libraries
+-      # list by gcc. This cause undefined symbols with -static flags.
+-      # This hack allows C programs to be linked with "-static -ldl", but
+-      # not sure about C++ programs.
+-      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
 +      aix*)
 +      # All AIX code is PIC.
 +      if test "$host_cpu" = ia64; then
 +	# AIX 5 now supports IA64 processor
 +	lt_prog_compiler_static='-Bstatic'
 +      fi
-+      ;;
+       ;;
 +
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
+     amigaos*)
+       # FIXME: we need at least 68020 code to build shared libraries, but
+       # adding the `-m68020' flag to GCC prevents building anything better,
+       # like `-m68040'.
+-      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
 +      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-+      ;;
+       ;;
 +
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
+     beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+       # PIC is the default for these OSes.
+       ;;
 +
-+    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
 +      lt_prog_compiler_pic='-DDLL_EXPORT'
 +      ;;
 +
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
+     darwin* | rhapsody*)
+       # PIC is the default on this platform
+       # Common symbols not allowed in MH_DYLIB files
+-      lt_cv_prog_cc_pic='-fno-common'
 +      lt_prog_compiler_pic='-fno-common'
-+      ;;
+       ;;
+-    cygwin* | mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
 +
-+    interix3*)
++    interix[3-9]*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
@@ -13101,13 +20810,14 @@
 +      # on systems that don't support them.
 +      lt_prog_compiler_can_build_shared=no
 +      enable_shared=no
-+      ;;
+       ;;
 +
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
+     sysv4*MP*)
+       if test -d /usr/nec; then
+-	 lt_cv_prog_cc_pic=-Kconform_pic
 +	lt_prog_compiler_pic=-Kconform_pic
-+      fi
-+      ;;
+       fi
+       ;;
 +
 +    hpux*)
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
@@ -13122,22 +20832,29 @@
 +      esac
 +      ;;
 +
-+    *)
+     *)
+-      lt_cv_prog_cc_pic='-fPIC'
 +      lt_prog_compiler_pic='-fPIC'
-+      ;;
-+    esac
-+  else
+       ;;
+     esac
+   else
+-    # PORTME Check for PIC flags for the system compiler.
 +    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
+     case $host_os in
+-    aix3* | aix4* | aix5*)
+-      lt_cv_prog_cc_wl='-Wl,'
+-      # All AIX code is PIC.
 +    aix*)
 +      lt_prog_compiler_wl='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
+       if test "$host_cpu" = ia64; then
+ 	# AIX 5 now supports IA64 processor
+-	lt_cv_prog_cc_static='-Bstatic'
 +	lt_prog_compiler_static='-Bstatic'
-+      else
+       else
+-	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
 +	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
+       fi
+       ;;
 +      darwin*)
 +        # PIC is the default on this platform
 +        # Common symbols not allowed in MH_DYLIB files
@@ -13149,13 +20866,17 @@
 +       esac
 +       ;;
 +
-+    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
 +      lt_prog_compiler_pic='-DDLL_EXPORT'
 +      ;;
-+
-+    hpux9* | hpux10* | hpux11*)
+ 
+     hpux9* | hpux10* | hpux11*)
+-      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
+-      lt_cv_prog_cc_pic='+Z'
 +      lt_prog_compiler_wl='-Wl,'
 +      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
 +      # not for PA HP-UX.
@@ -13169,19 +20890,28 @@
 +      esac
 +      # Is there a better lt_prog_compiler_static that works with the bundled CC?
 +      lt_prog_compiler_static='${wl}-a ${wl}archive'
-+      ;;
-+
-+    irix5* | irix6* | nonstopux*)
+       ;;
+ 
+     irix5* | irix6* | nonstopux*)
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static='-non_shared'
 +      lt_prog_compiler_wl='-Wl,'
-+      # PIC (with -KPIC) is the default.
+       # PIC (with -KPIC) is the default.
 +      lt_prog_compiler_static='-non_shared'
-+      ;;
-+
+       ;;
+ 
+-    cygwin* | mingw* | pw32* | os2*)
+-      # This hack is so that the source file can tell whether it is being
+-      # built for inclusion in a dll (and should export symbols for example).
+-      lt_cv_prog_cc_pic='-DDLL_EXPORT'
 +    newsos6)
 +      lt_prog_compiler_pic='-KPIC'
 +      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
+       ;;
+ 
+-    newsos6)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
 +    linux* | k*bsd*-gnu)
 +      case $cc_basename in
 +      icc* | ecc*)
@@ -13201,16 +20931,45 @@
 +        # All Alpha code is PIC.
 +        lt_prog_compiler_static='-non_shared'
 +        ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic='-KPIC'
++	  lt_prog_compiler_static='-Bstatic'
++	  lt_prog_compiler_wl=''
++	  ;;
++	esac
++	;;
 +      esac
-+      ;;
-+
-+    osf3* | osf4* | osf5*)
+       ;;
+ 
+     osf3* | osf4* | osf5*)
 +      lt_prog_compiler_wl='-Wl,'
-+      # All OSF/1 code is PIC.
+       # All OSF/1 code is PIC.
+-      lt_cv_prog_cc_wl='-Wl,'
+-      lt_cv_prog_cc_static='-non_shared'
 +      lt_prog_compiler_static='-non_shared'
-+      ;;
-+
-+    solaris*)
+       ;;
+ 
+-    sco3.2v5*)
+-      lt_cv_prog_cc_pic='-Kpic'
+-      lt_cv_prog_cc_static='-dn'
+-      lt_cv_prog_cc_shlib='-belf'
++    rdos*)
++      lt_prog_compiler_static='-non_shared'
+       ;;
+ 
+     solaris*)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      lt_cv_prog_cc_wl='-Wl,'
 +      lt_prog_compiler_pic='-KPIC'
 +      lt_prog_compiler_static='-Bstatic'
 +      case $cc_basename in
@@ -13219,27 +20978,41 @@
 +      *)
 +	lt_prog_compiler_wl='-Wl,';;
 +      esac
-+      ;;
-+
-+    sunos4*)
+       ;;
+ 
+     sunos4*)
+-      lt_cv_prog_cc_pic='-PIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      lt_cv_prog_cc_wl='-Qoption ld '
+-      ;;
+-
+-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+-      lt_cv_prog_cc_pic='-KPIC'
+-      lt_cv_prog_cc_static='-Bstatic'
+-      lt_cv_prog_cc_wl='-Wl,'
 +      lt_prog_compiler_wl='-Qoption ld '
 +      lt_prog_compiler_pic='-PIC'
 +      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
+       ;;
+ 
+-    uts4*)
+-      lt_cv_prog_cc_pic='-pic'
+-      lt_cv_prog_cc_static='-Bstatic'
 +    sysv4 | sysv4.2uw2* | sysv4.3*)
 +      lt_prog_compiler_wl='-Wl,'
 +      lt_prog_compiler_pic='-KPIC'
 +      lt_prog_compiler_static='-Bstatic'
-+      ;;
-+
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
+       ;;
+ 
+     sysv4*MP*)
+       if test -d /usr/nec ;then
+-	lt_cv_prog_cc_pic='-Kconform_pic'
+-	lt_cv_prog_cc_static='-Bstatic'
 +	lt_prog_compiler_pic='-Kconform_pic'
 +	lt_prog_compiler_static='-Bstatic'
-+      fi
-+      ;;
-+
+       fi
+       ;;
+ 
 +    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
 +      lt_prog_compiler_wl='-Wl,'
 +      lt_prog_compiler_pic='-KPIC'
@@ -13256,28 +21029,46 @@
 +      lt_prog_compiler_static='-Bstatic'
 +      ;;
 +
-+    *)
+     *)
+-      lt_cv_prog_cc_can_build_shared=no
 +      lt_prog_compiler_can_build_shared=no
-+      ;;
-+    esac
-+  fi
-+
+       ;;
+     esac
+   fi
+ 
+-fi
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
-+
+ 
+-if test -z "$lt_cv_prog_cc_pic"; then
+-  echo "$ac_t""none" 1>&6
+-else
+-  echo "$ac_t""$lt_cv_prog_cc_pic" 1>&6
 +#
 +# Check to make sure the PIC flag actually works.
 +#
 +if test -n "$lt_prog_compiler_pic"; then
-+
+ 
+-  # Check to make sure the pic_flag actually works.
+-  echo $ac_n "checking if $compiler PIC flag $lt_cv_prog_cc_pic works""... $ac_c" 1>&6
+-echo "configure:3184: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+-  if eval "test \"`echo '$''{'lt_cv_prog_cc_pic_works'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +{ 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... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_pic_works+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-      save_CFLAGS="$CFLAGS"
+-    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
+-    cat > conftest.$ac_ext <<EOF
+-#line 3191 "configure"
+-#include "confdefs.h"
+-
+-int main() {
 +  lt_prog_compiler_pic_works=no
 +  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
@@ -13288,11 +21079,11 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:8033: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7788: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:8037: \$? = $ac_status" >&5
++   echo "$as_me:7792: \$? = $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 other than the usual output.
@@ -13303,11 +21094,50 @@
 +     fi
 +   fi
 +   $rm conftest*
-+
-+fi
+ 
+-; return 0; }
+-EOF
+-if { (eval echo configure:3198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-        case $host_os in
+-      hpux9* | hpux10* | hpux11*)
+-	# On HP-UX, both CC and GCC only warn that PIC is supported... then
+-	# they create non-PIC objects.  So, if there were any warnings, we
+-	# assume that PIC is not supported.
+-	if test -s conftest.err; then
+-	  lt_cv_prog_cc_pic_works=no
+-	else
+-	  lt_cv_prog_cc_pic_works=yes
+-	fi
+-	;;
+-      *)
+-	lt_cv_prog_cc_pic_works=yes
+-	;;
+-      esac
+-    
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-        lt_cv_prog_cc_pic_works=no
+-    
+-fi
+-rm -f conftest*
+-    CFLAGS="$save_CFLAGS"
+-  
+ fi
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6; }
-+
+ 
+-
+-  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
+-    lt_cv_prog_cc_pic=
+-    lt_cv_prog_cc_can_build_shared=no
+-  else
+-    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
+-  fi
+-
+-  echo "$ac_t""$lt_cv_prog_cc_pic_works" 1>&6
 +if test x"$lt_prog_compiler_pic_works" = xyes; then
 +    case $lt_prog_compiler_pic in
 +     "" | " "*) ;;
@@ -13316,9 +21146,17 @@
 +else
 +    lt_prog_compiler_pic=
 +     lt_prog_compiler_can_build_shared=no
-+fi
-+
-+fi
+ fi
+ 
+-# Check for any special shared library compilation flags.
+-if test -n "$lt_cv_prog_cc_shlib"; then
+-  echo "configure: warning: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" 1>&2
+-  if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
+-  else
+-   echo "configure: warning: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" 1>&2
+-    lt_cv_prog_cc_can_build_shared=no
+-  fi
+ fi
 +case $host_os in
 +  # For platforms which do not support PIC, -DPIC is meaningless:
 +  *djgpp*)
@@ -13328,7 +21166,26 @@
 +    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
 +    ;;
 +esac
-+
+ 
+-echo $ac_n "checking if $compiler static flag $lt_cv_prog_cc_static works""... $ac_c" 1>&6
+-echo "configure:3250: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+-if eval "test \"`echo '$''{'lt_cv_prog_cc_static_works'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-    lt_cv_prog_cc_static_works=no
+-  save_LDFLAGS="$LDFLAGS"
+-  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
+-  cat > conftest.$ac_ext <<EOF
+-#line 3258 "configure"
+-#include "confdefs.h"
+-
+-int main() {
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:3265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  lt_cv_prog_cc_static_works=yes
 +#
 +# Check to make sure the static flag actually works.
 +#
@@ -13337,11 +21194,16 @@
 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
 +if test "${lt_prog_compiler_static_works+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest*
+-  LDFLAGS="$save_LDFLAGS"
 +  lt_prog_compiler_static_works=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
 +     # The linker can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
@@ -13359,30 +21221,124 @@
 +   fi
 +   $rm conftest*
 +   LDFLAGS="$save_LDFLAGS"
-+
-+fi
+ 
+ fi
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
 +echo "${ECHO_T}$lt_prog_compiler_static_works" >&6; }
-+
+ 
+-
+-# Belt *and* braces to stop my trousers falling down:
+-test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
+-echo "$ac_t""$lt_cv_prog_cc_static_works" 1>&6
+-
+-pic_flag="$lt_cv_prog_cc_pic"
+-special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
+-wl="$lt_cv_prog_cc_wl"
+-link_static_flag="$lt_cv_prog_cc_static"
+-no_builtin_flag="$lt_cv_prog_cc_no_builtin"
+-can_build_shared="$lt_cv_prog_cc_can_build_shared"
+-
+-
+-# Check to see if options -o and -c are simultaneously supported by compiler
+-echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6
+-echo "configure:3292: checking if $compiler supports -c -o file.$ac_objext" >&5
+-if eval "test \"`echo '$''{'lt_cv_compiler_c_o'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  
+-$rm -r conftest 2>/dev/null
+-mkdir conftest
+-cd conftest
+-echo "int some_variable = 0;" > conftest.$ac_ext
+-mkdir out
+-# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+-# that will create temporary files in the current directory regardless of
+-# the output directory.  Thus, making CWD read-only will cause this test
+-# to fail, enabling locking or at least warning the user not to do parallel
+-# builds.
+-chmod -w .
+-save_CFLAGS="$CFLAGS"
+-CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
+-compiler_c_o=no
+-if { (eval echo configure:3311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+-  # The compiler can only warn and ignore the option if not recognized
+-  # So say no if there are warnings
+-  if test -s out/conftest.err; then
+-    lt_cv_compiler_c_o=no
+-  else
+-    lt_cv_compiler_c_o=yes
+-  fi
 +if test x"$lt_prog_compiler_static_works" = xyes; then
 +    :
-+else
+ else
+-  # Append any errors to the config.log.
+-  cat out/conftest.err 1>&5
+-  lt_cv_compiler_c_o=no
+-fi
+-CFLAGS="$save_CFLAGS"
+-chmod u+w .
+-$rm conftest* out/*
+-rmdir out
+-cd ..
+-rmdir conftest
+-$rm -r conftest 2>/dev/null
+-
 +    lt_prog_compiler_static=
-+fi
-+
-+
+ fi
+ 
+-compiler_c_o=$lt_cv_compiler_c_o
+-echo "$ac_t""$compiler_c_o" 1>&6
+ 
+-if test x"$compiler_c_o" = x"yes"; then
+-  # Check to see if we can write to a .lo
+-  echo $ac_n "checking if $compiler supports -c -o file.lo""... $ac_c" 1>&6
+-echo "configure:3340: checking if $compiler supports -c -o file.lo" >&5
+-  if eval "test \"`echo '$''{'lt_cv_compiler_o_lo'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +{ echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
 +echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
 +if test "${lt_cv_prog_compiler_c_o+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  
+-  lt_cv_compiler_o_lo=no
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -c -o conftest.lo"
+-  save_objext="$ac_objext"
+-  ac_objext=lo
+-  cat > conftest.$ac_ext <<EOF
+-#line 3351 "configure"
+-#include "confdefs.h"
 +  lt_cv_prog_compiler_c_o=no
 +   $rm -r conftest 2>/dev/null
 +   mkdir conftest
 +   cd conftest
 +   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-int main() {
+-int some_variable = 0;
+-; return 0; }
+-EOF
+-if { (eval echo configure:3358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-      # The compiler can only warn and ignore the option if not recognized
+-    # So say no if there are warnings
+-    if test -s conftest.err; then
+-      lt_cv_compiler_o_lo=no
+-    else
+-      lt_cv_compiler_o_lo=yes
+-    fi
+-  
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest*
+-  ac_objext="$save_objext"
+-  CFLAGS="$save_CFLAGS"
+-  
+-fi
 +   lt_compiler_flag="-o out/conftest2.$ac_objext"
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
@@ -13392,11 +21348,11 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:8137: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:7892: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>out/conftest.err)
 +   ac_status=$?
 +   cat out/conftest.err >&5
-+   echo "$as_me:8141: \$? = $ac_status" >&5
++   echo "$as_me:7896: \$? = $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
@@ -13416,37 +21372,128 @@
 +   cd ..
 +   rmdir conftest
 +   $rm conftest*
-+
-+fi
+ 
+-  compiler_o_lo=$lt_cv_compiler_o_lo
+-  echo "$ac_t""$compiler_o_lo" 1>&6
+-else
+-  compiler_o_lo=no
+ fi
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
 +
-+
-+hard_links="nottested"
+ 
+-# Check to see if we can do hard links to lock some files if needed
+ hard_links="nottested"
+-if test "$compiler_c_o" = no && test "$need_locks" != no; then
 +if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
+   # do not overwrite the value of need_locks provided by the user
+-  echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6
+-echo "configure:3389: checking if we can lock with hard links" >&5
 +  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
 +echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   hard_links=yes
+   $rm conftest*
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+   touch conftest.a
+   ln conftest.a conftest.b 2>&5 || hard_links=no
+   ln conftest.a conftest.b 2>/dev/null && hard_links=no
+-  echo "$ac_t""$hard_links" 1>&6
 +  { echo "$as_me:$LINENO: result: $hard_links" >&5
 +echo "${ECHO_T}$hard_links" >&6; }
-+  if test "$hard_links" = no; then
+   if test "$hard_links" = no; then
+-    echo "configure: warning: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" 1>&2
 +    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 +echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+
+     need_locks=warn
+   fi
+ else
+   need_locks=no
+ fi
+ 
+-if test "$GCC" = yes; then
+-  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
+-  echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6
+-echo "configure:3408: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+-  echo "int some_variable = 0;" > conftest.$ac_ext
+-  save_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
+-  compiler_rtti_exceptions=no
+-  cat > conftest.$ac_ext <<EOF
+-#line 3414 "configure"
+-#include "confdefs.h"
+-
+-int main() {
+-int some_variable = 0;
+-; return 0; }
+-EOF
+-if { (eval echo configure:3421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-  rm -rf conftest*
+-      # The compiler can only warn and ignore the option if not recognized
+-    # So say no if there are warnings
+-    if test -s conftest.err; then
+-      compiler_rtti_exceptions=no
+-    else
+-      compiler_rtti_exceptions=yes
+-    fi
+-  
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-fi
+-rm -f conftest*
+-  CFLAGS="$save_CFLAGS"
+-  echo "$ac_t""$compiler_rtti_exceptions" 1>&6
+-
+-  if test "$compiler_rtti_exceptions" = "yes"; then
+-    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
+-  else
+-    no_builtin_flag=' -fno-builtin'
+-  fi
+-fi
+-
+-# See if the linker supports building shared libraries.
+-echo $ac_n "checking whether the linker ($LD) supports shared libraries""... $ac_c" 1>&6
+-echo "configure:3448: checking whether the linker ($LD) supports shared libraries" >&5
 +{ echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
 +echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
-+
+ 
+-allow_undefined_flag=
+-no_undefined_flag=
+-need_lib_prefix=unknown
+-need_version=unknown
+-# when you set need_version to no, make sure it does not cause -set_version
+-# flags to be left without arguments
+-archive_cmds=
+-archive_expsym_cmds=
+-old_archive_from_new_cmds=
+-old_archive_from_expsyms_cmds=
+-export_dynamic_flag_spec=
+-whole_archive_flag_spec=
+-thread_safe_flag_spec=
+-hardcode_into_libs=no
+-hardcode_libdir_flag_spec=
+-hardcode_libdir_separator=
+-hardcode_direct=no
+-hardcode_minus_L=no
+-hardcode_shlibpath_var=unsupported
+-runpath_var=
+-link_all_deplibs=unknown
+-always_export_symbols=no
+-export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
+-# include_expsyms should be a list of space-separated symbols to be *always*
+-# included in the symbol list
+-include_expsyms=
+-# exclude_expsyms can be an egrep regular expression of symbols to exclude
+-# it will be wrapped by ` (' and `)$', so one must not match beginning or
+-# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
+-# as well as any symbol that contains `d'.
+-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+-# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+-# platforms (ab)use it in PIC code, but their linkers get confused if
+-# the symbol is explicitly referenced.  Since portable code cannot
+-# rely on this symbol name, it's probably fine to never include it in
+-# preloaded symbol tables.
+-extract_expsyms_cmds=
 +  runpath_var=
 +  allow_undefined_flag=
 +  enable_shared_with_static_runtimes=no
@@ -13493,7 +21540,13 @@
 +  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+
+ 
+-case $host_os in
+-cygwin* | mingw* | pw32*)
+-  # FIXME: the MSVC++ port hasn't been tested in a loooong time
+-  # When not using gcc, we currently assume that we are using
+-  # Microsoft Visual C++.
+-  if test "$GCC" != yes; then
 +  case $host_os in
 +  cygwin* | mingw* | pw32*)
 +    # FIXME: the MSVC++ port hasn't been tested in a loooong time
@@ -13508,15 +21561,32 @@
 +    with_gnu_ld=yes
 +    ;;
 +  openbsd*)
-+    with_gnu_ld=no
+     with_gnu_ld=no
+-  fi
+-  ;;
+-openbsd*)
+-  with_gnu_ld=no
+-  ;;
+-esac
 +    ;;
 +  esac
-+
+ 
+-ld_shlibs=yes
+-if test "$with_gnu_ld" = yes; then
+-  # If archive_cmds runs LD, not CC, wlarc should be empty
+-  wlarc='${wl}'
 +  ld_shlibs=yes
 +  if test "$with_gnu_ld" = yes; then
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
 +    wlarc='${wl}'
-+
+ 
+-  # See if GNU ld supports shared libraries.
+-  case $host_os in
+-  aix3* | aix4* | aix5*)
+-    # On AIX, the GNU linker is very broken
+-    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
+-    ld_shlibs=no
+-    cat <<EOF 1>&2
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
@@ -13545,31 +21615,66 @@
 +      if test "$host_cpu" != ia64; then
 +	ld_shlibs=no
 +	cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
-+
-+EOF
+ 
+ *** Warning: the GNU linker, at least up to release 2.9.1, is reported
+ *** to be unable to reliably create shared libraries on AIX.
+@@ -3518,125 +8050,129 @@
+ *** so that a non-GNU linker is found, and then restart.
+ 
+ EOF
+-    ;;
+-
+-  amigaos*)
+-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
 +      fi
 +      ;;
-+
+ 
+-    # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
+-    # that the semantics of dynamic libraries on AmigaOS, at least up
+-    # to version 4, is to share data among multiple programs linked
+-    # with the same dynamic library.  Since this doesn't match the
+-    # behavior of shared libraries on other platforms, we can use
+-    # them.
+-    ld_shlibs=no
+-    ;;
 +    amigaos*)
 +      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
 +      hardcode_libdir_flag_spec='-L$libdir'
 +      hardcode_minus_L=yes
-+
+ 
+-  beos*)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      allow_undefined_flag=unsupported
+-      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+-      # support --undefined.  This deserves some investigation.  FIXME
+-      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-    else
 +      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
 +      # that the semantics of dynamic libraries on AmigaOS, at least up
 +      # to version 4, is to share data among multiple programs linked
 +      # with the same dynamic library.  Since this doesn't match the
 +      # behavior of shared libraries on other platforms, we can't use
 +      # them.
-+      ld_shlibs=no
+       ld_shlibs=no
+-    fi
+-    ;;
+-
+-  cygwin* | mingw* | pw32*)
+-    # hardcode_libdir_flag_spec is actually meaningless, as there is
+-    # no search path for DLLs.
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    allow_undefined_flag=unsupported
+-    always_export_symbols=yes
 +      ;;
-+
+ 
+-    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
+-      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
+-      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
+-      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
+-      else $CC -o impgen impgen.c ; fi)~
+-      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
 +    beos*)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	allow_undefined_flag=unsupported
@@ -13580,7 +21685,8 @@
 +	ld_shlibs=no
 +      fi
 +      ;;
-+
+ 
+-    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
 +    cygwin* | mingw* | pw32*)
 +      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
 +      # as there is no search path for DLLs.
@@ -13588,8 +21694,18 @@
 +      allow_undefined_flag=unsupported
 +      always_export_symbols=no
 +      enable_shared_with_static_runtimes=yes
-+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-+
++      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+ 
+-    # cygwin and mingw dlls have different entry points and sets of symbols
+-    # to exclude.
+-    # FIXME: what about values for MSVC?
+-    dll_entry=__cygwin_dll_entry at 12
+-    dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12~
+-    case $host_os in
+-    mingw*)
+-      # mingw values
+-      dll_entry=_DllMainCRTStartup at 12
+-      dll_exclude_symbols=DllMain at 12,DllMainCRTStartup at 12,DllEntryPoint at 12~
 +      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 +        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
 +	# If the export-symbols file already is a .def file (1st line
@@ -13604,9 +21720,24 @@
 +      else
 +	ld_shlibs=no
 +      fi
-+      ;;
-+
-+    interix3*)
+       ;;
+-    esac
+ 
+-    # mingw and cygwin differ, and it's simplest to just exclude the union
+-    # of the two symbol sets.
+-    dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12,DllMainCRTStartup at 12,DllEntryPoint at 12
+-
+-    # recent cygwin and mingw systems supply a stub DllMain which the user
+-    # can override, but on older systems we have to supply one (in ltdll.c)
+-    if test "x$lt_cv_need_dllmain" = "xyes"; then
+-      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
+-      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
+-	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
+-    else
+-      ltdll_obj=
+-      ltdll_cmds=
+-    fi
++    interix[3-9]*)
 +      hardcode_direct=no
 +      hardcode_shlibpath_var=no
 +      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
@@ -13620,8 +21751,15 @@
 +      archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
-+
-+    linux* | k*bsd*-gnu)
+ 
+-    # Extract the symbol export list from an `--export-all' def file,
+-    # then regenerate the def file from the symbol export list, so that
+-    # the compiled dll only exports the symbol export list.
+-    # Be careful not to strip the DATA tag left be newer dlltools.
+-    export_symbols_cmds="$ltdll_cmds"'
+-      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
+-      sed -e "1,/EXPORTS/d" -e "s/ @ [0-9]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
++    gnu* | linux* | k*bsd*-gnu)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
 +	case $cc_basename,$host_cpu in
@@ -13639,20 +21777,62 @@
 +	ifc* | ifort*)			# Intel Fortran compiler
 +	  tmp_addflag=' -nofor_main' ;;
 +	esac
-+	archive_cmds='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ 
+-    # If the export-symbols file already is a .def file (1st line
+-    # is EXPORTS), use it as is.
+-    # If DATA tags from a recent dlltool are present, honour them!
+-    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
+-	cp $export_symbols $output_objdir/$soname-def;
 +	if test $supports_anon_versioning = yes; then
 +	  archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
 +  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 +  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 +	fi
 +	link_all_deplibs=no
-+      else
+       else
+-	echo EXPORTS > $output_objdir/$soname-def;
+-	_lt_hint=1;
+-	cat $export_symbols | while read symbol; do
+-	 set dummy \$symbol;
+-	 case \$# in
+-	   2) echo "   \$2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
+-	   4) echo "   \$2 \$3 \$4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
+-	   *) echo "     \$2 @ \$_lt_hint \$3 ; " >> $output_objdir/$soname-def;;
+-	 esac;
+-	 _lt_hint=`expr 1 + \$_lt_hint`;
+-	done;
+-      fi~
+-      '"$ltdll_cmds"'
+-      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
+-      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
+-      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
+-      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
+-    ;;
 +	ld_shlibs=no
 +      fi
 +      ;;
-+
+ 
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+-      wlarc=
+-    else
+-      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-    fi
+-    ;;
 +    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -13662,20 +21842,29 @@
 +	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 +      fi
 +      ;;
-+
+ 
+-  solaris* | sysv5*)
+-    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
+-      ld_shlibs=no
+-      cat <<EOF 1>&2
 +    solaris*)
 +      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
 +	ld_shlibs=no
 +	cat <<EOF 1>&2
-+
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
-+
-+EOF
+ 
+ *** Warning: The releases 2.8.* of the GNU linker cannot reliably
+ *** create shared libraries on Solaris systems.  Therefore, libtool
+@@ -3646,549 +8182,819 @@
+ *** used, and then restart.
+ 
+ EOF
+-    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
 +      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
@@ -13683,20 +21872,43 @@
 +	ld_shlibs=no
 +      fi
 +      ;;
-+
+ 
+-  sunos4*)
+-    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    wlarc=
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
 +    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
 +      case `$LD -v 2>&1` in
 +        *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
 +	ld_shlibs=no
 +	cat <<_LT_EOF 1>&2
-+
+ 
+-  *)
+-    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+-      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+-    else
+-      ld_shlibs=no
+-    fi
+-    ;;
+-  esac
 +*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
 +*** reliably create shared libraries on SCO systems.  Therefore, libtool
 +*** is disabling shared libraries support.  We urge you to upgrade GNU
 +*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
 +*** your PATH or compiler configuration so that the native linker is
 +*** used, and then restart.
-+
+ 
+-  if test "$ld_shlibs" = yes; then
+-    runpath_var=LD_RUN_PATH
+-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+-    export_dynamic_flag_spec='${wl}--export-dynamic'
+-    case $host_os in
+-    cygwin* | mingw* | pw32*)
+-      # dlltool doesn't understand --whole-archive et. al.
+-      whole_archive_flag_spec=
 +_LT_EOF
 +	;;
 +	*)
@@ -13709,7 +21921,7 @@
 +	  fi
 +	;;
 +      esac
-+      ;;
+       ;;
 +
 +    sunos4*)
 +      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
@@ -13718,22 +21930,42 @@
 +      hardcode_shlibpath_var=no
 +      ;;
 +
-+    *)
+     *)
+-      # ancient GNU ld didn't support --whole-archive et. al.
+-      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
+-	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
+       else
+-	whole_archive_flag_spec=
 +	ld_shlibs=no
-+      fi
-+      ;;
-+    esac
+       fi
+       ;;
+     esac
+-  fi
+-else
+-  # PORTME fill in a description of your system's linker (not GNU ld)
+-  case $host_os in
+-  aix3*)
+-    allow_undefined_flag=unsupported
+-    always_export_symbols=yes
+-    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+-    # Note: this linker hardcodes the directories in LIBPATH if there
+-    # are no directories specified by -L.
+-    hardcode_minus_L=yes
+-    if test "$GCC" = yes && test -z "$link_static_flag"; then
+-      # Neither direct hardcoding nor static linking is supported with a
+-      # broken collect2.
+-      hardcode_direct=unsupported
 +
 +    if test "$ld_shlibs" = no; then
 +      runpath_var=
 +      hardcode_libdir_flag_spec=
 +      export_dynamic_flag_spec=
 +      whole_archive_flag_spec=
-+    fi
+     fi
+-    ;;
 +  else
 +    # PORTME fill in a description of your system's linker (not GNU ld)
 +    case $host_os in
@@ -13750,7 +21982,16 @@
 +	hardcode_direct=unsupported
 +      fi
 +      ;;
-+
+ 
+-  aix4* | aix5*)
+-    if test "$host_cpu" = ia64; then
+-      # On IA64, the linker does run time linking by default, so we don't
+-      # have to do anything special.
+-      aix_use_runtimelinking=no
+-      exp_sym_flag='-Bexport'
+-      no_entry_flag=""
+-    else
+-      aix_use_runtimelinking=no
 +    aix4* | aix5*)
 +      if test "$host_cpu" = ia64; then
 +	# On IA64, the linker does run time linking by default, so we don't
@@ -13767,7 +22008,16 @@
 +	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
 +	fi
 +	aix_use_runtimelinking=no
-+
+ 
+-      # Test if we are trying to use run time linking or normal
+-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+-      # need to do runtime linking.
+-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
+-	for ld_flag in $LDFLAGS; do
+-	  case $ld_flag in
+-	  *-brtl*)
+-	    aix_use_runtimelinking=yes
+-	    break
 +	# Test if we are trying to use run time linking or normal
 +	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
 +	# need to do runtime linking.
@@ -13778,24 +22028,63 @@
 +  	    break
 +  	  fi
 +	  done
-+	  ;;
+ 	  ;;
+-	  esac
+-	done
+-      esac
 +	esac
-+
+ 
+-      exp_sym_flag='-bexport'
+-      no_entry_flag='-bnoentry'
+-    fi
 +	exp_sym_flag='-bexport'
 +	no_entry_flag='-bnoentry'
 +      fi
-+
+ 
+-    # When large executables or shared objects are built, AIX ld can
+-    # have problems creating the table of contents.  If linking a library
+-    # or program results in "error TOC overflow" add -mminimal-toc to
+-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
 +      # When large executables or shared objects are built, AIX ld can
 +      # have problems creating the table of contents.  If linking a library
 +      # or program results in "error TOC overflow" add -mminimal-toc to
 +      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
 +      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
+ 
+-    hardcode_direct=yes
+-    archive_cmds=''
+-    hardcode_libdir_separator=':'
+-    if test "$GCC" = yes; then
+-      case $host_os in aix4.[012]|aix4.[012].*)
+-	collect2name=`${CC} -print-prog-name=collect2`
+-	if test -f "$collect2name" && \
+-	  strings "$collect2name" | grep resolve_lib_name >/dev/null
+-	then
+-	  # We have reworked collect2
+-	  hardcode_direct=yes
+-	else
+-	  # We have old collect2
+-	  hardcode_direct=unsupported
+-	  # It fails to find uninstalled libraries when the uninstalled
+-	  # path is not listed in the libpath.  Setting hardcode_minus_L
+-	  # to unsupported forces relinking
+-	  hardcode_minus_L=yes
+-	  hardcode_libdir_flag_spec='-L$libdir'
+-	  hardcode_libdir_separator=
+-	fi
+-      esac
 +      archive_cmds=''
 +      hardcode_direct=yes
 +      hardcode_libdir_separator=':'
 +      link_all_deplibs=yes
-+
+ 
+-      shared_flag='-shared'
+-    else
+-      # not using gcc
+-      if test "$host_cpu" = ia64; then
+-	shared_flag='${wl}-G'
+-      else
 +      if test "$GCC" = yes; then
 +	case $host_os in aix4.[012]|aix4.[012].*)
 +	# We only want to do this on AIX 4.2 and lower, the check
@@ -13805,7 +22094,7 @@
 +  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 +	  then
 +  	  # We have reworked collect2
-+  	  hardcode_direct=yes
++  	  :
 +	  else
 +  	  # We have old collect2
 +  	  hardcode_direct=unsupported
@@ -13819,7 +22108,8 @@
 +	  ;;
 +	esac
 +	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
+ 	if test "$aix_use_runtimelinking" = yes; then
+-	  shared_flag='${wl}-G'
 +	  shared_flag="$shared_flag "'${wl}-G'
 +	fi
 +      else
@@ -13828,21 +22118,44 @@
 +  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
 +  	# chokes on -Wl,-G. The following line is correct:
 +	  shared_flag='-G'
-+	else
+ 	else
+-	  shared_flag='${wl}-bM:SRE'
 +	  if test "$aix_use_runtimelinking" = yes; then
 +	    shared_flag='${wl}-G'
 +	  else
 +	    shared_flag='${wl}-bM:SRE'
 +	  fi
-+	fi
-+      fi
-+
+ 	fi
+       fi
+-    fi
+ 
+-    # It seems that -bexpall can do strange things, so it is better to
+-    # generate a list of symbols to export.
+-    always_export_symbols=yes
+-    if test "$aix_use_runtimelinking" = yes; then
+-      # Warning - without using the other runtime loading flags (-brtl),
+-      # -berok will link without error, but may produce a broken library.
+-      allow_undefined_flag='-berok'
+-      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
+-      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+-    else
+-      if test "$host_cpu" = ia64; then
+-	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
+-	allow_undefined_flag="-z nodefs"
+-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
+-      else
+-	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
+-	# Warning - without using the other run time loading flags,
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      always_export_symbols=yes
 +      if test "$aix_use_runtimelinking" = yes; then
 +	# Warning - without using the other runtime loading flags (-brtl),
-+	# -berok will link without error, but may produce a broken library.
+ 	# -berok will link without error, but may produce a broken library.
+-	allow_undefined_flag='${wl}-berok'
+-	# This is a bit strange, but is similar to how AIX traditionally builds
+-	# it's shared libraries.
+-	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
 +	allow_undefined_flag='-berok'
 +       # Determine the default libpath from the value encoded in an empty executable.
 +       cat >conftest.$ac_ext <<_ACEOF
@@ -13873,33 +22186,24 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 +# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
@@ -13907,7 +22211,7 @@
 +
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 +
@@ -13948,33 +22252,24 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 +# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
@@ -13982,7 +22277,7 @@
 +
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 +
@@ -13997,7 +22292,7 @@
 +	  # This is similar to how AIX traditionally builds its shared libraries.
 +	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
 +	fi
-+      fi
+       fi
 +      ;;
 +
 +    amigaos*)
@@ -14028,7 +22323,7 @@
 +      # The linker will automatically build a .lib file if we build a DLL.
 +      old_archive_From_new_cmds='true'
 +      # FIXME: Should let the user specify the lib program.
-+      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
 +      fix_srcfile_path='`cygpath -w "$srcfile"`'
 +      enable_shared_with_static_runtimes=yes
 +      ;;
@@ -14070,29 +22365,58 @@
 +      case $cc_basename in
 +        xlc*)
 +         output_verbose_link_cmd='echo'
-+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
 +         module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
 +          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +          module_expsym_cmds='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}'
 +          ;;
 +       *)
 +         ld_shlibs=no
 +          ;;
 +      esac
-+    fi
+     fi
+-    ;;
 +      ;;
-+
+ 
+-  amigaos*)
+-    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
+-    # see comment about different semantics on the GNU ld section
+-    ld_shlibs=no
+-    ;;
 +    dgux*)
 +      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_libdir_flag_spec='-L$libdir'
 +      hardcode_shlibpath_var=no
 +      ;;
-+
+ 
+-  cygwin* | mingw* | pw32*)
+-    # When not using gcc, we currently assume that we are using
+-    # Microsoft Visual C++.
+-    # hardcode_libdir_flag_spec is actually meaningless, as there is
+-    # no search path for DLLs.
+-    hardcode_libdir_flag_spec=' '
+-    allow_undefined_flag=unsupported
+-    # Tell ltmain to make .lib files, not .a files.
+-    libext=lib
+-    # FIXME: Setting linknames here is a bad hack.
+-    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
+-    # The linker will automatically build a .lib file if we build a DLL.
+-    old_archive_from_new_cmds='true'
+-    # FIXME: Should let the user specify the lib program.
+-    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
+-    fix_srcfile_path='`cygpath -w "$srcfile"`'
+-    ;;
 +    freebsd1*)
 +      ld_shlibs=no
 +      ;;
-+
+ 
+-  darwin* | rhapsody*)
+-    case "$host_os" in
+-    rhapsody* | darwin1.[012])
+-      allow_undefined_flag='-undefined suppress'
 +    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
 +    # support.  Future versions do this automatically, but an explicit c++rt0.o
 +    # does not break anything, and helps significantly (at the cost of a little
@@ -14102,7 +22426,9 @@
 +      hardcode_libdir_flag_spec='-R$libdir'
 +      hardcode_direct=yes
 +      hardcode_shlibpath_var=no
-+      ;;
+       ;;
+-    *) # Darwin 1.3 on
+-      allow_undefined_flag='-flat_namespace -undefined suppress'
 +
 +    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
 +    freebsd2*)
@@ -14110,8 +22436,23 @@
 +      hardcode_direct=yes
 +      hardcode_minus_L=yes
 +      hardcode_shlibpath_var=no
-+      ;;
-+
+       ;;
+-    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!
+-    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
+-    # We need to add '_' to the symbols in $export_symbols first
+-    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    whole_archive_flag_spec='-all_load $convenience'
+-    ;;
+ 
+-  freebsd1*)
+-    ld_shlibs=no
+-    ;;
 +    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
 +    freebsd* | dragonfly*)
 +      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
@@ -14119,7 +22460,17 @@
 +      hardcode_direct=yes
 +      hardcode_shlibpath_var=no
 +      ;;
-+
+ 
+-  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+-  # support.  Future versions do this automatically, but an explicit c++rt0.o
+-  # does not break anything, and helps significantly (at the cost of a little
+-  # extra space).
+-  freebsd2.2*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
 +    hpux9*)
 +      if test "$GCC" = yes; then
 +	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
@@ -14129,13 +22480,27 @@
 +      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 +      hardcode_libdir_separator=:
 +      hardcode_direct=yes
-+
+ 
+-  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-  freebsd2*)
+-    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes
+-    hardcode_shlibpath_var=no
+-    ;;
 +      # hardcode_minus_L: Not really in the search PATH,
 +      # but as the default location of the library.
 +      hardcode_minus_L=yes
 +      export_dynamic_flag_spec='${wl}-E'
 +      ;;
-+
+ 
+-  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-  freebsd*)
+-    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
 +    hpux10*)
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 +	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
@@ -14145,16 +22510,49 @@
 +      if test "$with_gnu_ld" = no; then
 +	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_separator=:
-+
+ 
+-  hpux9* | hpux10* | hpux11*)
+-    case $host_os in
+-    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
+-    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
+-    esac
+-    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes # Not in the search PATH, but as the default
+-			 # location of the library.
+-    export_dynamic_flag_spec='${wl}-E'
+-    ;;
 +	hardcode_direct=yes
 +	export_dynamic_flag_spec='${wl}-E'
-+
+ 
+-  irix5* | irix6* | nonstopux*)
+-    if test "$GCC" = yes; then
+-      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    else
+-      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      hardcode_libdir_flag_spec='-rpath $libdir'
+-    fi
+-    hardcode_libdir_separator=:
+-    link_all_deplibs=yes
+-    ;;
 +	# hardcode_minus_L: Not really in the search PATH,
 +	# but as the default location of the library.
 +	hardcode_minus_L=yes
 +      fi
 +      ;;
-+
+ 
+-  netbsd*)
+-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+-    else
+-      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+-    fi
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    ;;
 +    hpux11*)
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 +	case $host_cpu in
@@ -14184,7 +22582,14 @@
 +      if test "$with_gnu_ld" = no; then
 +	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
 +	hardcode_libdir_separator=:
-+
+ 
+-  newsos6)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    hardcode_shlibpath_var=no
+-    ;;
 +	case $host_cpu in
 +	hppa*64*|ia64*)
 +	  hardcode_libdir_flag_spec_ld='+b $libdir'
@@ -14194,7 +22599,27 @@
 +	*)
 +	  hardcode_direct=yes
 +	  export_dynamic_flag_spec='${wl}-E'
-+
+ 
+-  openbsd*)
+-    hardcode_direct=yes
+-    hardcode_shlibpath_var=no
+-    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-      export_dynamic_flag_spec='${wl}-E'
+-    else
+-      case "$host_os" in
+-      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+-	hardcode_libdir_flag_spec='-R$libdir'
+-        ;;
+-      *)
+-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+-        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+-        ;;
+-      esac
+-    fi
+-    ;;
 +	  # hardcode_minus_L: Not really in the search PATH,
 +	  # but as the default location of the library.
 +	  hardcode_minus_L=yes
@@ -14202,7 +22627,14 @@
 +	esac
 +      fi
 +      ;;
-+
+ 
+-  os2*)
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_minus_L=yes
+-    allow_undefined_flag=unsupported
+-    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+-    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+-    ;;
 +    irix5* | irix6* | nonstopux*)
 +      if test "$GCC" = yes; then
 +	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -14214,7 +22646,18 @@
 +      hardcode_libdir_separator=:
 +      link_all_deplibs=yes
 +      ;;
-+
+ 
+-  osf3*)
+-    if test "$GCC" = yes; then
+-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+-    else
+-      allow_undefined_flag=' -expect_unresolved \*'
+-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-    fi
+-    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    hardcode_libdir_separator=:
+-    ;;
 +    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -14225,37 +22668,62 @@
 +      hardcode_direct=yes
 +      hardcode_shlibpath_var=no
 +      ;;
-+
+ 
+-  osf4* | osf5*)	# as osf3* with the addition of -msym flag
+-    if test "$GCC" = yes; then
+-      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
+-      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 +    newsos6)
 +      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_direct=yes
-+      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+-    else
+-      allow_undefined_flag=' -expect_unresolved \*'
+-      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+-      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+-      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
 +      hardcode_libdir_separator=:
 +      hardcode_shlibpath_var=no
 +      ;;
-+
+ 
+-      #Both c and cxx compiler support -rpath directly
+-      hardcode_libdir_flag_spec='-rpath $libdir'
+-    fi
+-    hardcode_libdir_separator=:
+-    ;;
 +    openbsd*)
-+      hardcode_direct=yes
-+      hardcode_shlibpath_var=no
-+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	export_dynamic_flag_spec='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct=yes
++	hardcode_shlibpath_var=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
 +      else
-+       case $host_os in
-+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	   hardcode_libdir_flag_spec='-R$libdir'
-+	   ;;
-+	 *)
-+	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+	   ;;
-+       esac
++	ld_shlibs=no
 +      fi
 +      ;;
-+
+ 
+-  sco3.2v5*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_shlibpath_var=no
+-    runpath_var=LD_RUN_PATH
+-    hardcode_runpath_var=yes
+-    export_dynamic_flag_spec='${wl}-Bexport'
+-    ;;
 +    os2*)
 +      hardcode_libdir_flag_spec='-L$libdir'
 +      hardcode_minus_L=yes
@@ -14263,7 +22731,21 @@
 +      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
 +      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
 +      ;;
-+
+ 
+-  solaris*)
+-    # gcc --version < 3.0 without binutils cannot create self contained
+-    # shared libraries reliably, requiring libgcc.a to resolve some of
+-    # the object symbols generated in some cases.  Libraries that use
+-    # assert need libgcc.a to resolve __eprintf, for example.  Linking
+-    # a copy of libgcc.a into every shared library to guarantee resolving
+-    # such symbols causes other problems:  According to Tim Van Holder
+-    # <tim.van.holder at pandora.be>, C++ libraries end up with a separate
+-    # (to the application) exception stack for one thing.
+-    no_undefined_flag=' -z defs'
+-    if test "$GCC" = yes; then
+-      case `$CC --version 2>/dev/null` in
+-      [12].*)
+-	cat <<EOF 1>&2
 +    osf3*)
 +      if test "$GCC" = yes; then
 +	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -14275,7 +22757,16 @@
 +      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
 +      hardcode_libdir_separator=:
 +      ;;
-+
+ 
+-*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
+-*** create self contained shared libraries on Solaris systems, without
+-*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
+-*** -no-undefined support, which will at least allow you to build shared
+-*** libraries.  However, you may find that when you link such libraries
+-*** into an application without using GCC, you have to manually add
+-*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
+-*** upgrade to a newer version of GCC.  Another option is to rebuild your
+-*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
 +    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 +      if test "$GCC" = yes; then
 +	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -14286,7 +22777,9 @@
 +	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
 +	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
-+
+ 
+-EOF
+-        no_undefined_flag=
 +	# Both c and cxx compiler support -rpath directly
 +	hardcode_libdir_flag_spec='-rpath $libdir'
 +      fi
@@ -14311,21 +22804,48 @@
 +      case $host_os in
 +      solaris2.[0-5] | solaris2.[0-5].*) ;;
 +      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
 + 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-+      esac
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec='-z allextract$convenience -z defaultextract'
++	fi
+ 	;;
+       esac
+-    fi
+-    # $CC -shared without GNU ld will not create a library from C++
+-    # object files and a static libstdc++, better avoid it by now
+-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-    hardcode_libdir_flag_spec='-R$libdir'
+-    hardcode_shlibpath_var=no
+-    case $host_os in
+-    solaris2.[0-5] | solaris2.[0-5].*) ;;
+-    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+-      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
+-    esac
+-    link_all_deplibs=yes
+-    ;;
 +      link_all_deplibs=yes
 +      ;;
-+
+ 
+-  sunos4*)
+-    if test "x$host_vendor" = xsequent; then
+-      # Use $CC to link under sequent, because it throws in some extra .o
+-      # files that make .init and .fini sections work.
+-      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+-    else
+-      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+-    fi
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_direct=yes
+-    hardcode_minus_L=yes
+-    hardcode_shlibpath_var=no
+-    ;;
 +    sunos4*)
 +      if test "x$host_vendor" = xsequent; then
 +	# Use $CC to link under sequent, because it throws in some extra .o
@@ -14339,7 +22859,23 @@
 +      hardcode_minus_L=yes
 +      hardcode_shlibpath_var=no
 +      ;;
-+
+ 
+-  sysv4)
+-    case $host_vendor in
+-      sni)
+-        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-        hardcode_direct=yes # is this really true???
+-        ;;
+-      siemens)
+-        ## LD is ld it makes a PLAMLIB
+-        ## CC just makes a GrossModule.
+-        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-        reload_cmds='$CC -r -o $output$reload_objs'
+-        hardcode_direct=no
+-        ;;
+-      motorola)
+-        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
 +    sysv4)
 +      case $host_vendor in
 +	sni)
@@ -14352,7 +22888,11 @@
 +	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
 +	  reload_cmds='$CC -r -o $output$reload_objs'
 +	  hardcode_direct=no
-+        ;;
+         ;;
+-    esac
+-    runpath_var='LD_RUN_PATH'
+-    hardcode_shlibpath_var=no
+-    ;;
 +	motorola)
 +	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
@@ -14361,13 +22901,29 @@
 +      runpath_var='LD_RUN_PATH'
 +      hardcode_shlibpath_var=no
 +      ;;
-+
+ 
+-  sysv4.3*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_shlibpath_var=no
+-    export_dynamic_flag_spec='-Bexport'
+-    ;;
 +    sysv4.3*)
 +      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_shlibpath_var=no
 +      export_dynamic_flag_spec='-Bexport'
 +      ;;
-+
+ 
+-  sysv5*)
+-    no_undefined_flag=' -z text'
+-    # $CC -shared without GNU ld will not create a library from C++
+-    # object files and a static libstdc++, better avoid it by now
+-    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+-		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+-    hardcode_libdir_flag_spec=
+-    hardcode_shlibpath_var=no
+-    runpath_var='LD_RUN_PATH'
+-    ;;
 +    sysv4*MP*)
 +      if test -d /usr/nec; then
 +	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -14377,13 +22933,23 @@
 +	ld_shlibs=yes
 +      fi
 +      ;;
-+
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
+ 
+-  uts4*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_shlibpath_var=no
+-    ;;
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 +      no_undefined_flag='${wl}-z,text'
 +      archive_cmds_need_lc=no
 +      hardcode_shlibpath_var=no
 +      runpath_var='LD_RUN_PATH'
-+
+ 
+-  dgux*)
+-    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_libdir_flag_spec='-L$libdir'
+-    hardcode_shlibpath_var=no
+-    ;;
 +      if test "$GCC" = yes; then
 +	archive_cmds='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -14392,7 +22958,10 @@
 +	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
-+
+ 
+-  sysv4*MP*)
+-    if test -d /usr/nec; then
+-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +    sysv5* | sco3.2v5* | sco5v6*)
 +      # Note: We can NOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
@@ -14403,13 +22972,26 @@
 +      no_undefined_flag='${wl}-z,text'
 +      allow_undefined_flag='${wl}-z,nodefs'
 +      archive_cmds_need_lc=no
-+      hardcode_shlibpath_var=no
+       hardcode_shlibpath_var=no
+-      runpath_var=LD_RUN_PATH
+-      hardcode_runpath_var=yes
+-      ld_shlibs=yes
+-    fi
+-    ;;
 +      hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
 +      hardcode_libdir_separator=':'
 +      link_all_deplibs=yes
 +      export_dynamic_flag_spec='${wl}-Bexport'
 +      runpath_var='LD_RUN_PATH'
-+
+ 
+-  sysv4.2uw2*)
+-    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+-    hardcode_direct=yes
+-    hardcode_minus_L=no
+-    hardcode_shlibpath_var=no
+-    hardcode_runpath_var=yes
+-    runpath_var=LD_RUN_PATH
+-    ;;
 +      if test "$GCC" = yes; then
 +	archive_cmds='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +	archive_expsym_cmds='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -14418,23 +23000,65 @@
 +	archive_expsym_cmds='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
-+
+ 
+-  sysv5uw7* | unixware7*)
+-    no_undefined_flag='${wl}-z ${wl}text'
+-    if test "$GCC" = yes; then
+-      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-    else
+-      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+-    fi
+-    runpath_var='LD_RUN_PATH'
+-    hardcode_shlibpath_var=no
+-    ;;
 +    uts4*)
 +      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_libdir_flag_spec='-L$libdir'
 +      hardcode_shlibpath_var=no
 +      ;;
-+
+ 
+-  *)
+-    ld_shlibs=no
+-    ;;
+-  esac
+-fi
+-echo "$ac_t""$ld_shlibs" 1>&6
+-test "$ld_shlibs" = no && can_build_shared=no
 +    *)
 +      ld_shlibs=no
 +      ;;
 +    esac
 +  fi
-+
+ 
+-# Check hardcoding attributes.
+-echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
+-echo "configure:4147: checking how to hardcode library paths into programs" >&5
+-hardcode_action=
+-if test -n "$hardcode_libdir_flag_spec" || \
+-   test -n "$runpath_var"; then
 +{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
 +echo "${ECHO_T}$ld_shlibs" >&6; }
 +test "$ld_shlibs" = no && can_build_shared=no
-+
+ 
+-  # We can hardcode non-existant directories.
+-  if test "$hardcode_direct" != 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 "$hardcode_shlibpath_var" != no &&
+-     test "$hardcode_minus_L" != no; then
+-    # Linking always hardcodes the temporary library directory.
+-    hardcode_action=relink
+-  else
+-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+-    hardcode_action=immediate
+-  fi
+-else
+-  # We cannot hardcode anything, or else we can only hardcode existing
+-  # directories.
+-  hardcode_action=unsupported
+-fi
+-echo "$ac_t""$hardcode_action" 1>&6
 +#
 +# Do we need to explicitly link libc?
 +#
@@ -14442,7 +23066,18 @@
 +x|xyes)
 +  # Assume -lc should be added
 +  archive_cmds_need_lc=yes
-+
+ 
+-striplib=
+-old_striplib=
+-echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
+-echo "configure:4175: checking whether stripping libraries is possible" >&5
+-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
+-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+-  echo "$ac_t""yes" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
 +  if test "$enable_shared" = yes && test "$GCC" = yes; then
 +    case $archive_cmds in
 +    *'~'*)
@@ -14455,8 +23090,10 @@
 +      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
 +      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ 
+-reload_cmds='$LD$reload_flag -o $output$reload_objs'
+-test -z "$deplibs_check_method" && deplibs_check_method=unknown
 +      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
 +  ac_status=$?
@@ -14497,33 +23134,75 @@
 +  fi
 +  ;;
 +esac
-+
+ 
+-# PORTME Fill in your ld.so characteristics
+-echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
+-echo "configure:4189: checking dynamic linker characteristics" >&5
 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
 +shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -4197,17 +9003,74 @@
+ shlibpath_overrides_runpath=unknown
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+-sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib /usr/X11R6/lib"
 +sys_lib_dlsearch_path_spec="/lib /usr/lib"
++
 +if test "$GCC" = yes; then
-+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
++  case $host_os in
++    darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++    *) lt_awk_arg="/^libraries:/" ;;
++  esac
++  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++  if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
 +    # if the path contains ";" then we assume it to be the separator
 +    # otherwise default to the standard path separator (i.e. ":") - it is
 +    # assumed that no part of a normal pathname contains ";" but that should
 +    # okay in the real world where ";" in dirpaths is itself problematic.
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
 +  else
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
++    lt_search_path_spec=`echo "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
 +  fi
++  # Ok, now we have the path, separated by spaces, we can step through it
++  # and add multilib dir if necessary.
++  lt_tmp_lt_search_path_spec=
++  lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++  for lt_sys_path in $lt_search_path_spec; do
++    if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++    else
++      test -d "$lt_sys_path" && \
++	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++    fi
++  done
++  lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++  lt_foo="";
++  lt_count=0;
++  for (lt_i = NF; lt_i > 0; lt_i--) {
++    if ($lt_i != "" && $lt_i != ".") {
++      if ($lt_i == "..") {
++        lt_count++;
++      } else {
++        if (lt_count == 0) {
++          lt_foo="/" $lt_i lt_foo;
++        } else {
++          lt_count--;
++        }
++      }
++    }
++  }
++  if (lt_foo != "") { lt_freq[lt_foo]++; }
++  if (lt_freq[lt_foo] == 1) { print lt_foo; }
++}'`
++  sys_lib_search_path_spec=`echo $lt_search_path_spec`
 +else
 +  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 +fi
@@ -14533,34 +23212,42 @@
 +# when you set need_version to no, make sure it does not cause -set_version
 +# flags to be left without arguments
 +need_version=unknown
-+
-+case $host_os in
-+aix3*)
-+  version_type=linux
+ 
+ case $host_os in
+ aix3*)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix $libname.a'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
-+
+   shlibpath_var=LIBPATH
+ 
+-  # AIX has no versioning support, so we append a major version to the name.
+-  soname_spec='${libname}${release}.so$major'
 +  # AIX 3 has no versioning support, so we append a major version to the name.
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
-+
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
+   ;;
+ 
+ aix4* | aix5*)
+@@ -4217,7 +9080,7 @@
+   hardcode_into_libs=yes
+   if test "$host_cpu" = ia64; then
+     # AIX 5 supports IA64
+-    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
 +    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  else
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-+    case $host_os in
-+      aix4 | aix4.[01] | aix4.[01].*)
+     shlibpath_var=LD_LIBRARY_PATH
+   else
+     # With GCC up to 2.95.x, collect2 would create an import file
+@@ -4227,57 +9090,54 @@
+     # development snapshots of GCC prior to 3.0.
+     case $host_os in
+       aix4 | aix4.[01] | aix4.[01].*)
+-	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+-	     echo ' yes '
+-	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
+-	  :
+-	else
+-	  can_build_shared=no
+-	fi
+-	;;
 +      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 +	   echo ' yes '
 +	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
@@ -14569,70 +23256,88 @@
 +	can_build_shared=no
 +      fi
 +      ;;
-+    esac
+     esac
+-    # AIX (on Power*) has no versioning support, so currently we can
+-    # not hardcode correct soname into executable. Probably we can
+-    # add versioning support to collect2, so additional links can
+-    # be useful in future.
 +    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
 +    # soname into executable. Probably we can add versioning support to
 +    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
+     if test "$aix_use_runtimelinking" = yes; then
+       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+       # instead of lib<name>.a to let people know that these are not
+       # typical AIX shared libraries.
+-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
+     else
+       # We preserve .a as extension for shared libraries through AIX4.2
+       # and later when we are not doing run time linking.
+       library_names_spec='${libname}${release}.a $libname.a'
+-      soname_spec='${libname}${release}.so$major'
 +      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
-+
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
+     fi
+     shlibpath_var=LIBPATH
+   fi
+-  hardcode_into_libs=yes
+   ;;
+ 
+ amigaos*)
+   library_names_spec='$libname.ixlibrary $libname.a'
+   # Create ${libname}_ixlibrary.a entries in /sys/libs.
+-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
 +  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+  ;;
-+
-+beos*)
+   ;;
+ 
+ beos*)
+-  library_names_spec='${libname}.so'
 +  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
-+
+   dynamic_linker="$host_os ld.so"
+   shlibpath_var=LIBRARY_PATH
+   ;;
+ 
+-bsdi4*)
 +bsdi[45]*)
-+  version_type=linux
-+  need_version=no
+   version_type=linux
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
-+
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+   sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+-  export_dynamic_flag_spec=-rdynamic
+   # the default ld.so.conf also contains /usr/contrib/lib and
+   # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+   # libtool to hard-code these into programs
+@@ -4285,29 +9145,56 @@
+ 
+ cygwin* | mingw* | pw32*)
+   version_type=windows
 +  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
+   need_version=no
+   need_lib_prefix=no
 +
-+  case $GCC,$host_os in
+   case $GCC,$host_os in
+-  yes,cygwin*)
 +  yes,cygwin* | yes,mingw* | yes,pw32*)
-+    library_names_spec='$libname.dll.a'
+     library_names_spec='$libname.dll.a'
+-    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+-    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
 +    postinstall_cmds='base_file=`basename \${file}`~
 +      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
+       dldir=$destdir/`dirname \$dlpath`~
+       test -d \$dldir || mkdir -p \$dldir~
+-      $install_prog .libs/$dlname \$dldir/$dlname'
+-    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
 +      $install_prog $dir/$dlname \$dldir/$dlname~
 +      chmod a+x \$dldir/$dlname'
 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
+       dlpath=$dir/\$dldll~
+        $rm \$dlpath'
 +    shlibpath_overrides_runpath=yes
 +
 +    case $host_os in
@@ -14662,33 +23367,37 @@
 +      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 +      ;;
 +    esac
-+    ;;
+     ;;
+-  yes,mingw*)
+-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
+-    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
+-    ;;
+-  yes,pw32*)
+-    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
+-    ;;
 +
-+  *)
+   *)
+-    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
 +    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
-+
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
+     ;;
+   esac
+   dynamic_linker='Win32 ld.exe'
+@@ -4320,30 +9207,49 @@
+   version_type=darwin
+   need_lib_prefix=no
+   need_version=no
+-  # 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='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
+-  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
 +  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
 +  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+  else
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+  fi
++
++  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"
 +  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 +  ;;
 +
@@ -14699,12 +23408,14 @@
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
-+
+   ;;
+ 
+ freebsd1*)
+   dynamic_linker=no
+   ;;
+ 
+-freebsd*)
+-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -14716,55 +23427,64 @@
 +    *) objformat=elf ;;
 +    esac
 +  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
+   version_type=freebsd-$objformat
+   case $version_type in
+     freebsd-elf*)
+-      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
+       need_version=no
+       need_lib_prefix=no
+       ;;
+     freebsd-*)
+-      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_os in
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-+    ;;
+       need_version=yes
+       ;;
+   esac
+@@ -4352,10 +9258,19 @@
+   freebsd2*)
+     shlibpath_overrides_runpath=yes
+     ;;
+-  *)
 +  freebsd3.[01]* | freebsdelf3.[01]*)
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
 +  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
 +  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  freebsd*) # from 4.6 on
+     shlibpath_overrides_runpath=no
+     hardcode_into_libs=yes
+     ;;
++  *) # from 4.6 on, and DragonFly
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
-+  esac
-+  ;;
-+
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
+   esac
+   ;;
+ 
+@@ -4363,8 +9278,8 @@
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
+-  soname_spec='${libname}${release}.so$major'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
-+
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
+   shlibpath_var=LD_LIBRARY_PATH
+   hardcode_into_libs=yes
+   ;;
+@@ -4372,36 +9287,87 @@
+ hpux9* | hpux10* | hpux11*)
+   # Give a soname corresponding to the major version so that dld.sl refuses to
+   # link against other versions.
+-  dynamic_linker="$host_os dld.sl"
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+-  shlibpath_var=SHLIB_PATH
+-  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+-  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
+-  soname_spec='${libname}${release}.sl$major'
 +  case $host_cpu in
 +  ia64*)
 +    shrext_cmds='.so'
@@ -14801,11 +23521,11 @@
 +    soname_spec='${libname}${release}${shared_ext}$major'
 +    ;;
 +  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
-+
-+interix3*)
+   # HP-UX runs *really* slowly unless shared libraries are mode 555.
+   postinstall_cmds='chmod 555 $lib'
+   ;;
+ 
++interix[3-9]*)
 +  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
@@ -14817,78 +23537,89 @@
 +  hardcode_into_libs=yes
 +  ;;
 +
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
+ irix5* | irix6* | nonstopux*)
+   case $host_os in
+     nonstopux*) version_type=nonstopux ;;
+-    *)          version_type=irix ;;
 +    *)
 +	if test "$lt_cv_prog_gnu_ld" = yes; then
 +		version_type=linux
 +	else
 +		version_type=irix
 +	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
+   esac
+   need_lib_prefix=no
+   need_version=no
+-  soname_spec='${libname}${release}.so$major'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-+    ;;
-+  *)
-+    case $LD in # libtool.m4 will add one of these switches to LD
+   case $host_os in
+   irix5* | nonstopux*)
+     libsuff= shlibsuff=
+     ;;
+   *)
+     case $LD in # libtool.m4 will add one of these switches to LD
+-    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
+-    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
+-    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
 +    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
 +      libsuff= shlibsuff= libmagic=32-bit;;
 +    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
 +      libsuff=32 shlibsuff=N32 libmagic=N32;;
 +    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
 +      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-+    ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+     *) libsuff= shlibsuff= libmagic=never-match;;
+     esac
+     ;;
+@@ -4410,20 +9376,21 @@
+   shlibpath_overrides_runpath=no
+   sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
+   sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 +  hardcode_into_libs=yes
-+  ;;
-+
-+# No shared lib support for Linux oldld, aout, or coff.
+   ;;
+ 
+ # No shared lib support for Linux oldld, aout, or coff.
+-linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
 +linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
-+
-+# This must be Linux ELF.
+   dynamic_linker=no
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
 +linux* | k*bsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
-+
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=no
+@@ -4432,12 +9399,11 @@
+   # before this can be enabled.
+   hardcode_into_libs=yes
+ 
+-  case $host_cpu:$lt_cv_cc_64bit_output in
+-  powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
+-    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
+-    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
+-    ;;
+-  esac
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
-+
-+  # We used to test for /lib/ld.so.1 and disable shared libraries on
-+  # powerpc, because MkLinux only supported shared libraries with the
-+  # GNU dynamic linker.  Since this was broken with cross compilers,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
-+
+ 
+   # We used to test for /lib/ld.so.1 and disable shared libraries on
+   # powerpc, because MkLinux only supported shared libraries with the
+@@ -4448,17 +9414,29 @@
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -14901,26 +23632,28 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+   need_version=no
+   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+-    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
+     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+     dynamic_linker='NetBSD (a.out) ld.so'
+   else
+-    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
+-    soname_spec='${libname}${release}.so$major'
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +    soname_spec='${libname}${release}${shared_ext}$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
-+
-+newsos6)
-+  version_type=linux
+     dynamic_linker='NetBSD ld.elf_so'
+   fi
+   shlibpath_var=LD_LIBRARY_PATH
+@@ -4468,64 +9446,77 @@
+ 
+ newsos6)
+   version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
@@ -14932,14 +23665,15 @@
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
-+
-+openbsd*)
-+  version_type=sunos
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   ;;
+ 
+ openbsd*)
+   version_type=sunos
 +  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
+   need_lib_prefix=no
+-  need_version=no
 +  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
 +  case $host_os in
 +    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
@@ -14948,7 +23682,15 @@
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-    case "$host_os" in
+-    openbsd2.[89] | openbsd2.[89].*)
+-      shlibpath_overrides_runpath=no
+-      ;;
+-    *)
+-      shlibpath_overrides_runpath=yes
+-      ;;
+-    esac
 +    case $host_os in
 +      openbsd2.[89] | openbsd2.[89].*)
 +	shlibpath_overrides_runpath=no
@@ -14957,80 +23699,90 @@
 +	shlibpath_overrides_runpath=yes
 +	;;
 +      esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  ;;
-+
-+os2*)
-+  libname_spec='$name'
+   else
+     shlibpath_overrides_runpath=yes
+   fi
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+-  shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+ os2*)
+   libname_spec='$name'
 +  shrext_cmds=".dll"
-+  need_lib_prefix=no
+   need_lib_prefix=no
+-  library_names_spec='$libname.dll $libname.a'
 +  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  version_type=osf
+   dynamic_linker='OS/2 ld.exe'
+   shlibpath_var=LIBPATH
+   ;;
+ 
+ osf3* | osf4* | osf5*)
+   version_type=osf
 +  need_lib_prefix=no
-+  need_version=no
+   need_version=no
+-  soname_spec='${libname}${release}.so$major'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
-+
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
+   shlibpath_var=LD_LIBRARY_PATH
+   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+-  hardcode_into_libs=yes
+   ;;
+ 
+-sco3.2v5*)
+-  version_type=osf
+-  soname_spec='${libname}${release}.so$major'
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  shlibpath_var=LD_LIBRARY_PATH
++rdos*)
++  dynamic_linker=no
+   ;;
+ 
+ solaris*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+   hardcode_into_libs=yes
+@@ -4535,7 +9526,7 @@
+ 
+ sunos4*)
+   version_type=sunos
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
+   finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_overrides_runpath=yes
+@@ -4545,10 +9536,10 @@
+   need_version=yes
+   ;;
+ 
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
 +sysv4 | sysv4.3*)
-+  version_type=linux
+   version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      export_dynamic_flag_spec='${wl}-Blargedynsym'
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_vendor in
+     sni)
+@@ -4569,71 +9560,85 @@
+   esac
+   ;;
+ 
+-uts4*)
+-  version_type=linux
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
+-  shlibpath_var=LD_LIBRARY_PATH
 +sysv4*MP*)
 +  if test -d /usr/nec ;then
 +    version_type=linux
@@ -15038,15 +23790,19 @@
 +    soname_spec='$libname${shared_ext}.$major'
 +    shlibpath_var=LD_LIBRARY_PATH
 +  fi
-+  ;;
-+
+   ;;
+ 
+-dgux*)
+-  version_type=linux
 +sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
 +  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
+   need_lib_prefix=no
+   need_version=no
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+-  soname_spec='${libname}${release}.so$major'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
+   shlibpath_var=LD_LIBRARY_PATH
 +  hardcode_into_libs=yes
 +  if test "$with_gnu_ld" = yes; then
 +    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
@@ -15061,35 +23817,64 @@
 +    esac
 +  fi
 +  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
-+
+   ;;
+ 
+-sysv4*MP*)
+-  if test -d /usr/nec ;then
+-    version_type=linux
+-    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
+-    soname_spec='$libname.so.$major'
+-    shlibpath_var=LD_LIBRARY_PATH
+-  fi
 +uts4*)
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
-+
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
+   ;;
+ 
+ *)
+   dynamic_linker=no
+   ;;
+ esac
+-echo "$ac_t""$dynamic_linker" 1>&6
 +{ echo "$as_me:$LINENO: result: $dynamic_linker" >&5
 +echo "${ECHO_T}$dynamic_linker" >&6; }
-+test "$dynamic_linker" = no && can_build_shared=no
-+
+ test "$dynamic_linker" = no && can_build_shared=no
+ 
+-# Report the final consequences.
+-echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
+-echo "configure:4607: checking if libtool supports shared libraries" >&5
+-echo "$ac_t""$can_build_shared" 1>&6
+-
+-echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
+-echo "configure:4611: checking whether to build shared libraries" >&5
+-test "$can_build_shared" = "no" && enable_shared=no
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +fi
-+
+ 
+-# On AIX, shared libraries and static libraries use the same namespace, and
+-# are all built from PIC.
+-case "$host_os" in
+-aix3*)
+-  test "$enable_shared" = yes && enable_static=no
+-  if test -n "$RANLIB"; then
+-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
+-    postinstall_cmds='$RANLIB $lib'
+-  fi
+-  ;;
 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 +hardcode_action=
 +if test -n "$hardcode_libdir_flag_spec" || \
 +   test -n "$runpath_var" || \
 +   test "X$hardcode_automatic" = "Xyes" ; then
-+
+ 
+-aix4*)
+-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+-    test "$enable_shared" = yes && enable_static=no
 +  # We can hardcode non-existant directories.
 +  if test "$hardcode_direct" != no &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -15102,7 +23887,16 @@
 +  else
 +    # We can link without hardcoding, and we can hardcode nonexisting dirs.
 +    hardcode_action=immediate
-+  fi
+   fi
+-  ;;
+-esac
+-echo "$ac_t""$enable_shared" 1>&6
+-
+-echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
+-echo "configure:4634: checking whether to build static libraries" >&5
+-# Make sure either enable_shared or enable_static is yes.
+-test "$enable_shared" = yes || enable_static=yes
+-echo "$ac_t""$enable_static" 1>&6
 +else
 +  # We cannot hardcode anything, or else we can only hardcode existing
 +  # directories.
@@ -15110,16 +23904,16 @@
 +fi
 +{ echo "$as_me:$LINENO: result: $hardcode_action" >&5
 +echo "${ECHO_T}$hardcode_action" >&6; }
-+
-+if test "$hardcode_action" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+
+ 
+ if test "$hardcode_action" = relink; then
+   # Fast installation is not supported
+@@ -4644,9 +9649,34 @@
+   enable_fast_install=needless
+ fi
+ 
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
 +striplib=
 +old_striplib=
 +{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
@@ -15135,6 +23929,7 @@
 +   darwin*)
 +       if test -n "$STRIP" ; then
 +         striplib="$STRIP -x"
++         old_striplib="$STRIP -S"
 +         { echo "$as_me:$LINENO: result: yes" >&5
 +echo "${ECHO_T}yes" >&6; }
 +       else
@@ -15147,28 +23942,19 @@
 +echo "${ECHO_T}no" >&6; }
 +    ;;
 +  esac
-+fi
-+
-+if test "x$enable_dlopen" != xyes; then
-+  enable_dlopen=unknown
-+  enable_dlopen_self=unknown
-+  enable_dlopen_self_static=unknown
-+else
-+  lt_cv_dlopen=no
-+  lt_cv_dlopen_libs=
-+
-+  case $host_os in
-+  beos*)
-+    lt_cv_dlopen="load_add_on"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ;;
-+
+ fi
+ 
+ if test "x$enable_dlopen" != xyes; then
+@@ -4664,271 +9694,530 @@
+     lt_cv_dlopen_self=yes
+     ;;
+ 
+-  cygwin* | mingw* | pw32*)
 +  mingw* | pw32*)
-+    lt_cv_dlopen="LoadLibrary"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
+     lt_cv_dlopen="LoadLibrary"
+     lt_cv_dlopen_libs=
+    ;;
+ 
 +  cygwin*)
 +    lt_cv_dlopen="dlopen"
 +    lt_cv_dlopen_libs=
@@ -15218,27 +24004,11 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_dl_dlopen=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -15247,7 +24017,7 @@
 +	ac_cv_lib_dl_dlopen=no
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
@@ -15265,12 +24035,19 @@
 +
 +   ;;
 +
-+  *)
+   *)
+-    echo $ac_n "checking for shl_load""... $ac_c" 1>&6
+-echo "configure:4675: checking for shl_load" >&5
+-if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +    { echo "$as_me:$LINENO: checking for shl_load" >&5
 +echo $ECHO_N "checking for shl_load... $ECHO_C" >&6; }
 +if test "${ac_cv_func_shl_load+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 4680 "configure"
+-#include "confdefs.h"
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -15281,11 +24058,18 @@
 +   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,
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char shl_load(); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char shl_load();
 +    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.  */
-+
+ 
+-int main() {
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
@@ -15293,7 +24077,7 @@
 +#endif
 +
 +#undef shl_load
-+
+ 
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -15301,13 +24085,21 @@
 +extern "C"
 +#endif
 +char shl_load ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_shl_load) || defined (__stub___shl_load)
 +#if defined __stub_shl_load || defined __stub___shl_load
-+choke me
-+#endif
-+
+ choke me
+-#else
+-shl_load();
+ #endif
+ 
+-; return 0; }
+-EOF
+-if { (eval echo configure:4703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_func_shl_load=yes"
 +int
 +main ()
 +{
@@ -15329,57 +24121,70 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_func_shl_load=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_func_shl_load=no"
+-fi
+-rm -f conftest*
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_func_shl_load=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+ 
+-if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      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; }
 +if test $ac_cv_func_shl_load = yes; then
-+  lt_cv_dlopen="shl_load"
-+else
+   lt_cv_dlopen="shl_load"
+ else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
+-echo "configure:4721: checking for shl_load in -ldld" >&5
+-ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +  { echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
 +echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6; }
 +if test "${ac_cv_lib_dld_shl_load+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  ac_save_LIBS="$LIBS"
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
+ LIBS="-ldld  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 4729 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char shl_load();
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-+
+ 
+-int main() {
+-shl_load()
+-; return 0; }
+-EOF
+-if { (eval echo configure:4740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -15408,49 +24213,49 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_dld_shl_load=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_dld_shl_load=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
 +echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6; }
 +if test $ac_cv_lib_dld_shl_load = yes; then
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-+else
+   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
+ else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for dlopen""... $ac_c" 1>&6
+-echo "configure:4759: checking for dlopen" >&5
+-if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +  { echo "$as_me:$LINENO: checking for dlopen" >&5
 +echo $ECHO_N "checking for dlopen... $ECHO_C" >&6; }
 +if test "${ac_cv_func_dlopen+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 4764 "configure"
+-#include "confdefs.h"
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -15461,11 +24266,18 @@
 +   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
 +#define dlopen innocuous_dlopen
 +
-+/* System header to define __stub macros and hopefully few prototypes,
+ /* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char dlopen(); below.  */
+-#include <assert.h>
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char dlopen();
 +    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.  */
-+
+ 
+-int main() {
 +#ifdef __STDC__
 +# include <limits.h>
 +#else
@@ -15473,7 +24285,7 @@
 +#endif
 +
 +#undef dlopen
-+
+ 
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -15481,13 +24293,21 @@
 +extern "C"
 +#endif
 +char dlopen ();
-+/* The GNU C library defines this for functions which it implements
-+    to always fail with ENOSYS.  Some functions are actually named
-+    something starting with __ and the normal name is an alias.  */
+ /* The GNU C library defines this for functions which it implements
+     to always fail with ENOSYS.  Some functions are actually named
+     something starting with __ and the normal name is an alias.  */
+-#if defined (__stub_dlopen) || defined (__stub___dlopen)
 +#if defined __stub_dlopen || defined __stub___dlopen
-+choke me
-+#endif
-+
+ choke me
+-#else
+-dlopen();
+ #endif
+ 
+-; return 0; }
+-EOF
+-if { (eval echo configure:4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_func_dlopen=yes"
 +int
 +main ()
 +{
@@ -15509,57 +24329,70 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_func_dlopen=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_func_dlopen=no"
+-fi
+-rm -f conftest*
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_func_dlopen=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+ 
+-if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      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; }
 +if test $ac_cv_func_dlopen = yes; then
-+  lt_cv_dlopen="dlopen"
-+else
+   lt_cv_dlopen="dlopen"
+ else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
+-echo "configure:4805: checking for dlopen in -ldl" >&5
+-ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +  { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; }
 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  ac_save_LIBS="$LIBS"
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldl  $LIBS"
+ LIBS="-ldl  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 4813 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char dlopen();
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-+
+ 
+-int main() {
+-dlopen()
+-; return 0; }
+-EOF
+-if { (eval echo configure:4824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -15588,58 +24421,71 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_dl_dlopen=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_dl_dlopen=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
 +if test $ac_cv_lib_dl_dlopen = yes; then
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-+else
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
+ else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
+-echo "configure:4843: checking for dlopen in -lsvld" >&5
+-ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +  { echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
 +echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6; }
 +if test "${ac_cv_lib_svld_dlopen+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  ac_save_LIBS="$LIBS"
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsvld  $LIBS"
+ LIBS="-lsvld  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 4851 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char dlopen();
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-+
+ 
+-int main() {
+-dlopen()
+-; return 0; }
+-EOF
+-if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -15668,58 +24514,71 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_svld_dlopen=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_svld_dlopen=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
 +echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6; }
 +if test $ac_cv_lib_svld_dlopen = yes; then
-+  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-+else
+   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
+ else
+-  echo "$ac_t""no" 1>&6
+-echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
+-echo "configure:4881: checking for dld_link in -ldld" >&5
+-ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +  { echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
 +echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6; }
 +if test "${ac_cv_lib_dld_dld_link+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  ac_save_LIBS="$LIBS"
 +  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
+ LIBS="-ldld  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 4889 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char dld_link();
 +cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
-+
+ 
+-int main() {
+-dld_link()
+-; return 0; }
+-EOF
+-if { (eval echo configure:4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -15748,307 +24607,254 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_dld_dld_link=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_dld_dld_link=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
 +echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6; }
 +if test $ac_cv_lib_dld_dld_link = yes; then
-+  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-+fi
+   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
+-else
+-  echo "$ac_t""no" 1>&6
+ fi
+ 
+-	      
 +
+ fi
+ 
+-	    
 +
-+fi
+ fi
+ 
+-	  
 +
+ fi
+ 
+-	
 +
-+fi
+ fi
+ 
+-      
 +
-+
-+fi
-+
-+
-+fi
-+
-+
-+fi
-+
-+    ;;
-+  esac
-+
-+  if test "x$lt_cv_dlopen" != xno; then
-+    enable_dlopen=yes
-+  else
-+    enable_dlopen=no
-+  fi
-+
-+  case $lt_cv_dlopen in
-+  dlopen)
-+    save_CPPFLAGS="$CPPFLAGS"
+ fi
+ 
+     ;;
+@@ -4943,26 +10232,26 @@
+   case $lt_cv_dlopen in
+   dlopen)
+     save_CPPFLAGS="$CPPFLAGS"
+-        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
 +    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-+
-+    save_LDFLAGS="$LDFLAGS"
+ 
+     save_LDFLAGS="$LDFLAGS"
+-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
 +    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+
-+    save_LIBS="$LIBS"
-+    LIBS="$lt_cv_dlopen_libs $LIBS"
-+
+ 
+     save_LIBS="$LIBS"
+     LIBS="$lt_cv_dlopen_libs $LIBS"
+ 
+-    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
+-echo "configure:4956: checking whether a program can dlopen itself" >&5
+-if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +    { echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
 +echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6; }
 +if test "${lt_cv_dlopen_self+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self=cross
-+else
+ else
+   	  if test "$cross_compiling" = yes; then :
+   lt_cv_dlopen_self=cross
+ else
+-    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+#line 10578 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 4966 "configure"
++#line 10254 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -5019,17 +10308,23 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
 +  else
 +    puts (dlerror ());
-+
-+    exit (status);
-+}
-+EOF
+ 
+     exit (status);
+ }
+ EOF
+-  if { (eval echo configure:5027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
 +  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
 +    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
+       x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
 +      x$lt_dlunknown|x*) lt_cv_dlopen_self=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self=no
-+  fi
+     esac
+   else :
+     # compilation failed
+@@ -5038,25 +10333,25 @@
+ fi
+ rm -fr conftest*
+ 
+-    
+-fi
+ 
+-echo "$ac_t""$lt_cv_dlopen_self" 1>&6
 +fi
-+rm -fr conftest*
-+
-+
-+fi
 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
 +echo "${ECHO_T}$lt_cv_dlopen_self" >&6; }
-+
-+    if test "x$lt_cv_dlopen_self" = xyes; then
+ 
+     if test "x$lt_cv_dlopen_self" = xyes; then
+-      LDFLAGS="$LDFLAGS $link_static_flag"
+-      echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
+-echo "configure:5050: checking whether a statically linked program can dlopen itself" >&5
+-if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
 +      { echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
 +echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6; }
 +if test "${lt_cv_dlopen_self_static+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  	  if test "$cross_compiling" = yes; then :
-+  lt_cv_dlopen_self_static=cross
-+else
+ else
+   	  if test "$cross_compiling" = yes; then :
+   lt_cv_dlopen_self_static=cross
+ else
+-    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
 +  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+#line 10678 "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<EOF
+-#line 5060 "configure"
++#line 10354 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -5113,17 +10408,23 @@
+       else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+       /* dlclose (self); */
+     }
 +  else
 +    puts (dlerror ());
-+
-+    exit (status);
-+}
-+EOF
+ 
+     exit (status);
+ }
+ EOF
+-  if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
+-    (./conftest; exit; ) 2>/dev/null
 +  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
 +  (eval $ac_link) 2>&5
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
 +    (./conftest; exit; ) >&5 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-+      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+     lt_status=$?
+     case x$lt_status in
+       x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
+       x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
+-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
 +      x$lt_dlunknown|x*) lt_cv_dlopen_self_static=no ;;
-+    esac
-+  else :
-+    # compilation failed
-+    lt_cv_dlopen_self_static=no
-+  fi
+     esac
+   else :
+     # compilation failed
+@@ -5132,10 +10433,10 @@
+ fi
+ rm -fr conftest*
+ 
+-      
+-fi
+ 
+-echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
 +fi
-+rm -fr conftest*
-+
-+
-+fi
 +{ echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
 +echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6; }
-+    fi
-+
-+    CPPFLAGS="$save_CPPFLAGS"
-+    LDFLAGS="$save_LDFLAGS"
-+    LIBS="$save_LIBS"
-+    ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self in
-+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-+  *) enable_dlopen_self=unknown ;;
-+  esac
-+
-+  case $lt_cv_dlopen_self_static in
-+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-+  *) enable_dlopen_self_static=unknown ;;
-+  esac
-+fi
-+
-+
+     fi
+ 
+     CPPFLAGS="$save_CPPFLAGS"
+@@ -5156,100 +10457,115 @@
+ fi
+ 
+ 
+-if test "$enable_shared" = yes && test "$GCC" = yes; then
+-  case $archive_cmds in
+-  *'~'*)
+-    # FIXME: we may have to deal with multi-command sequences.
+-    ;;
+-  '$CC '*)
+-    # Test whether the compiler implicitly links with -lc since on some
+-    # systems, -lgcc has to come before -lc. If gcc already passes -lc
+-    # to ld, don't add -lc before -lgcc.
+-    echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
+-echo "configure:5170: checking whether -lc should be explicitly linked in" >&5
+-    if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  $rm conftest*
+-    echo 'static int dummy;' > conftest.$ac_ext
 +# Report which library types will actually be built
 +{ echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
 +echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6; }
 +{ echo "$as_me:$LINENO: result: $can_build_shared" >&5
 +echo "${ECHO_T}$can_build_shared" >&6; }
-+
+ 
+-    if { (eval echo configure:5177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-      soname=conftest
+-      lib=conftest
+-      libobjs=conftest.$ac_objext
+-      deplibs=
+-      wl=$lt_cv_prog_cc_wl
+-      compiler_flags=-v
+-      linker_flags=-v
+-      verstring=
+-      output_objdir=.
+-      libname=conftest
+-      save_allow_undefined_flag=$allow_undefined_flag
+-      allow_undefined_flag=
+-      if { (eval echo configure:5190: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
+-      then
+-	lt_cv_archive_cmds_need_lc=no
+-      else
+-	lt_cv_archive_cmds_need_lc=yes
+-      fi
+-      allow_undefined_flag=$save_allow_undefined_flag
+-    else
+-      cat conftest.err 1>&5
+-    fi
+-fi
 +{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
 +echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
 +test "$can_build_shared" = "no" && enable_shared=no
-+
+ 
+-    echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
 +# On AIX, shared libraries and static libraries use the same namespace, and
 +# are all built from PIC.
 +case $host_os in
@@ -16064,11 +24870,15 @@
 +  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
 +    test "$enable_shared" = yes && enable_static=no
 +  fi
-+    ;;
+     ;;
+-  esac
+-fi
+-need_lc=${lt_cv_archive_cmds_need_lc-yes}
 +esac
 +{ echo "$as_me:$LINENO: result: $enable_shared" >&5
 +echo "${ECHO_T}$enable_shared" >&6; }
-+
+ 
+-# The second clause should only fire when bootstrapping the
 +{ echo "$as_me:$LINENO: checking whether to build static libraries" >&5
 +echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6; }
 +# Make sure either enable_shared or enable_static is yes.
@@ -16077,18 +24887,46 @@
 +echo "${ECHO_T}$enable_static" >&6; }
 +
 +# The else clause should only fire when bootstrapping the
-+# libtool distribution, otherwise you forgot to ship ltmain.sh
-+# with your package, and you will get complaints that there are
-+# no rules to generate ltmain.sh.
-+if test -f "$ltmain"; then
+ # libtool distribution, otherwise you forgot to ship ltmain.sh
+ # with your package, and you will get complaints that there are
+ # no rules to generate ltmain.sh.
+ if test -f "$ltmain"; then
+-  :
+-else
+-  # 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"
+-fi
+-
+-if test -f "$ltmain"; then
+-  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
+-  $rm -f "${ofile}T"
+-
+-  echo creating $ofile
+-
 +  # See if we are running on zsh, and set the options which allow our commands through
 +  # without removal of \ escapes.
 +  if test -n "${ZSH_VERSION+set}" ; then
 +    setopt NO_GLOB_SUBST
 +  fi
-+  # 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.
+   # 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 SED \
+-    AR AR_FLAGS CC LD LN_S NM SHELL \
+-    reload_flag reload_cmds wl \
+-    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
+-    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
+-    library_names_spec soname_spec \
+-    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
+-    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
+-    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
+-    old_striplib striplib file_magic_cmd export_symbols_cmds \
+-    deplibs_check_method allow_undefined_flag no_undefined_flag \
+-    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
+-    global_symbol_to_c_name_address \
+-    hardcode_libdir_flag_spec hardcode_libdir_separator  \
 +  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
 +    SED SHELL STRIP \
 +    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
@@ -16096,7 +24934,8 @@
 +    deplibs_check_method reload_flag reload_cmds need_locks \
 +    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
 +    lt_cv_sys_global_symbol_to_c_name_address \
-+    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
+-    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
 +    old_postinstall_cmds old_postuninstall_cmds \
 +    compiler \
 +    CC \
@@ -16131,10 +24970,15 @@
 +    module_cmds \
 +    module_expsym_cmds \
 +    lt_cv_prog_compiler_c_o \
++    fix_srcfile_path \
 +    exclude_expsyms \
 +    include_expsyms; do
-+
-+    case $var in
+ 
+     case $var in
+-    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
+-    old_postinstall_cmds | old_postuninstall_cmds | \
+-    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
+-    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
 +    old_archive_cmds | \
 +    old_archive_from_new_cmds | \
 +    archive_cmds | \
@@ -16144,18 +24988,18 @@
 +    old_archive_from_expsyms_cmds | \
 +    export_symbols_cmds | \
 +    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-+    postinstall_cmds | postuninstall_cmds | \
+     postinstall_cmds | postuninstall_cmds | \
+-    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
 +    old_postinstall_cmds | old_postuninstall_cmds | \
 +    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+      # Double-quote double-evaled strings.
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-+      ;;
-+    *)
-+      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-+      ;;
-+    esac
-+  done
-+
+       # Double-quote double-evaled strings.
+       eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
+       ;;
+@@ -5259,14 +10575,29 @@
+     esac
+   done
+ 
+-  cat <<__EOF__ > "${ofile}T"
 +  case $lt_echo in
 +  *'\$0 --fallback-echo"')
 +    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
@@ -16169,89 +25013,82 @@
 +echo "$as_me: creating $ofile" >&6;}
 +
 +  cat <<__EOF__ >> "$cfgfile"
-+#! $SHELL
-+
+ #! $SHELL
+ 
+-# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
 +# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-+#
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996-2000 Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 +# Free Software Foundation, Inc.
 +#
 +# This file is part of GNU Libtool:
-+# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -5281,22 +10612,25 @@
+ #
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
+ #
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+ 
+-# A sed that does not truncate output.
 +# A sed program that does not truncate output.
-+SED=$lt_SED
-+
-+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+ SED=$lt_SED
+ 
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="${SED} -e s/^X//"
 +Xsed="$SED -e 1s/^X//"
-+
-+# The HP-UX ksh and POSIX shell print the target directory to stdout
-+# if CDPATH is set.
+ 
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
 +(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 +
 +# The names of the tagged configurations supported by this script.
 +available_tags=
-+
-+# ### BEGIN LIBTOOL CONFIG
-+
-+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+
-+# Shell to use when invoking shell scripts.
-+SHELL=$lt_SHELL
-+
-+# Whether or not to build shared libraries.
-+build_libtool_libs=$enable_shared
-+
-+# Whether or not to build static libraries.
-+build_old_libs=$enable_static
-+
-+# Whether or not to add -lc for building shared libraries.
+ 
+ # ### BEGIN LIBTOOL CONFIG
+ 
+@@ -5312,7 +10646,10 @@
+ build_old_libs=$enable_static
+ 
+ # Whether or not to add -lc for building shared libraries.
+-build_libtool_need_lc=$need_lc
 +build_libtool_need_lc=$archive_cmds_need_lc
 +
 +# Whether or not to disallow shared libs when runtime libs are static
 +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-+
-+# Whether or not to optimize for fast installation.
-+fast_install=$enable_fast_install
-+
-+# The host system.
-+host_alias=$host_alias
-+host=$host
+ 
+ # Whether or not to optimize for fast installation.
+ fast_install=$enable_fast_install
+@@ -5320,6 +10657,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
 +host_os=$host_os
 +
 +# The build system.
 +build_alias=$build_alias
 +build=$build
 +build_os=$build_os
-+
-+# An echo program that does not interpret backslashes.
-+echo=$lt_echo
-+
-+# The archiver.
-+AR=$lt_AR
-+AR_FLAGS=$lt_AR_FLAGS
-+
+ 
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -5328,12 +10671,21 @@
+ AR=$lt_AR
+ AR_FLAGS=$lt_AR_FLAGS
+ 
+-# The default C compiler.
+-CC=$lt_CC
 +# A C compiler.
 +LTCC=$lt_LTCC
 +
@@ -16260,141 +25097,89 @@
 +
 +# A language-specific compiler.
 +CC=$lt_compiler
-+
-+# Is the compiler the GNU C compiler?
-+with_gcc=$GCC
-+
+ 
+ # Is the compiler the GNU C compiler?
+ with_gcc=$GCC
+ 
 +# An ERE matcher.
 +EGREP=$lt_EGREP
 +
-+# The linker used to build libraries.
-+LD=$lt_LD
-+
-+# Whether we need hard or soft links.
-+LN_S=$lt_LN_S
-+
-+# A BSD-compatible nm program.
-+NM=$lt_NM
-+
-+# A symbol stripping program
+ # The linker used to build libraries.
+ LD=$lt_LD
+ 
+@@ -5344,7 +10696,7 @@
+ NM=$lt_NM
+ 
+ # A symbol stripping program
+-STRIP=$STRIP
 +STRIP=$lt_STRIP
-+
-+# Used to examine libraries when file_magic_cmd begins "file"
-+MAGIC_CMD=$MAGIC_CMD
-+
-+# Used on cygwin: DLL creation program.
-+DLLTOOL="$DLLTOOL"
-+
-+# Used on cygwin: object dumper.
-+OBJDUMP="$OBJDUMP"
-+
-+# Used on cygwin: assembler.
-+AS="$AS"
-+
-+# The name of the directory that contains temporary libtool files.
-+objdir=$objdir
-+
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
+ 
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -5366,7 +10718,7 @@
+ reload_cmds=$lt_reload_cmds
+ 
+ # How to pass a linker flag through the compiler.
+-wl=$lt_wl
 +wl=$lt_lt_prog_compiler_wl
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
+ 
+ # Object file suffix (normally "o").
+ objext="$ac_objext"
+@@ -5374,20 +10726,23 @@
+ # Old archive suffix (normally "a").
+ libext="$libext"
+ 
 +# Shared library suffix (normally ".so").
 +shrext_cmds='$shrext_cmds'
 +
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+ 
+ # Additional compiler flags for building library objects.
+-pic_flag=$lt_pic_flag
 +pic_flag=$lt_lt_prog_compiler_pic
-+pic_mode=$pic_mode
-+
+ pic_mode=$pic_mode
+ 
+-# Does compiler simultaneously support -c and -o options?
+-compiler_c_o=$lt_compiler_c_o
 +# What is the maximum length of a command?
 +max_cmd_len=$lt_cv_sys_max_cmd_len
-+
+ 
+-# Can we write directly to a .lo ?
+-compiler_o_lo=$lt_compiler_o_lo
 +# Does compiler simultaneously support -c and -o options?
 +compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-+
+ 
+-# Must we lock files when doing compilation ?
 +# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
+ need_locks=$lt_need_locks
+ 
+ # Do we need the lib prefix for modules?
+@@ -5406,10 +10761,10 @@
+ dlopen_self_static=$enable_dlopen_self_static
+ 
+ # Compiler flag to prevent dynamic linking.
+-link_static_flag=$lt_link_static_flag
 +link_static_flag=$lt_lt_prog_compiler_static
-+
-+# Compiler flag to turn off builtin functions.
+ 
+ # Compiler flag to turn off builtin functions.
+-no_builtin_flag=$lt_no_builtin_flag
 +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_thread_safe_flag_spec
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_old_archive_cmds
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_archive_cmds
-+archive_expsym_cmds=$lt_archive_expsym_cmds
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
+ 
+ # Compiler flag to allow reflexive dlopens.
+ export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
+@@ -5451,10 +10806,34 @@
+ postinstall_cmds=$lt_postinstall_cmds
+ postuninstall_cmds=$lt_postuninstall_cmds
+ 
 +# Commands used to build a loadable module (assumed same as above if empty)
 +module_cmds=$lt_module_cmds
 +module_expsym_cmds=$lt_module_expsym_cmds
 +
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
+ # Commands to strip libraries.
+ old_striplib=$lt_old_striplib
+ striplib=$lt_striplib
+ 
 +# Dependencies to place before the objects being linked to create a
 +# shared library.
 +predep_objects=$lt_predep_objects
@@ -16415,127 +25200,139 @@
 +# a shared library.
 +compiler_lib_search_path=$lt_compiler_lib_search_path
 +
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_allow_undefined_flag
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_no_undefined_flag
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
+ # Method to check whether dependent libraries are shared objects.
+ deplibs_check_method=$lt_deplibs_check_method
+ 
+@@ -5474,13 +10853,13 @@
+ finish_eval=$lt_finish_eval
+ 
+ # Take the output of nm and produce a listing of raw symbols and C names.
+-global_symbol_pipe=$lt_global_symbol_pipe
 +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
+ 
+ # Transform the output of nm in a proper C declaration
+-global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
 +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
+ 
+ # Transform the output of nm in a C name address pair
+-global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
 +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$hardcode_action
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+
+ 
+ # This is the shared library runtime path variable.
+ runpath_var=$runpath_var
+@@ -5501,10 +10880,15 @@
+ # This must work even if \$libdir does not exist.
+ hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
+ 
 +# If ld is used when linking, flag to hardcode \$libdir into
 +# a binary during linking. This must work even if \$libdir does
 +# not exist.
 +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
 +
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+
+ # Whether we need a single -rpath flag with a separated argument.
+ hardcode_libdir_separator=$lt_hardcode_libdir_separator
+ 
+-# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
 +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$hardcode_direct
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$hardcode_minus_L
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$hardcode_shlibpath_var
-+
+ # resulting binary.
+ hardcode_direct=$hardcode_direct
+ 
+@@ -5516,6 +10900,10 @@
+ # the resulting binary.
+ hardcode_shlibpath_var=$hardcode_shlibpath_var
+ 
 +# Set to yes if building a shared library automatically hardcodes DIR into the library
 +# and all subsequent libraries and executables linked against it.
 +hardcode_automatic=$hardcode_automatic
 +
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
+ # Variables whose values should be saved in libtool wrapper scripts and
+ # restored at relink time.
+ variables_saved_for_relink="$variables_saved_for_relink"
+@@ -5530,7 +10918,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+ 
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$fix_srcfile_path"
++fix_srcfile_path=$lt_fix_srcfile_path
+ 
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$always_export_symbols
+@@ -5551,9 +10939,10 @@
+ 
+ __EOF__
+ 
 +
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$link_all_deplibs
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$always_export_symbols
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_export_symbols_cmds
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_exclude_expsyms
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_include_expsyms
-+
-+# ### END LIBTOOL CONFIG
-+
-+__EOF__
-+
-+
-+  case $host_os in
-+  aix3*)
+   case $host_os in
+   aix3*)
+-    cat <<\EOF >> "${ofile}T"
 +    cat <<\EOF >> "$cfgfile"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
+ 
+ # AIX sometimes has problems with the GCC collect2 program.  For some
+ # reason, if we set the COLLECT_NAMES environment variable, the problems
+@@ -5566,198 +10955,8836 @@
+     ;;
+   esac
+ 
+-  case $host_os in
+-  cygwin* | mingw* | pw32* | os2*)
+-    cat <<'EOF' >> "${ofile}T"
+-      # This is a source program that is used to create dlls on Windows
+-      # Don't remove nor modify the starting and closing comments
+-# /* ltdll.c starts here */
+-# #define WIN32_LEAN_AND_MEAN
+-# #include <windows.h>
+-# #undef WIN32_LEAN_AND_MEAN
+-# #include <stdio.h>
+-#
+-# #ifndef __CYGWIN__
+-# #  ifdef __CYGWIN32__
+-# #    define __CYGWIN__ __CYGWIN32__
+-# #  endif
+-# #endif
+-#
+-# #ifdef __cplusplus
+-# extern "C" {
+-# #endif
+-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
+-# #ifdef __cplusplus
+-# }
+-# #endif
+-#
+-# #ifdef __CYGWIN__
+-# #include <cygwin/cygwin_dll.h>
+-# DECLARE_CYGWIN_DLL( DllMain );
+-# #endif
+-# HINSTANCE __hDllInstance_base;
+-#
+-# BOOL APIENTRY
+-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
+-# {
+-#   __hDllInstance_base = hInst;
+-#   return TRUE;
+-# }
+-# /* ltdll.c ends here */
+-	# This is a source program that is used to create import libraries
+-	# on Windows for dlls which lack them. Don't remove nor modify the
+-	# starting and closing comments
+-# /* impgen.c starts here */
+-# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
+-#
+-#  This file is part of GNU libtool.
+-#
+-#  This program is free software; you can redistribute it and/or modify
+-#  it under the terms of the GNU General Public License as published by
+-#  the Free Software Foundation; either version 2 of the License, or
+-#  (at your option) any later version.
+-#
+-#  This program is distributed in the hope that it will be useful,
+-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-#  GNU General Public License for more details.
+-#
+-#  You should have received a copy of the GNU General Public License
+-#  along with this program; if not, write to the Free Software
+-#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+-#  */
 +  # We use sed instead of cat because bash on DJGPP gets confused if
 +  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
 +  # text mode, it properly converts lines to CR/LF.  This bash problem
@@ -16668,10 +25465,10 @@
 +objext_CXX=$objext
 +
 +# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
 +
 +# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[]) { return(0); }'
 +
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +
@@ -16687,13 +25484,13 @@
 +
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
 +ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
@@ -16952,7 +25749,7 @@
 +	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 +	then
 +	  # We have reworked collect2
-+	  hardcode_direct_CXX=yes
++	  :
 +	else
 +	  # We have old collect2
 +	  hardcode_direct_CXX=unsupported
@@ -17020,33 +25817,24 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 +# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
@@ -17054,7 +25842,7 @@
 +
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 +
@@ -17096,33 +25884,24 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 +# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
@@ -17130,7 +25909,7 @@
 +
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 +
@@ -17241,10 +26020,10 @@
 +      case $cc_basename in
 +        xlc*)
 +         output_verbose_link_cmd='echo'
-+          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++          archive_cmds_CXX='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
 +          module_cmds_CXX='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
 +          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++          archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +          module_expsym_cmds_CXX='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}'
 +          ;;
 +       *)
@@ -17327,9 +26106,7 @@
 +      hardcode_libdir_separator_CXX=:
 +
 +      case $host_cpu in
-+      hppa*64*|ia64*)
-+	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-+        ;;
++      hppa*64*|ia64*) ;;
 +      *)
 +	export_dynamic_flag_spec_CXX='${wl}-E'
 +        ;;
@@ -17397,7 +26174,7 @@
 +	;;
 +    esac
 +    ;;
-+  interix3*)
++  interix[3-9]*)
 +    hardcode_direct_CXX=no
 +    hardcode_shlibpath_var_CXX=no
 +    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
@@ -17517,6 +26294,29 @@
 +	# dependencies.
 +	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
 +	;;
++      *)
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C++ 5.9
++	  no_undefined_flag_CXX=' -zdefs'
++	  archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++	  archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++	  hardcode_libdir_flag_spec_CXX='-R$libdir'
++	  whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++	  # Not sure whether something based on
++	  # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++	  # would be better.
++	  output_verbose_link_cmd='echo'
++
++	  # Archives containing C++ object files must be created using
++	  # "CC -xar", where "CC" is the Sun C++ compiler.  This is
++	  # necessary to make sure instantiated templates are included
++	  # in the archive.
++	  old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
++	  ;;
++	esac
++	;;
 +    esac
 +    ;;
 +  lynxos*)
@@ -17555,16 +26355,20 @@
 +    ld_shlibs_CXX=no
 +    ;;
 +  openbsd*)
-+    hardcode_direct_CXX=yes
-+    hardcode_shlibpath_var_CXX=no
-+    archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+      export_dynamic_flag_spec_CXX='${wl}-E'
-+      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++    if test -f /usr/libexec/ld.so; then
++      hardcode_direct_CXX=yes
++      hardcode_shlibpath_var_CXX=no
++      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++      hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
++      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++	export_dynamic_flag_spec_CXX='${wl}-E'
++	whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++      fi
++      output_verbose_link_cmd='echo'
++    else
++      ld_shlibs_CXX=no
 +    fi
-+    output_verbose_link_cmd='echo'
 +    ;;
 +  osf3*)
 +    case $cc_basename in
@@ -17726,15 +26530,10 @@
 +	case $host_os in
 +	  solaris2.[0-5] | solaris2.[0-5].*) ;;
 +	  *)
-+	    # The C++ compiler is used as linker so we must use $wl
-+	    # flag to pass the commands to the underlying system
-+	    # linker. We must also pass each convience library through
-+	    # to the system linker between allextract/defaultextract.
-+	    # The C++ compiler will combine linker options so we
-+	    # cannot just pass the convience library names through
-+	    # without $wl.
++	    # The compiler driver will combine and reorder linker options,
++	    # but understands `-z linker_flag'.
 +	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-+	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
++	    whole_archive_flag_spec_CXX='-z allextract$convenience -z defaultextract'
 +	    ;;
 +	esac
 +	link_all_deplibs_CXX=yes
@@ -17781,6 +26580,12 @@
 +	  fi
 +
 +	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
++	  case $host_os in
++	  solaris2.[0-5] | solaris2.[0-5].*) ;;
++	  *)
++	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	    ;;
++	  esac
 +	fi
 +	;;
 +    esac
@@ -17972,7 +26777,7 @@
 +
 +# PORTME: override above test on systems where it is broken
 +case $host_os in
-+interix3*)
++interix[3-9]*)
 +  # Interix 3.5 installs completely hosed .la files for C++, so rather than
 +  # hack all around it, let's just trust "g++" to DTRT.
 +  predep_objects_CXX=
@@ -17980,13 +26785,46 @@
 +  postdeps_CXX=
 +  ;;
 +
++linux*)
++  case `$CC -V 2>&1 | sed 5q` in
++  *Sun\ C*)
++    # Sun C++ 5.9
++    #
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
++    fi
++    ;;
++  esac
++  ;;
++
 +solaris*)
 +  case $cc_basename in
 +  CC*)
++    # The more standards-conforming stlport4 library is
++    # incompatible with the Cstd library. Avoid specifying
++    # it if it's in CXXFLAGS. Ignore libCrun as
++    # -library=stlport4 depends on it.
++    case " $CXX $CXXFLAGS " in
++    *" -library=stlport4 "*)
++      solaris_use_stlport4=yes
++      ;;
++    esac
++
 +    # Adding this requires a known-good setup of shared libraries for
 +    # Sun compiler versions before 5.6, else PIC objects from an old
 +    # archive will be linked into the output, leading to subtle bugs.
-+    postdeps_CXX='-lCstd -lCrun'
++    if test "$solaris_use_stlport4" != yes; then
++      postdeps_CXX='-library=Cstd -library=Crun'
++    fi
 +    ;;
 +  esac
 +  ;;
@@ -18023,12 +26861,14 @@
 +      # like `-m68040'.
 +      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
 +      ;;
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 +      # PIC is the default for these OSes.
 +      ;;
-+    mingw* | os2* | pw32*)
++    mingw* | cygwin* | os2* | pw32*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
 +      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
 +      ;;
 +    darwin* | rhapsody*)
@@ -18040,7 +26880,7 @@
 +      # DJGPP does not support shared libraries at all
 +      lt_prog_compiler_pic_CXX=
 +      ;;
-+    interix3*)
++    interix[3-9]*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
@@ -18176,6 +27016,14 @@
 +	    lt_prog_compiler_static_CXX='-non_shared'
 +	    ;;
 +	  *)
++	    case `$CC -V 2>&1 | sed 5q` in
++	    *Sun\ C*)
++	      # Sun C++ 5.9
++	      lt_prog_compiler_pic_CXX='-KPIC'
++	      lt_prog_compiler_static_CXX='-Bstatic'
++	      lt_prog_compiler_wl_CXX='-Qoption ld '
++	      ;;
++	    esac
 +	    ;;
 +	esac
 +	;;
@@ -18278,9 +27126,17 @@
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
 +
-+#
+ #
+-# #include <stdio.h>		/* for printf() */
+-# #include <unistd.h>		/* for open(), lseek(), read() */
+-# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
+-# #include <string.h>		/* for strdup() */
 +# Check to make sure the PIC flag actually works.
-+#
+ #
+-# /* O_BINARY isn't required (or even defined sometimes) under Unix */
+-# #ifndef O_BINARY
+-# #define O_BINARY 0
+-# #endif
 +if test -n "$lt_prog_compiler_pic_CXX"; then
 +
 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
@@ -18290,7 +27146,7 @@
 +else
 +  lt_prog_compiler_pic_works_CXX=no
 +  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
@@ -18301,11 +27157,11 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:13046: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12774: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:13050: \$? = $ac_status" >&5
++   echo "$as_me:12778: \$? = $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 other than the usual output.
@@ -18342,9 +27198,29 @@
 +    ;;
 +esac
 +
-+#
+ #
+-# static unsigned int
+-# pe_get16 (fd, offset)
+-#      int fd;
+-#      int offset;
+-# {
+-#   unsigned char b[2];
+-#   lseek (fd, offset, SEEK_SET);
+-#   read (fd, b, 2);
+-#   return b[0] + (b[1]<<8);
+-# }
 +# Check to make sure the static flag actually works.
-+#
+ #
+-# static unsigned int
+-# pe_get32 (fd, offset)
+-#     int fd;
+-#     int offset;
+-# {
+-#   unsigned char b[4];
+-#   lseek (fd, offset, SEEK_SET);
+-#   read (fd, b, 4);
+-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+-# }
 +wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -18354,7 +27230,7 @@
 +  lt_prog_compiler_static_works_CXX=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
 +     # The linker can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
@@ -18394,7 +27270,7 @@
 +   mkdir conftest
 +   cd conftest
 +   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +
 +   lt_compiler_flag="-o out/conftest2.$ac_objext"
 +   # Insert the option either (1) after the last *FLAGS variable, or
@@ -18405,11 +27281,11 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:13150: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:12878: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>out/conftest.err)
 +   ac_status=$?
 +   cat out/conftest.err >&5
-+   echo "$as_me:13154: \$? = $ac_status" >&5
++   echo "$as_me:12882: \$? = $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
@@ -18475,7 +27351,7 @@
 +    export_symbols_cmds_CXX="$ltdll_cmds"
 +  ;;
 +  cygwin* | mingw*)
-+    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([^ ]*\) [^ ]*/\1 DATA/;/^I /d;/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 +  ;;
 +  linux* | k*bsd*-gnu)
 +    link_all_deplibs_CXX=no
@@ -18489,9 +27365,27 @@
 +echo "${ECHO_T}$ld_shlibs_CXX" >&6; }
 +test "$ld_shlibs_CXX" = no && can_build_shared=no
 +
-+#
+ #
+-# static unsigned int
+-# pe_as32 (ptr)
+-#      void *ptr;
+-# {
+-#   unsigned char *b = ptr;
+-#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
+-# }
 +# Do we need to explicitly link libc?
-+#
+ #
+-# int
+-# main (argc, argv)
+-#     int argc;
+-#     char *argv[];
+-# {
+-#     int dll;
+-#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
+-#     unsigned long export_rva, export_size, nsections, secptr, expptr;
+-#     unsigned long name_rvas, nexp;
+-#     unsigned char *expdata, *erva;
+-#     char *filename, *dll_name;
 +case "x$archive_cmds_need_lc_CXX" in
 +x|xyes)
 +  # Assume -lc should be added
@@ -18509,7 +27403,7 @@
 +      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
 +      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +
 +      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
@@ -18567,20 +27461,7 @@
 +version_type=none
 +dynamic_linker="$host_os ld.so"
 +sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
-+else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
++
 +need_lib_prefix=unknown
 +hardcode_into_libs=no
 +
@@ -18737,12 +27618,7 @@
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+  else
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+  fi
++
 +  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 +  ;;
 +
@@ -18796,7 +27672,7 @@
 +    shlibpath_overrides_runpath=no
 +    hardcode_into_libs=yes
 +    ;;
-+  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
@@ -18859,7 +27735,7 @@
 +  postinstall_cmds='chmod 555 $lib'
 +  ;;
 +
-+interix3*)
++interix[3-9]*)
 +  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
@@ -18930,7 +27806,7 @@
 +
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
@@ -19036,6 +27912,10 @@
 +  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
 +  ;;
 +
++rdos*)
++  dynamic_linker=no
++  ;;
++
 +solaris*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -19230,6 +28110,7 @@
 +    module_cmds_CXX \
 +    module_expsym_cmds_CXX \
 +    lt_cv_prog_compiler_c_o_CXX \
++    fix_srcfile_path_CXX \
 +    exclude_expsyms_CXX \
 +    include_expsyms_CXX; do
 +
@@ -19550,7 +28431,7 @@
 +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 +
 +# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_CXX"
++fix_srcfile_path=$lt_fix_srcfile_path
 +
 +# Set to yes if exported symbols are required.
 +always_export_symbols=$always_export_symbols_CXX
@@ -19641,10 +28522,17 @@
 +objext_F77=$objext
 +
 +# Code to be used in simple compile tests
-+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
++lt_simple_compile_test_code="\
++      subroutine t
++      return
++      end
++"
 +
 +# Code to be used in simple link tests
-+lt_simple_link_test_code="      program t\n      end\n"
++lt_simple_link_test_code="\
++      program t
++      end
++"
 +
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +
@@ -19660,13 +28548,13 @@
 +
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
 +ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
@@ -19753,13 +28641,15 @@
 +      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
 +      ;;
 +
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 +      # PIC is the default for these OSes.
 +      ;;
 +
-+    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
 +      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
 +      ;;
 +
@@ -19769,7 +28659,7 @@
 +      lt_prog_compiler_pic_F77='-fno-common'
 +      ;;
 +
-+    interix3*)
++    interix[3-9]*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
@@ -19827,7 +28717,7 @@
 +       esac
 +       ;;
 +
-+    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
 +      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
@@ -19879,6 +28769,22 @@
 +        # All Alpha code is PIC.
 +        lt_prog_compiler_static_F77='-non_shared'
 +        ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic_F77='-KPIC'
++	  lt_prog_compiler_static_F77='-Bstatic'
++	  lt_prog_compiler_wl_F77='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic_F77='-KPIC'
++	  lt_prog_compiler_static_F77='-Bstatic'
++	  lt_prog_compiler_wl_F77=''
++	  ;;
++	esac
++	;;
 +      esac
 +      ;;
 +
@@ -19888,6 +28794,10 @@
 +      lt_prog_compiler_static_F77='-non_shared'
 +      ;;
 +
++    rdos*)
++      lt_prog_compiler_static_F77='-non_shared'
++      ;;
++
 +    solaris*)
 +      lt_prog_compiler_pic_F77='-KPIC'
 +      lt_prog_compiler_static_F77='-Bstatic'
@@ -19943,9 +28853,13 @@
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
 +
-+#
+ #
+-#     filename = argv[1];
 +# Check to make sure the PIC flag actually works.
-+#
+ #
+-#     dll = open(filename, O_RDONLY|O_BINARY);
+-#     if (dll < 1)
+-# 	return 1;
 +if test -n "$lt_prog_compiler_pic_F77"; then
 +
 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
@@ -19955,7 +28869,7 @@
 +else
 +  lt_prog_compiler_pic_works_F77=no
 +  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +   lt_compiler_flag="$lt_prog_compiler_pic_F77"
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
@@ -19966,11 +28880,11 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:14711: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14455: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:14715: \$? = $ac_status" >&5
++   echo "$as_me:14459: \$? = $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 other than the usual output.
@@ -20007,9 +28921,13 @@
 +    ;;
 +esac
 +
-+#
+ #
+-#     dll_name = filename;
 +# Check to make sure the static flag actually works.
-+#
+ #
+-#     for (i=0; filename[i]; i++)
+-# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
+-# 	    dll_name = filename + i +1;
 +wl=$lt_prog_compiler_wl_F77 eval lt_tmp_static_flag=\"$lt_prog_compiler_static_F77\"
 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -20019,7 +28937,7 @@
 +  lt_prog_compiler_static_works_F77=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
 +     # The linker can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
@@ -20059,7 +28977,7 @@
 +   mkdir conftest
 +   cd conftest
 +   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +
 +   lt_compiler_flag="-o out/conftest2.$ac_objext"
 +   # Insert the option either (1) after the last *FLAGS variable, or
@@ -20070,11 +28988,11 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:14815: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14559: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>out/conftest.err)
 +   ac_status=$?
 +   cat out/conftest.err >&5
-+   echo "$as_me:14819: \$? = $ac_status" >&5
++   echo "$as_me:14563: \$? = $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
@@ -20266,7 +29184,7 @@
 +      allow_undefined_flag_F77=unsupported
 +      always_export_symbols_F77=no
 +      enable_shared_with_static_runtimes_F77=yes
-+      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 +
 +      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 +        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -20284,7 +29202,7 @@
 +      fi
 +      ;;
 +
-+    interix3*)
++    interix[3-9]*)
 +      hardcode_direct_F77=no
 +      hardcode_shlibpath_var_F77=no
 +      hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
@@ -20299,7 +29217,7 @@
 +      archive_expsym_cmds_F77='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
 +
-+    linux* | k*bsd*-gnu)
++    gnu* | linux* | k*bsd*-gnu)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
 +	case $cc_basename,$host_cpu in
@@ -20317,13 +29235,22 @@
 +	ifc* | ifort*)			# Intel Fortran compiler
 +	  tmp_addflag=' -nofor_main' ;;
 +	esac
-+	archive_cmds_F77='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec_F77='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds_F77='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +
 +	if test $supports_anon_versioning = yes; then
 +	  archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
 +  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 +  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 +	fi
 +	link_all_deplibs_F77=no
 +      else
@@ -20483,7 +29410,7 @@
 +  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 +	  then
 +  	  # We have reworked collect2
-+  	  hardcode_direct_F77=yes
++  	  :
 +	  else
 +  	  # We have old collect2
 +  	  hardcode_direct_F77=unsupported
@@ -20541,33 +29468,24 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 +# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
@@ -20575,7 +29493,7 @@
 +
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 +
@@ -20606,33 +29524,24 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_f77_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 +# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
@@ -20640,7 +29549,7 @@
 +
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 +
@@ -20686,7 +29595,7 @@
 +      # The linker will automatically build a .lib file if we build a DLL.
 +      old_archive_From_new_cmds_F77='true'
 +      # FIXME: Should let the user specify the lib program.
-+      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds_F77='lib -OUT:$oldlib$oldobjs$old_deplibs'
 +      fix_srcfile_path_F77='`cygpath -w "$srcfile"`'
 +      enable_shared_with_static_runtimes_F77=yes
 +      ;;
@@ -20728,10 +29637,10 @@
 +      case $cc_basename in
 +        xlc*)
 +         output_verbose_link_cmd='echo'
-+         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds_F77='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
 +         module_cmds_F77='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
 +          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +          module_expsym_cmds_F77='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}'
 +          ;;
 +       *)
@@ -20893,24 +29802,28 @@
 +      ;;
 +
 +    openbsd*)
-+      hardcode_direct_F77=yes
-+      hardcode_shlibpath_var_F77=no
-+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+	export_dynamic_flag_spec_F77='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_F77=yes
++	hardcode_shlibpath_var_F77=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec_F77='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec_F77='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
 +      else
-+       case $host_os in
-+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	   hardcode_libdir_flag_spec_F77='-R$libdir'
-+	   ;;
-+	 *)
-+	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-+	   ;;
-+       esac
++	ld_shlibs_F77=no
 +      fi
 +      ;;
 +
@@ -20969,17 +29882,16 @@
 +      case $host_os in
 +      solaris2.[0-5] | solaris2.[0-5].*) ;;
 +      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
 + 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec_F77='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract'
++	fi
++	;;
 +      esac
 +      link_all_deplibs_F77=yes
 +      ;;
@@ -21036,7 +29948,7 @@
 +      fi
 +      ;;
 +
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 +      no_undefined_flag_F77='${wl}-z,text'
 +      archive_cmds_need_lc_F77=no
 +      hardcode_shlibpath_var_F77=no
@@ -21093,9 +30005,14 @@
 +echo "${ECHO_T}$ld_shlibs_F77" >&6; }
 +test "$ld_shlibs_F77" = no && can_build_shared=no
 +
-+#
+ #
+-#     pe_header_offset = pe_get32 (dll, 0x3c);
+-#     opthdr_ofs = pe_header_offset + 4 + 20;
+-#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
 +# Do we need to explicitly link libc?
-+#
+ #
+-#     if (num_entries < 1) /* no exports */
+-# 	return 1;
 +case "x$archive_cmds_need_lc_F77" in
 +x|xyes)
 +  # Assume -lc should be added
@@ -21113,7 +30030,7 @@
 +      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
 +      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +
 +      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
@@ -21171,20 +30088,7 @@
 +version_type=none
 +dynamic_linker="$host_os ld.so"
 +sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
-+else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
++
 +need_lib_prefix=unknown
 +hardcode_into_libs=no
 +
@@ -21341,12 +30245,7 @@
 +  shlibpath_overrides_runpath=yes
 +  shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+  else
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+  fi
++
 +  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 +  ;;
 +
@@ -21400,7 +30299,7 @@
 +    shlibpath_overrides_runpath=no
 +    hardcode_into_libs=yes
 +    ;;
-+  freebsd*) # from 4.6 on
++  *) # from 4.6 on, and DragonFly
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
@@ -21434,8 +30333,7 @@
 +    soname_spec='${libname}${release}${shared_ext}$major'
 +    if test "X$HPUX_IA64_MODE" = X32; then
 +      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-     else
--      aix_use_runtimelinking=no
++    else
 +      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
 +    fi
 +    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
@@ -21464,7 +30362,7 @@
 +  postinstall_cmds='chmod 555 $lib'
 +  ;;
 +
-+interix3*)
++interix[3-9]*)
 +  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
@@ -21535,7 +30433,7 @@
 +
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
 +
@@ -21641,6 +30539,10 @@
 +  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
 +  ;;
 +
++rdos*)
++  dynamic_linker=no
++  ;;
++
 +solaris*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -21835,6 +30737,7 @@
 +    module_cmds_F77 \
 +    module_expsym_cmds_F77 \
 +    lt_cv_prog_compiler_c_o_F77 \
++    fix_srcfile_path_F77 \
 +    exclude_expsyms_F77 \
 +    include_expsyms_F77; do
 +
@@ -22155,7 +31058,7 @@
 +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
 +
 +# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_F77"
++fix_srcfile_path=$lt_fix_srcfile_path
 +
 +# Set to yes if exported symbols are required.
 +always_export_symbols=$always_export_symbols_F77
@@ -22213,10 +31116,10 @@
 +objext_GCJ=$objext
 +
 +# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
 +
 +# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }'
 +
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
 +
@@ -22232,13 +31135,13 @@
 +
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
 +ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
@@ -22279,7 +31182,7 @@
 +else
 +  lt_cv_prog_compiler_rtti_exceptions=no
 +  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +   lt_compiler_flag="-fno-rtti -fno-exceptions"
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
@@ -22290,11 +31193,11 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:17034: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16759: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:17038: \$? = $ac_status" >&5
++   echo "$as_me:16763: \$? = $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 other than the usual output.
@@ -22345,13 +31248,15 @@
 +      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
 +      ;;
 +
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
 +      # PIC is the default for these OSes.
 +      ;;
 +
-+    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
++      # Although the cygwin gcc ignores -fPIC, still need this for old-style
++      # (--disable-auto-import) libraries
 +      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
 +      ;;
 +
@@ -22361,7 +31266,7 @@
 +      lt_prog_compiler_pic_GCJ='-fno-common'
 +      ;;
 +
-+    interix3*)
++    interix[3-9]*)
 +      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
 +      # Instead, we relocate shared libraries at runtime.
 +      ;;
@@ -22419,7 +31324,7 @@
 +       esac
 +       ;;
 +
-+    mingw* | pw32* | os2*)
++    mingw* | cygwin* | pw32* | os2*)
 +      # This hack is so that the source file can tell whether it is being
 +      # built for inclusion in a dll (and should export symbols for example).
 +      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
@@ -22471,6 +31376,22 @@
 +        # All Alpha code is PIC.
 +        lt_prog_compiler_static_GCJ='-non_shared'
 +        ;;
++      *)
++        case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)
++	  # Sun C 5.9
++	  lt_prog_compiler_pic_GCJ='-KPIC'
++	  lt_prog_compiler_static_GCJ='-Bstatic'
++	  lt_prog_compiler_wl_GCJ='-Wl,'
++	  ;;
++	*Sun\ F*)
++	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
++	  lt_prog_compiler_pic_GCJ='-KPIC'
++	  lt_prog_compiler_static_GCJ='-Bstatic'
++	  lt_prog_compiler_wl_GCJ=''
++	  ;;
++	esac
++	;;
 +      esac
 +      ;;
 +
@@ -22480,6 +31401,10 @@
 +      lt_prog_compiler_static_GCJ='-non_shared'
 +      ;;
 +
++    rdos*)
++      lt_prog_compiler_static_GCJ='-non_shared'
++      ;;
++
 +    solaris*)
 +      lt_prog_compiler_pic_GCJ='-KPIC'
 +      lt_prog_compiler_static_GCJ='-Bstatic'
@@ -22535,9 +31460,32 @@
 +{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
 +echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
 +
-+#
+ #
+-#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
+-#     export_size = pe_get32 (dll, opthdr_ofs + 100);
+-#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
+-#     secptr = (pe_header_offset + 4 + 20 +
+-# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
 +# Check to make sure the PIC flag actually works.
-+#
+ #
+-#     expptr = 0;
+-#     for (i = 0; i < nsections; i++)
+-#     {
+-# 	char sname[8];
+-# 	unsigned long secptr1 = secptr + 40 * i;
+-# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
+-# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
+-# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
+-# 	lseek(dll, secptr1, SEEK_SET);
+-# 	read(dll, sname, 8);
+-# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
+-# 	{
+-# 	    expptr = fptr + (export_rva - vaddr);
+-# 	    if (export_rva + export_size > vaddr + vsize)
+-# 		export_size = vsize - (export_rva - vaddr);
+-# 	    break;
+-# 	}
+-#     }
 +if test -n "$lt_prog_compiler_pic_GCJ"; then
 +
 +{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
@@ -22547,7 +31495,7 @@
 +else
 +  lt_prog_compiler_pic_works_GCJ=no
 +  ac_outfile=conftest.$ac_objext
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
 +   # Insert the option either (1) after the last *FLAGS variable, or
 +   # (2) before a word containing "conftest.", or (3) at the end.
@@ -22558,11 +31506,11 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:17302: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17049: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>conftest.err)
 +   ac_status=$?
 +   cat conftest.err >&5
-+   echo "$as_me:17306: \$? = $ac_status" >&5
++   echo "$as_me:17053: \$? = $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 other than the usual output.
@@ -22599,9 +31547,15 @@
 +    ;;
 +esac
 +
-+#
+ #
+-#     expdata = (unsigned char*)malloc(export_size);
+-#     lseek (dll, expptr, SEEK_SET);
+-#     read (dll, expdata, export_size);
+-#     erva = expdata - export_rva;
 +# Check to make sure the static flag actually works.
-+#
+ #
+-#     nexp = pe_as32 (expdata+24);
+-#     name_rvas = pe_as32 (expdata+32);
 +wl=$lt_prog_compiler_wl_GCJ eval lt_tmp_static_flag=\"$lt_prog_compiler_static_GCJ\"
 +{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 +echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
@@ -22611,7 +31565,7 @@
 +  lt_prog_compiler_static_works_GCJ=no
 +   save_LDFLAGS="$LDFLAGS"
 +   LDFLAGS="$LDFLAGS $lt_tmp_static_flag"
-+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
++   echo "$lt_simple_link_test_code" > conftest.$ac_ext
 +   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
 +     # The linker can only warn and ignore the option if not recognized
 +     # So say no if there are warnings
@@ -22651,7 +31605,7 @@
 +   mkdir conftest
 +   cd conftest
 +   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +
 +   lt_compiler_flag="-o out/conftest2.$ac_objext"
 +   # Insert the option either (1) after the last *FLAGS variable, or
@@ -22662,11 +31616,11 @@
 +   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
 +   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
 +   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:17406: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:17153: $lt_compile\"" >&5)
 +   (eval "$lt_compile" 2>out/conftest.err)
 +   ac_status=$?
 +   cat out/conftest.err >&5
-+   echo "$as_me:17410: \$? = $ac_status" >&5
++   echo "$as_me:17157: \$? = $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
@@ -22686,27 +31640,12 @@
 +   cd ..
 +   rmdir conftest
 +   $rm conftest*
- 
--      # Test if we are trying to use run time linking or normal
--      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
--      # need to do runtime linking.
--      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
--	for ld_flag in $LDFLAGS; do
--	  case $ld_flag in
--	  *-brtl*)
--	    aix_use_runtimelinking=yes
--	    break
--	  ;;
--	  esac
--	done
--      esac
++
 +fi
 +{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
 +echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6; }
- 
--      exp_sym_flag='-bexport'
--      no_entry_flag='-bnoentry'
 +
++
 +hard_links="nottested"
 +if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
 +  # do not overwrite the value of need_locks provided by the user
@@ -22786,7 +31725,7 @@
 +    # Microsoft Visual C++.
 +    if test "$GCC" != yes; then
 +      with_gnu_ld=no
-     fi
++    fi
 +    ;;
 +  interix*)
 +    # we just hope/assume this is gcc and not c89 (= MSVC++)
@@ -22796,28 +31735,12 @@
 +    with_gnu_ld=no
 +    ;;
 +  esac
- 
--    # When large executables or shared objects are built, AIX ld can
--    # have problems creating the table of contents.  If linking a library
--    # or program results in "error TOC overflow" add -mminimal-toc to
--    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
--    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
++
 +  ld_shlibs_GCJ=yes
 +  if test "$with_gnu_ld" = yes; then
 +    # If archive_cmds runs LD, not CC, wlarc should be empty
 +    wlarc='${wl}'
- 
--    hardcode_direct=yes
--    archive_cmds=''
--    hardcode_libdir_separator=':'
--    if test "$GCC" = yes; then
--      case $host_os in aix4.[012]|aix4.[012].*)
--	collect2name=`${CC} -print-prog-name=collect2`
--	if test -f "$collect2name" && \
--	  strings "$collect2name" | grep resolve_lib_name >/dev/null
--	then
--	  # We have reworked collect2
--	  hardcode_direct=yes
++
 +    # Set some defaults for GNU ld with shared library support. These
 +    # are reset later if shared libraries are not supported. Putting them
 +    # here allows them to be overridden if necessary.
@@ -22889,7 +31812,7 @@
 +      allow_undefined_flag_GCJ=unsupported
 +      always_export_symbols_GCJ=no
 +      enable_shared_with_static_runtimes_GCJ=yes
-+      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
++      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
 +
 +      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
 +        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -22897,15 +31820,7 @@
 +	# is EXPORTS), use it as is; otherwise, prepend...
 +	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
 +	  cp $export_symbols $output_objdir/$soname.def;
- 	else
--	  # We have old collect2
--	  hardcode_direct=unsupported
--	  # It fails to find uninstalled libraries when the uninstalled
--	  # path is not listed in the libpath.  Setting hardcode_minus_L
--	  # to unsupported forces relinking
--	  hardcode_minus_L=yes
--	  hardcode_libdir_flag_spec='-L$libdir'
--	  hardcode_libdir_separator=
++	else
 +	  echo EXPORTS > $output_objdir/$soname.def;
 +	  cat $export_symbols >> $output_objdir/$soname.def;
 +	fi~
@@ -22915,7 +31830,7 @@
 +      fi
 +      ;;
 +
-+    interix3*)
++    interix[3-9]*)
 +      hardcode_direct_GCJ=no
 +      hardcode_shlibpath_var_GCJ=no
 +      hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
@@ -22930,7 +31845,7 @@
 +      archive_expsym_cmds_GCJ='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
 +      ;;
 +
-+    linux* | k*bsd*-gnu)
++    gnu* | linux* | k*bsd*-gnu)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
 +	case $cc_basename,$host_cpu in
@@ -22948,14 +31863,23 @@
 +	ifc* | ifort*)			# Intel Fortran compiler
 +	  tmp_addflag=' -nofor_main' ;;
 +	esac
-+	archive_cmds_GCJ='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++	case `$CC -V 2>&1 | sed 5q` in
++	*Sun\ C*)			# Sun C 5.9
++	  whole_archive_flag_spec_GCJ='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++	  tmp_sharedflag='-G' ;;
++	*Sun\ F*)			# Sun Fortran 8.3
++	  tmp_sharedflag='-G' ;;
++	*)
++	  tmp_sharedflag='-shared' ;;
++	esac
++	archive_cmds_GCJ='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
 +
 +	if test $supports_anon_versioning = yes; then
 +	  archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
 +  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 +  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
- 	fi
++	  $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++	fi
 +	link_all_deplibs_GCJ=no
 +      else
 +	ld_shlibs_GCJ=no
@@ -23017,12 +31941,9 @@
 +	    ld_shlibs_GCJ=no
 +	  fi
 +	;;
-       esac
++      esac
 +      ;;
- 
--      shared_flag='-shared'
--    else
--      # not using gcc
++
 +    sunos4*)
 +      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
 +      wlarc=
@@ -23064,24 +31985,20 @@
 +      ;;
 +
 +    aix4* | aix5*)
-       if test "$host_cpu" = ia64; then
--	shared_flag='${wl}-G'
++      if test "$host_cpu" = ia64; then
 +	# On IA64, the linker does run time linking by default, so we don't
 +	# have to do anything special.
 +	aix_use_runtimelinking=no
 +	exp_sym_flag='-Bexport'
 +	no_entry_flag=""
-       else
--	if test "$aix_use_runtimelinking" = yes; then
--	  shared_flag='${wl}-G'
++      else
 +	# If we're using GNU nm, then we don't want the "-C" option.
 +	# -C means demangle to AIX nm, but means don't demangle with GNU nm
 +	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
 +	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- 	else
--	  shared_flag='${wl}-bM:SRE'
++	else
 +	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
- 	fi
++	fi
 +	aix_use_runtimelinking=no
 +
 +	# Test if we are trying to use run time linking or normal
@@ -23099,23 +32016,8 @@
 +
 +	exp_sym_flag='-bexport'
 +	no_entry_flag='-bnoentry'
-       fi
--    fi
- 
--    # It seems that -bexpall can do strange things, so it is better to
--    # generate a list of symbols to export.
--    always_export_symbols=yes
--    if test "$aix_use_runtimelinking" = yes; then
--      # Warning - without using the other runtime loading flags (-brtl),
--      # -berok will link without error, but may produce a broken library.
--      allow_undefined_flag='-berok'
--      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
--      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--    else
--      if test "$host_cpu" = ia64; then
--	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
--	allow_undefined_flag="-z nodefs"
--	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++      fi
++
 +      # When large executables or shared objects are built, AIX ld can
 +      # have problems creating the table of contents.  If linking a library
 +      # or program results in "error TOC overflow" add -mminimal-toc to
@@ -23136,7 +32038,7 @@
 +  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
 +	  then
 +  	  # We have reworked collect2
-+  	  hardcode_direct_GCJ=yes
++  	  :
 +	  else
 +  	  # We have old collect2
 +  	  hardcode_direct_GCJ=unsupported
@@ -23153,14 +32055,7 @@
 +	if test "$aix_use_runtimelinking" = yes; then
 +	  shared_flag="$shared_flag "'${wl}-G'
 +	fi
-       else
--	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
--	# Warning - without using the other run time loading flags,
--	# -berok will link without error, but may produce a broken library.
--	allow_undefined_flag='${wl}-berok'
--	# This is a bit strange, but is similar to how AIX traditionally builds
--	# it's shared libraries.
--	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
++      else
 +	# not using gcc
 +	if test "$host_cpu" = ia64; then
 +  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
@@ -23173,17 +32068,8 @@
 +	    shared_flag='${wl}-bM:SRE'
 +	  fi
 +	fi
-       fi
--    fi
--    ;;
- 
--  amigaos*)
--    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_minus_L=yes
--    # see comment about different semantics on the GNU ld section
--    ld_shlibs=no
--    ;;
++      fi
++
 +      # It seems that -bexpall does not export symbols beginning with
 +      # underscore (_), so it is better to generate a list of symbols to export.
 +      always_export_symbols_GCJ=yes
@@ -23198,71 +32084,11 @@
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- 
--  cygwin* | mingw* | pw32*)
--    # When not using gcc, we currently assume that we are using
--    # Microsoft Visual C++.
--    # hardcode_libdir_flag_spec is actually meaningless, as there is
--    # no search path for DLLs.
--    hardcode_libdir_flag_spec=' '
--    allow_undefined_flag=unsupported
--    # Tell ltmain to make .lib files, not .a files.
--    libext=lib
--    # FIXME: Setting linknames here is a bad hack.
--    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
--    # The linker will automatically build a .lib file if we build a DLL.
--    old_archive_from_new_cmds='true'
--    # FIXME: Should let the user specify the lib program.
--    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
--    fix_srcfile_path='`cygpath -w "$srcfile"`'
--    ;;
--
--  darwin* | rhapsody*)
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      allow_undefined_flag='-flat_namespace -undefined suppress'
--      ;;
--    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!
--    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
--    # We need to add '_' to the symbols in $export_symbols first
--    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    whole_archive_flag_spec='-all_load $convenience'
--    ;;
--
--  freebsd1*)
--    ld_shlibs=no
--    ;;
--
--  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
--  # support.  Future versions do this automatically, but an explicit c++rt0.o
--  # does not break anything, and helps significantly (at the cost of a little
--  # extra space).
--  freebsd2.2*)
--    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    ;;
++
 +int
 +main ()
 +{
- 
--  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--  freebsd2*)
--    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_direct=yes
--    hardcode_minus_L=yes
--    hardcode_shlibpath_var=no
--    ;;
++
 +  ;
 +  return 0;
 +}
@@ -23280,74 +32106,32 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
- 
--  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--  freebsd*)
--    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    ;;
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
++
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 +# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
--  hpux9* | hpux10* | hpux11*)
--    case $host_os in
--    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
--    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
--    esac
--    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
--    hardcode_libdir_separator=:
--    hardcode_direct=yes
--    hardcode_minus_L=yes # Not in the search PATH, but as the default
--			 # location of the library.
--    export_dynamic_flag_spec='${wl}-E'
--    ;;
- 
--  irix5* | irix6* | nonstopux*)
--    if test "$GCC" = yes; then
--      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--    else
--      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--      hardcode_libdir_flag_spec='-rpath $libdir'
--    fi
--    hardcode_libdir_separator=:
--    link_all_deplibs=yes
--    ;;
++
++
 +fi
- 
--  netbsd*)
--    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+rm -f conftest.err conftest.$ac_objext \
++
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 +
@@ -23388,33 +32172,24 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
++lt_aix_libpath_sed='
++    /Import File Strings/,/^$/ {
++	/^0/ {
++	    s/^0  *\(.*\)$/\1/
++	    p
++	}
++    }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
 +# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi
++if test -z "$aix_libpath"; then
++  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
@@ -23422,7 +32197,7 @@
 +
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
 +
@@ -23468,7 +32243,7 @@
 +      # The linker will automatically build a .lib file if we build a DLL.
 +      old_archive_From_new_cmds_GCJ='true'
 +      # FIXME: Should let the user specify the lib program.
-+      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
++      old_archive_cmds_GCJ='lib -OUT:$oldlib$oldobjs$old_deplibs'
 +      fix_srcfile_path_GCJ='`cygpath -w "$srcfile"`'
 +      enable_shared_with_static_runtimes_GCJ=yes
 +      ;;
@@ -23506,26 +32281,21 @@
 +      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
 +      archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +      module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-     else
--      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
++    else
 +      case $cc_basename in
 +        xlc*)
 +         output_verbose_link_cmd='echo'
-+         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
++         archive_cmds_GCJ='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
 +         module_cmds_GCJ='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
 +          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++         archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
 +          module_expsym_cmds_GCJ='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}'
 +          ;;
 +       *)
 +         ld_shlibs_GCJ=no
 +          ;;
 +      esac
-     fi
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    ;;
++    fi
 +      ;;
 +
 +    dgux*)
@@ -23599,14 +32369,7 @@
 +	hardcode_minus_L_GCJ=yes
 +      fi
 +      ;;
- 
--  newsos6)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_direct=yes
--    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--    hardcode_libdir_separator=:
--    hardcode_shlibpath_var=no
--    ;;
++
 +    hpux11*)
 +      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
 +	case $host_cpu in
@@ -23654,27 +32417,7 @@
 +	esac
 +      fi
 +      ;;
- 
--  openbsd*)
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
--      export_dynamic_flag_spec='${wl}-E'
--    else
--      case "$host_os" in
--      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
--	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	hardcode_libdir_flag_spec='-R$libdir'
--        ;;
--      *)
--        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
--        ;;
--      esac
--    fi
--    ;;
++
 +    irix5* | irix6* | nonstopux*)
 +      if test "$GCC" = yes; then
 +	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
@@ -23686,14 +32429,7 @@
 +      hardcode_libdir_separator_GCJ=:
 +      link_all_deplibs_GCJ=yes
 +      ;;
- 
--  os2*)
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_minus_L=yes
--    allow_undefined_flag=unsupported
--    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
--    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
--    ;;
++
 +    netbsd* | netbsdelf*-gnu)
 +      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
@@ -23704,18 +32440,7 @@
 +      hardcode_direct_GCJ=yes
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
- 
--  osf3*)
--    if test "$GCC" = yes; then
--      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--    else
--      allow_undefined_flag=' -expect_unresolved \*'
--      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--    fi
--    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--    hardcode_libdir_separator=:
--    ;;
++
 +    newsos6)
 +      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_direct_GCJ=yes
@@ -23723,44 +32448,33 @@
 +      hardcode_libdir_separator_GCJ=:
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
- 
--  osf4* | osf5*)	# as osf3* with the addition of -msym flag
--    if test "$GCC" = yes; then
--      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--    else
--      allow_undefined_flag=' -expect_unresolved \*'
--      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++
 +    openbsd*)
-+      hardcode_direct_GCJ=yes
-+      hardcode_shlibpath_var_GCJ=no
-+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+	export_dynamic_flag_spec_GCJ='${wl}-E'
++      if test -f /usr/libexec/ld.so; then
++	hardcode_direct_GCJ=yes
++	hardcode_shlibpath_var_GCJ=no
++	if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	  archive_expsym_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++	  hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	  export_dynamic_flag_spec_GCJ='${wl}-E'
++	else
++	  case $host_os in
++	   openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	     archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	     hardcode_libdir_flag_spec_GCJ='-R$libdir'
++	     ;;
++	   *)
++	     archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++	     hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
++	     ;;
++	  esac
++        fi
 +      else
-+       case $host_os in
-+	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-+	   ;;
-+	 *)
-+	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-+	   ;;
-+       esac
++	ld_shlibs_GCJ=no
 +      fi
 +      ;;
- 
--      #Both c and cxx compiler support -rpath directly
--      hardcode_libdir_flag_spec='-rpath $libdir'
--    fi
--    hardcode_libdir_separator=:
--    ;;
++
 +    os2*)
 +      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 +      hardcode_minus_L_GCJ=yes
@@ -23768,14 +32482,7 @@
 +      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
 +      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
 +      ;;
- 
--  sco3.2v5*)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_shlibpath_var=no
--    runpath_var=LD_RUN_PATH
--    hardcode_runpath_var=yes
--    export_dynamic_flag_spec='${wl}-Bexport'
--    ;;
++
 +    osf3*)
 +      if test "$GCC" = yes; then
 +	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23787,21 +32494,7 @@
 +      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
 +      hardcode_libdir_separator_GCJ=:
 +      ;;
- 
--  solaris*)
--    # gcc --version < 3.0 without binutils cannot create self contained
--    # shared libraries reliably, requiring libgcc.a to resolve some of
--    # the object symbols generated in some cases.  Libraries that use
--    # assert need libgcc.a to resolve __eprintf, for example.  Linking
--    # a copy of libgcc.a into every shared library to guarantee resolving
--    # such symbols causes other problems:  According to Tim Van Holder
--    # <tim.van.holder at pandora.be>, C++ libraries end up with a separate
--    # (to the application) exception stack for one thing.
--    no_undefined_flag=' -z defs'
--    if test "$GCC" = yes; then
--      case `$CC --version 2>/dev/null` in
--      [12].*)
--	cat <<EOF 1>&2
++
 +    osf4* | osf5*)	# as osf3* with the addition of -msym flag
 +      if test "$GCC" = yes; then
 +	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -23812,25 +32505,13 @@
 +	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
 +	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
 +	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
--*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
--*** create self contained shared libraries on Solaris systems, without
--*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
--*** -no-undefined support, which will at least allow you to build shared
--*** libraries.  However, you may find that when you link such libraries
--*** into an application without using GCC, you have to manually add
--*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
--*** upgrade to a newer version of GCC.  Another option is to rebuild your
--*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
++
 +	# Both c and cxx compiler support -rpath directly
 +	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
 +      fi
 +      hardcode_libdir_separator_GCJ=:
 +      ;;
- 
--EOF
--        no_undefined_flag=
--	;;
++
 +    solaris*)
 +      no_undefined_flag_GCJ=' -z text'
 +      if test "$GCC" = yes; then
@@ -23849,49 +32530,20 @@
 +      case $host_os in
 +      solaris2.[0-5] | solaris2.[0-5].*) ;;
 +      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
++	# The compiler driver will combine and reorder linker options,
++	# but understands `-z linker_flag'.  GCC discards it without `$wl',
++	# but is careful enough not to reorder.
 + 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-       esac
--    fi
--    # $CC -shared without GNU ld will not create a library from C++
--    # object files and a static libstdc++, better avoid it by now
--    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_shlibpath_var=no
--    case $host_os in
--    solaris2.[0-5] | solaris2.[0-5].*) ;;
--    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
--    esac
--    link_all_deplibs=yes
--    ;;
++	if test "$GCC" = yes; then
++	  whole_archive_flag_spec_GCJ='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++	else
++	  whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract'
++	fi
++	;;
++      esac
 +      link_all_deplibs_GCJ=yes
 +      ;;
- 
--  sunos4*)
--    if test "x$host_vendor" = xsequent; then
--      # Use $CC to link under sequent, because it throws in some extra .o
--      # files that make .init and .fini sections work.
--      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
--    else
--      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
--    fi
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_direct=yes
--    hardcode_minus_L=yes
--    hardcode_shlibpath_var=no
--    ;;
++
 +    sunos4*)
 +      if test "x$host_vendor" = xsequent; then
 +	# Use $CC to link under sequent, because it throws in some extra .o
@@ -23905,23 +32557,7 @@
 +      hardcode_minus_L_GCJ=yes
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
- 
--  sysv4)
--    case $host_vendor in
--      sni)
--        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--        hardcode_direct=yes # is this really true???
--        ;;
--      siemens)
--        ## LD is ld it makes a PLAMLIB
--        ## CC just makes a GrossModule.
--        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--        reload_cmds='$CC -r -o $output$reload_objs'
--        hardcode_direct=no
--        ;;
--      motorola)
--        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
++
 +    sysv4)
 +      case $host_vendor in
 +	sni)
@@ -23934,41 +32570,7 @@
 +	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
 +	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
 +	  hardcode_direct_GCJ=no
-         ;;
--    esac
--    runpath_var='LD_RUN_PATH'
--    hardcode_shlibpath_var=no
--    ;;
--
--  sysv4.3*)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_shlibpath_var=no
--    export_dynamic_flag_spec='-Bexport'
--    ;;
--
--  sysv5*)
--    no_undefined_flag=' -z text'
--    # $CC -shared without GNU ld will not create a library from C++
--    # object files and a static libstdc++, better avoid it by now
--    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
--    hardcode_libdir_flag_spec=
--    hardcode_shlibpath_var=no
--    runpath_var='LD_RUN_PATH'
--    ;;
--
--  uts4*)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_shlibpath_var=no
--    ;;
--
--  dgux*)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_shlibpath_var=no
--    ;;
++        ;;
 +	motorola)
 +	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
@@ -23977,30 +32579,13 @@
 +      runpath_var='LD_RUN_PATH'
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
- 
--  sysv4*MP*)
--    if test -d /usr/nec; then
--      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var=no
--      runpath_var=LD_RUN_PATH
--      hardcode_runpath_var=yes
--      ld_shlibs=yes
--    fi
--    ;;
++
 +    sysv4.3*)
 +      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_shlibpath_var_GCJ=no
 +      export_dynamic_flag_spec_GCJ='-Bexport'
 +      ;;
- 
--  sysv4.2uw2*)
--    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_direct=yes
--    hardcode_minus_L=no
--    hardcode_shlibpath_var=no
--    hardcode_runpath_var=yes
--    runpath_var=LD_RUN_PATH
--    ;;
++
 +    sysv4*MP*)
 +      if test -d /usr/nec; then
 +	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
@@ -24010,18 +32595,8 @@
 +	ld_shlibs_GCJ=yes
 +      fi
 +      ;;
- 
--  sysv5uw7* | unixware7*)
--    no_undefined_flag='${wl}-z ${wl}text'
--    if test "$GCC" = yes; then
--      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--    else
--      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--    fi
--    runpath_var='LD_RUN_PATH'
--    hardcode_shlibpath_var=no
--    ;;
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*)
++
++    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
 +      no_undefined_flag_GCJ='${wl}-z,text'
 +      archive_cmds_need_lc_GCJ=no
 +      hardcode_shlibpath_var_GCJ=no
@@ -24035,14 +32610,7 @@
 +	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
- 
--  *)
--    ld_shlibs=no
--    ;;
--  esac
--fi
--echo "$ac_t""$ld_shlibs" 1>&6
--test "$ld_shlibs" = no && can_build_shared=no
++
 +    sysv5* | sco3.2v5* | sco5v6*)
 +      # Note: We can NOT use -z defs as we might desire, because we do not
 +      # link with -lc, and that would cause any symbols used from libc to
@@ -24068,68 +32636,41 @@
 +	archive_expsym_cmds_GCJ='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
 +      fi
 +      ;;
- 
--# Check hardcoding attributes.
--echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6
--echo "configure:4147: checking how to hardcode library paths into programs" >&5
--hardcode_action=
--if test -n "$hardcode_libdir_flag_spec" || \
--   test -n "$runpath_var"; then
++
 +    uts4*)
 +      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
 +      hardcode_libdir_flag_spec_GCJ='-L$libdir'
 +      hardcode_shlibpath_var_GCJ=no
 +      ;;
- 
--  # We can hardcode non-existant directories.
--  if test "$hardcode_direct" != 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 "$hardcode_shlibpath_var" != no &&
--     test "$hardcode_minus_L" != no; then
--    # Linking always hardcodes the temporary library directory.
--    hardcode_action=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    hardcode_action=immediate
++
 +    *)
 +      ld_shlibs_GCJ=no
 +      ;;
 +    esac
-   fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  hardcode_action=unsupported
--fi
--echo "$ac_t""$hardcode_action" 1>&6
- 
--striplib=
--old_striplib=
--echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6
--echo "configure:4175: checking whether stripping libraries is possible" >&5
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  echo "$ac_t""yes" 1>&6
--else
--  echo "$ac_t""no" 1>&6
--fi
++  fi
++
 +{ echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
 +echo "${ECHO_T}$ld_shlibs_GCJ" >&6; }
 +test "$ld_shlibs_GCJ" = no && can_build_shared=no
- 
--reload_cmds='$LD$reload_flag -o $output$reload_objs'
--test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+#
++
+ #
+-#     printf ("EXPORTS\n");
+-#     for (i = 0; i<nexp; i++)
+-#     {
+-# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
+-# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
+-#     }
 +# Do we need to explicitly link libc?
-+#
+ #
+-#     return 0;
+-# }
+-# /* impgen.c ends here */
 +case "x$archive_cmds_need_lc_GCJ" in
 +x|xyes)
 +  # Assume -lc should be added
 +  archive_cmds_need_lc_GCJ=yes
-+
+ 
+-EOF
 +  if test "$enable_shared" = yes && test "$GCC" = yes; then
 +    case $archive_cmds_GCJ in
 +    *'~'*)
@@ -24142,7 +32683,7 @@
 +      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
 +echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
 +      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 +
 +      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
 +  (eval $ac_compile) 2>&5
@@ -24184,82 +32725,57 @@
 +  fi
 +  ;;
 +esac
- 
--# PORTME Fill in your ld.so characteristics
--echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6
--echo "configure:4189: checking dynamic linker characteristics" >&5
++
 +{ echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
 +echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
++library_names_spec=
++libname_spec='lib$name'
++soname_spec=
 +shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -4197,17 +18523,36 @@
- shlibpath_overrides_runpath=unknown
- version_type=none
- dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib /usr/X11R6/lib"
++postinstall_cmds=
++postuninstall_cmds=
++finish_cmds=
++finish_eval=
++shlibpath_var=
++shlibpath_overrides_runpath=unknown
++version_type=none
++dynamic_linker="$host_os ld.so"
 +sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
-+else
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-+fi
++
 +need_lib_prefix=unknown
 +hardcode_into_libs=no
 +
 +# when you set need_version to no, make sure it does not cause -set_version
 +# flags to be left without arguments
 +need_version=unknown
- 
- case $host_os in
- aix3*)
-   version_type=linux
--  library_names_spec='${libname}${release}.so$versuffix $libname.a'
++
++case $host_os in
++aix3*)
++  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-   shlibpath_var=LIBPATH
- 
--  # AIX has no versioning support, so we append a major version to the name.
--  soname_spec='${libname}${release}.so$major'
++  shlibpath_var=LIBPATH
++
 +  # AIX 3 has no versioning support, so we append a major version to the name.
 +  soname_spec='${libname}${release}${shared_ext}$major'
-   ;;
- 
- aix4* | aix5*)
-@@ -4217,7 +18562,7 @@
-   hardcode_into_libs=yes
-   if test "$host_cpu" = ia64; then
-     # AIX 5 supports IA64
--    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
++  ;;
++
++aix4* | aix5*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
++  hardcode_into_libs=yes
++  if test "$host_cpu" = ia64; then
++    # AIX 5 supports IA64
 +    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-     shlibpath_var=LD_LIBRARY_PATH
-   else
-     # With GCC up to 2.95.x, collect2 would create an import file
-@@ -4227,57 +18572,54 @@
-     # development snapshots of GCC prior to 3.0.
-     case $host_os in
-       aix4 | aix4.[01] | aix4.[01].*)
--	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
--	     echo ' yes '
--	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
--	  :
--	else
--	  can_build_shared=no
--	fi
--	;;
++    shlibpath_var=LD_LIBRARY_PATH
++  else
++    # With GCC up to 2.95.x, collect2 would create an import file
++    # for dependence libraries.  The import file would start with
++    # the line `#! .'.  This would cause the generated library to
++    # depend on `.', always an invalid library.  This was fixed in
++    # development snapshots of GCC prior to 3.0.
++    case $host_os in
++      aix4 | aix4.[01] | aix4.[01].*)
 +      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
 +	   echo ' yes '
 +	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
@@ -24268,88 +32784,70 @@
 +	can_build_shared=no
 +      fi
 +      ;;
-     esac
--    # AIX (on Power*) has no versioning support, so currently we can
--    # not hardcode correct soname into executable. Probably we can
--    # add versioning support to collect2, so additional links can
--    # be useful in future.
++    esac
 +    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
 +    # soname into executable. Probably we can add versioning support to
 +    # collect2, so additional links can be useful in future.
-     if test "$aix_use_runtimelinking" = yes; then
-       # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-       # instead of lib<name>.a to let people know that these are not
-       # typical AIX shared libraries.
--      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++    if test "$aix_use_runtimelinking" = yes; then
++      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
++      # instead of lib<name>.a to let people know that these are not
++      # typical AIX shared libraries.
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     else
-       # We preserve .a as extension for shared libraries through AIX4.2
-       # and later when we are not doing run time linking.
-       library_names_spec='${libname}${release}.a $libname.a'
--      soname_spec='${libname}${release}.so$major'
++    else
++      # We preserve .a as extension for shared libraries through AIX4.2
++      # and later when we are not doing run time linking.
++      library_names_spec='${libname}${release}.a $libname.a'
 +      soname_spec='${libname}${release}${shared_ext}$major'
-     fi
-     shlibpath_var=LIBPATH
-   fi
--  hardcode_into_libs=yes
-   ;;
- 
- amigaos*)
-   library_names_spec='$libname.ixlibrary $libname.a'
-   # Create ${libname}_ixlibrary.a entries in /sys/libs.
--  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++    fi
++    shlibpath_var=LIBPATH
++  fi
++  ;;
++
++amigaos*)
++  library_names_spec='$libname.ixlibrary $libname.a'
++  # Create ${libname}_ixlibrary.a entries in /sys/libs.
 +  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-   ;;
- 
- beos*)
--  library_names_spec='${libname}.so'
++  ;;
++
++beos*)
 +  library_names_spec='${libname}${shared_ext}'
-   dynamic_linker="$host_os ld.so"
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
++  dynamic_linker="$host_os ld.so"
++  shlibpath_var=LIBRARY_PATH
++  ;;
++
 +bsdi[45]*)
-   version_type=linux
-   need_version=no
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
++  version_type=linux
++  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-   sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
--  export_dynamic_flag_spec=-rdynamic
-   # the default ld.so.conf also contains /usr/contrib/lib and
-   # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-   # libtool to hard-code these into programs
-@@ -4285,29 +18627,56 @@
- 
- cygwin* | mingw* | pw32*)
-   version_type=windows
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
++  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
++  # the default ld.so.conf also contains /usr/contrib/lib and
++  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
++  # libtool to hard-code these into programs
++  ;;
++
++cygwin* | mingw* | pw32*)
++  version_type=windows
 +  shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
++  need_version=no
++  need_lib_prefix=no
 +
-   case $GCC,$host_os in
--  yes,cygwin*)
++  case $GCC,$host_os in
 +  yes,cygwin* | yes,mingw* | yes,pw32*)
-     library_names_spec='$libname.dll.a'
--    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
--    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
++    library_names_spec='$libname.dll.a'
 +    # DLL is installed to $(libdir)/../bin by postinstall_cmds
 +    postinstall_cmds='base_file=`basename \${file}`~
 +      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-       dldir=$destdir/`dirname \$dlpath`~
-       test -d \$dldir || mkdir -p \$dldir~
--      $install_prog .libs/$dlname \$dldir/$dlname'
--    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
++      dldir=$destdir/`dirname \$dlpath`~
++      test -d \$dldir || mkdir -p \$dldir~
 +      $install_prog $dir/$dlname \$dldir/$dlname~
 +      chmod a+x \$dldir/$dlname'
 +    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-       dlpath=$dir/\$dldll~
-        $rm \$dlpath'
++      dlpath=$dir/\$dldll~
++       $rm \$dlpath'
 +    shlibpath_overrides_runpath=yes
 +
 +    case $host_os in
@@ -24379,41 +32877,36 @@
 +      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
 +      ;;
 +    esac
-     ;;
--  yes,mingw*)
--    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
--    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
--    ;;
--  yes,pw32*)
--    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/./-/g'`${versuffix}.dll'
--    ;;
++    ;;
 +
-   *)
--    library_names_spec='${libname}`echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll $libname.lib'
++  *)
 +    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
      ;;
    esac
-   dynamic_linker='Win32 ld.exe'
-@@ -4320,30 +18689,53 @@
-   version_type=darwin
-   need_lib_prefix=no
-   need_version=no
--  # 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='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
--  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
++  dynamic_linker='Win32 ld.exe'
++  # FIXME: first we should search . and the directory the executable is in
++  shlibpath_var=PATH
++  ;;
+ 
+-  # We use sed instead of cat because bash on DJGPP gets confused if
+-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+-  # text mode, it properly converts lines to CR/LF.  This bash problem
+-  # is reportedly fixed, but why not run on old versions too?
+-  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
++darwin* | rhapsody*)
++  dynamic_linker="$host_os dyld"
++  version_type=darwin
++  need_lib_prefix=no
++  need_version=no
 +  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
 +  soname_spec='${libname}${release}${major}$shared_ext'
-   shlibpath_overrides_runpath=yes
-   shlibpath_var=DYLD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  shlibpath_var=DYLD_LIBRARY_PATH
 +  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-+  else
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-+  fi
+ 
+-  mv -f "${ofile}T" "$ofile" || \
+-    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
+-  chmod +x "$ofile"
 +  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
 +  ;;
 +
@@ -24424,14 +32917,12 @@
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
- freebsd1*)
-   dynamic_linker=no
-   ;;
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++  ;;
++
++freebsd1*)
++  dynamic_linker=no
++  ;;
++
 +freebsd* | dragonfly*)
 +  # DragonFly does not have aout.  When/if they implement a new
 +  # versioning mechanism, adjust this.
@@ -24443,64 +32934,55 @@
 +    *) objformat=elf ;;
 +    esac
 +  fi
-   version_type=freebsd-$objformat
-   case $version_type in
-     freebsd-elf*)
--      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
++  version_type=freebsd-$objformat
++  case $version_type in
++    freebsd-elf*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-       need_version=no
-       need_lib_prefix=no
-       ;;
-     freebsd-*)
--      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
++      need_version=no
++      need_lib_prefix=no
++      ;;
++    freebsd-*)
 +      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-       need_version=yes
-       ;;
-   esac
-@@ -4352,10 +18744,19 @@
-   freebsd2*)
-     shlibpath_overrides_runpath=yes
-     ;;
--  *)
++      need_version=yes
++      ;;
++  esac
++  shlibpath_var=LD_LIBRARY_PATH
++  case $host_os in
++  freebsd2*)
++    shlibpath_overrides_runpath=yes
++    ;;
 +  freebsd3.[01]* | freebsdelf3.[01]*)
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
 +  freebsd3.[2-9]* | freebsdelf3.[2-9]* | \
 +  freebsd4.[0-5] | freebsdelf4.[0-5] | freebsd4.1.1 | freebsdelf4.1.1)
-     shlibpath_overrides_runpath=no
-     hardcode_into_libs=yes
-     ;;
-+  freebsd*) # from 4.6 on
++    shlibpath_overrides_runpath=no
++    hardcode_into_libs=yes
++    ;;
++  *) # from 4.6 on, and DragonFly
 +    shlibpath_overrides_runpath=yes
 +    hardcode_into_libs=yes
 +    ;;
-   esac
-   ;;
- 
-@@ -4363,8 +18764,8 @@
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
--  soname_spec='${libname}${release}.so$major'
++  esac
++  ;;
++
++gnu*)
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-   hardcode_into_libs=yes
-   ;;
-@@ -4372,36 +18773,87 @@
- hpux9* | hpux10* | hpux11*)
-   # Give a soname corresponding to the major version so that dld.sl refuses to
-   # link against other versions.
--  dynamic_linker="$host_os dld.sl"
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
--  shlibpath_var=SHLIB_PATH
--  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
--  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
--  soname_spec='${libname}${release}.sl$major'
++  shlibpath_var=LD_LIBRARY_PATH
++  hardcode_into_libs=yes
++  ;;
++
++hpux9* | hpux10* | hpux11*)
++  # Give a soname corresponding to the major version so that dld.sl refuses to
++  # link against other versions.
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
 +  case $host_cpu in
 +  ia64*)
 +    shrext_cmds='.so'
@@ -24537,11 +33019,11 @@
 +    soname_spec='${libname}${release}${shared_ext}$major'
 +    ;;
 +  esac
-   # HP-UX runs *really* slowly unless shared libraries are mode 555.
-   postinstall_cmds='chmod 555 $lib'
-   ;;
- 
-+interix3*)
++  # HP-UX runs *really* slowly unless shared libraries are mode 555.
++  postinstall_cmds='chmod 555 $lib'
++  ;;
++
++interix[3-9]*)
 +  version_type=linux
 +  need_lib_prefix=no
 +  need_version=no
@@ -24553,89 +33035,78 @@
 +  hardcode_into_libs=yes
 +  ;;
 +
- irix5* | irix6* | nonstopux*)
-   case $host_os in
-     nonstopux*) version_type=nonstopux ;;
--    *)          version_type=irix ;;
++irix5* | irix6* | nonstopux*)
++  case $host_os in
++    nonstopux*) version_type=nonstopux ;;
 +    *)
 +	if test "$lt_cv_prog_gnu_ld" = yes; then
 +		version_type=linux
 +	else
 +		version_type=irix
 +	fi ;;
-   esac
-   need_lib_prefix=no
-   need_version=no
--  soname_spec='${libname}${release}.so$major'
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
++  esac
++  need_lib_prefix=no
++  need_version=no
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-   case $host_os in
-   irix5* | nonstopux*)
-     libsuff= shlibsuff=
-     ;;
-   *)
-     case $LD in # libtool.m4 will add one of these switches to LD
--    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
--    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
--    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
++  case $host_os in
++  irix5* | nonstopux*)
++    libsuff= shlibsuff=
++    ;;
++  *)
++    case $LD in # libtool.m4 will add one of these switches to LD
 +    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
 +      libsuff= shlibsuff= libmagic=32-bit;;
 +    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
 +      libsuff=32 shlibsuff=N32 libmagic=N32;;
 +    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
 +      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-     *) libsuff= shlibsuff= libmagic=never-match;;
-     esac
-     ;;
-@@ -4410,20 +18862,21 @@
-   shlibpath_overrides_runpath=no
-   sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-   sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
++    *) libsuff= shlibsuff= libmagic=never-match;;
++    esac
++    ;;
++  esac
++  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
++  shlibpath_overrides_runpath=no
++  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
++  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
 +  hardcode_into_libs=yes
-   ;;
- 
- # No shared lib support for Linux oldld, aout, or coff.
--linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
++  ;;
++
++# No shared lib support for Linux oldld, aout, or coff.
 +linux*oldld* | linux*aout* | linux*coff*)
-   dynamic_linker=no
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
++  dynamic_linker=no
++  ;;
++
++# This must be Linux ELF.
 +linux* | k*bsd*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
++  version_type=linux
++  need_lib_prefix=no
++  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=no
-@@ -4432,12 +18885,11 @@
-   # before this can be enabled.
-   hardcode_into_libs=yes
- 
--  case $host_cpu:$lt_cv_cc_64bit_output in
--  powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
--    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
--    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
--    ;;
--  esac
++  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=no
++  # This implies no fast_install, which is unacceptable.
++  # Some rework will be needed to allow for fast_install
++  # before this can be enabled.
++  hardcode_into_libs=yes
++
 +  # Append ld.so.conf contents to the search path
 +  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ 	]*hwcap[ 	]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
 +    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
 +  fi
- 
-   # We used to test for /lib/ld.so.1 and disable shared libraries on
-   # powerpc, because MkLinux only supported shared libraries with the
-@@ -4448,17 +18900,29 @@
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
++
++  # 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,
++  # most powerpc-linux boxes support dynamic linking these days and
++  # people can always --disable-shared, the test was removed, and we
++  # assume the GNU/Linux dynamic linker is in use.
++  dynamic_linker='GNU/Linux ld.so'
++  ;;
++
 +netbsdelf*-gnu)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -24648,28 +33119,26 @@
 +  dynamic_linker='NetBSD ld.elf_so'
 +  ;;
 +
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-   if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
++netbsd*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-     finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-     dynamic_linker='NetBSD (a.out) ld.so'
-   else
--    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
--    soname_spec='${libname}${release}.so$major'
++    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
++    dynamic_linker='NetBSD (a.out) ld.so'
++  else
 +    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
 +    soname_spec='${libname}${release}${shared_ext}$major'
-     dynamic_linker='NetBSD ld.elf_so'
-   fi
-   shlibpath_var=LD_LIBRARY_PATH
-@@ -4468,788 +18932,757 @@
- 
- newsos6)
-   version_type=linux
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++    dynamic_linker='NetBSD ld.elf_so'
++  fi
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
++newsos6)
++  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
@@ -24681,15 +33150,14 @@
 +  need_version=no
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-   shlibpath_overrides_runpath=yes
-   ;;
- 
- openbsd*)
-   version_type=sunos
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  ;;
++
++openbsd*)
++  version_type=sunos
 +  sys_lib_dlsearch_path_spec="/usr/lib"
-   need_lib_prefix=no
--  need_version=no
++  need_lib_prefix=no
 +  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
 +  case $host_os in
 +    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
@@ -24698,15 +33166,7 @@
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
 +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
 +  shlibpath_var=LD_LIBRARY_PATH
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    case "$host_os" in
--    openbsd2.[89] | openbsd2.[89].*)
--      shlibpath_overrides_runpath=no
--      ;;
--    *)
--      shlibpath_overrides_runpath=yes
--      ;;
--    esac
++  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
 +    case $host_os in
 +      openbsd2.[89] | openbsd2.[89].*)
 +	shlibpath_overrides_runpath=no
@@ -24715,37 +33175,35 @@
 +	shlibpath_overrides_runpath=yes
 +	;;
 +      esac
-   else
-     shlibpath_overrides_runpath=yes
-   fi
--  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
- os2*)
-   libname_spec='$name'
++  else
++    shlibpath_overrides_runpath=yes
++  fi
++  ;;
++
++os2*)
++  libname_spec='$name'
 +  shrext_cmds=".dll"
-   need_lib_prefix=no
--  library_names_spec='$libname.dll $libname.a'
++  need_lib_prefix=no
 +  library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-   shlibpath_var=LIBPATH
-   ;;
- 
- osf3* | osf4* | osf5*)
-   version_type=osf
++  dynamic_linker='OS/2 ld.exe'
++  shlibpath_var=LIBPATH
++  ;;
++
++osf3* | osf4* | osf5*)
++  version_type=osf
 +  need_lib_prefix=no
-   need_version=no
--  soname_spec='${libname}${release}.so$major'
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  need_version=no
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-   shlibpath_var=LD_LIBRARY_PATH
-   sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-   sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
++  shlibpath_var=LD_LIBRARY_PATH
++  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
++  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
 +  ;;
 +
++rdos*)
++  dynamic_linker=no
++  ;;
++
 +solaris*)
 +  version_type=linux
 +  need_lib_prefix=no
@@ -24754,15 +33212,11 @@
 +  soname_spec='${libname}${release}${shared_ext}$major'
 +  shlibpath_var=LD_LIBRARY_PATH
 +  shlibpath_overrides_runpath=yes
-   hardcode_into_libs=yes
++  hardcode_into_libs=yes
 +  # ldd complains unless libraries are executable
 +  postinstall_cmds='chmod +x $lib'
-   ;;
- 
--sco3.2v5*)
--  version_type=osf
--  soname_spec='${libname}${release}.so$major'
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
++  ;;
++
 +sunos4*)
 +  version_type=sunos
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
@@ -24835,21 +33289,9 @@
 +  version_type=linux
 +  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
 +  soname_spec='${libname}${release}${shared_ext}$major'
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--solaris*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  # ldd complains unless libraries are executable
--  postinstall_cmds='chmod +x $lib'
--  ;;
++  shlibpath_var=LD_LIBRARY_PATH
++  ;;
++
 +*)
 +  dynamic_linker=no
 +  ;;
@@ -24861,15 +33303,15 @@
 +variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
 +if test "$GCC" = yes; then
 +  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+
+ fi
+ 
 +{ echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
 +echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6; }
 +hardcode_action_GCJ=
 +if test -n "$hardcode_libdir_flag_spec_GCJ" || \
 +   test -n "$runpath_var_GCJ" || \
 +   test "X$hardcode_automatic_GCJ" = "Xyes" ; then
-+
+ 
 +  # We can hardcode non-existant directories.
 +  if test "$hardcode_direct_GCJ" != no &&
 +     # If the only mechanism to avoid hardcoding is shlibpath_var, we
@@ -24956,6 +33398,7 @@
 +    module_cmds_GCJ \
 +    module_expsym_cmds_GCJ \
 +    lt_cv_prog_compiler_c_o_GCJ \
++    fix_srcfile_path_GCJ \
 +    exclude_expsyms_GCJ \
 +    include_expsyms_GCJ; do
 +
@@ -25126,155 +33569,52 @@
 +
 +# Compiler flag to allow reflexive dlopens.
 +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
- 
--sunos4*)
--  version_type=sunos
--  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
--  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
--  fi
--  need_version=yes
--  ;;
++
 +# Compiler flag to generate shared objects directly from archives.
 +whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
- 
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--  version_type=linux
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_vendor in
--    sni)
--      shlibpath_overrides_runpath=no
--      need_lib_prefix=no
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      runpath_var=LD_RUN_PATH
--      ;;
--    siemens)
--      need_lib_prefix=no
--      ;;
--    motorola)
--      need_lib_prefix=no
--      need_version=no
--      shlibpath_overrides_runpath=no
--      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
--      ;;
--  esac
--  ;;
++
 +# Compiler flag to generate thread-safe objects.
 +thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
- 
--uts4*)
--  version_type=linux
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
++
 +# Library versioning type.
 +version_type=$version_type
- 
--dgux*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
++
 +# Format of library name prefix.
 +libname_spec=$lt_libname_spec
- 
--sysv4*MP*)
--  if test -d /usr/nec ;then
--    version_type=linux
--    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
--    soname_spec='$libname.so.$major'
--    shlibpath_var=LD_LIBRARY_PATH
--  fi
--  ;;
++
 +# List of archive names.  First name is the real one, the rest are links.
 +# The last name is the one that the linker finds with -lNAME.
 +library_names_spec=$lt_library_names_spec
- 
--*)
--  dynamic_linker=no
--  ;;
--esac
--echo "$ac_t""$dynamic_linker" 1>&6
--test "$dynamic_linker" = no && can_build_shared=no
++
 +# The coded name of the library, if different from the real name.
 +soname_spec=$lt_soname_spec
- 
--# Report the final consequences.
--echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6
--echo "configure:4607: checking if libtool supports shared libraries" >&5
--echo "$ac_t""$can_build_shared" 1>&6
++
 +# Commands used to build and install an old-style archive.
 +RANLIB=$lt_RANLIB
 +old_archive_cmds=$lt_old_archive_cmds_GCJ
 +old_postinstall_cmds=$lt_old_postinstall_cmds
 +old_postuninstall_cmds=$lt_old_postuninstall_cmds
- 
--echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6
--echo "configure:4611: checking whether to build shared libraries" >&5
--test "$can_build_shared" = "no" && enable_shared=no
++
 +# Create an old-style archive from a shared archive.
 +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
- 
--# On AIX, shared libraries and static libraries use the same namespace, and
--# are all built from PIC.
--case "$host_os" in
--aix3*)
--  test "$enable_shared" = yes && enable_static=no
--  if test -n "$RANLIB"; then
--    archive_cmds="$archive_cmds~\$RANLIB \$lib"
--    postinstall_cmds='$RANLIB $lib'
--  fi
--  ;;
++
 +# Create a temporary old-style archive to link instead of a shared archive.
 +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
- 
--aix4*)
--  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
--    test "$enable_shared" = yes && enable_static=no
--  fi
--  ;;
--esac
--echo "$ac_t""$enable_shared" 1>&6
++
 +# Commands used to build and install a shared archive.
 +archive_cmds=$lt_archive_cmds_GCJ
 +archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
 +postinstall_cmds=$lt_postinstall_cmds
 +postuninstall_cmds=$lt_postuninstall_cmds
- 
--echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6
--echo "configure:4634: checking whether to build static libraries" >&5
--# Make sure either enable_shared or enable_static is yes.
--test "$enable_shared" = yes || enable_static=yes
--echo "$ac_t""$enable_static" 1>&6
++
 +# Commands used to build a loadable module (assumed same as above if empty)
 +module_cmds=$lt_module_cmds_GCJ
 +module_expsym_cmds=$lt_module_expsym_cmds_GCJ
- 
--if test "$hardcode_action" = relink; then
--  # Fast installation is not supported
--  enable_fast_install=no
--elif test "$shlibpath_overrides_runpath" = yes ||
--     test "$enable_shared" = no; then
--  # Fast installation is not necessary
--  enable_fast_install=needless
--fi
++
 +# Commands to strip libraries.
 +old_striplib=$lt_old_striplib
 +striplib=$lt_striplib
- 
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
--  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
++
 +# Dependencies to place before the objects being linked to create a
 +# shared library.
 +predep_objects=$lt_predep_objects_GCJ
@@ -25294,464 +33634,113 @@
 +# The library search path used internally by the compiler when linking
 +# a shared library.
 +compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
- 
--if test "x$enable_dlopen" != xyes; then
--  enable_dlopen=unknown
--  enable_dlopen_self=unknown
--  enable_dlopen_self_static=unknown
--else
--  lt_cv_dlopen=no
--  lt_cv_dlopen_libs=
++
 +# Method to check whether dependent libraries are shared objects.
 +deplibs_check_method=$lt_deplibs_check_method
- 
--  case $host_os in
--  beos*)
--    lt_cv_dlopen="load_add_on"
--    lt_cv_dlopen_libs=
--    lt_cv_dlopen_self=yes
--    ;;
++
 +# Command to use when deplibs_check_method == file_magic.
 +file_magic_cmd=$lt_file_magic_cmd
- 
--  cygwin* | mingw* | pw32*)
--    lt_cv_dlopen="LoadLibrary"
--    lt_cv_dlopen_libs=
--   ;;
++
 +# Flag that allows shared libraries with undefined symbols to be built.
 +allow_undefined_flag=$lt_allow_undefined_flag_GCJ
- 
--  *)
--    echo $ac_n "checking for shl_load""... $ac_c" 1>&6
--echo "configure:4675: checking for shl_load" >&5
--if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 4680 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char shl_load(); below.  */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char shl_load();
++
 +# Flag that forces no undefined symbols.
 +no_undefined_flag=$lt_no_undefined_flag_GCJ
- 
--int main() {
++
 +# Commands used to finish a libtool library installation in a directory.
 +finish_cmds=$lt_finish_cmds
- 
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_shl_load) || defined (__stub___shl_load)
--choke me
--#else
--shl_load();
--#endif
++
 +# Same as above, but a single script fragment to be evaled but not shown.
 +finish_eval=$lt_finish_eval
- 
--; return 0; }
--EOF
--if { (eval echo configure:4703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func_shl_load=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_shl_load=no"
--fi
--rm -f conftest*
--fi
++
 +# Take the output of nm and produce a listing of raw symbols and C names.
 +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
- 
--if eval "test \"`echo '$ac_cv_func_'shl_load`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  lt_cv_dlopen="shl_load"
--else
--  echo "$ac_t""no" 1>&6
--echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
--echo "configure:4721: checking for shl_load in -ldld" >&5
--ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-ldld  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4729 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char shl_load();
--
--int main() {
--shl_load()
--; return 0; }
--EOF
--if { (eval echo configure:4740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
++
 +# Transform the output of nm in a proper C declaration
 +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
--else
--  echo "$ac_t""no" 1>&6
--echo $ac_n "checking for dlopen""... $ac_c" 1>&6
--echo "configure:4759: checking for dlopen" >&5
--if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 4764 "configure"
--#include "confdefs.h"
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char dlopen(); below.  */
--#include <assert.h>
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char dlopen();
++
 +# Transform the output of nm in a C name address pair
 +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- 
--int main() {
++
 +# This is the shared library runtime path variable.
 +runpath_var=$runpath_var
- 
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined (__stub_dlopen) || defined (__stub___dlopen)
--choke me
--#else
--dlopen();
--#endif
++
 +# This is the shared library path variable.
 +shlibpath_var=$shlibpath_var
- 
--; return 0; }
--EOF
--if { (eval echo configure:4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_func_dlopen=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_dlopen=no"
--fi
--rm -f conftest*
--fi
++
 +# Is shlibpath searched before the hard-coded library search path?
 +shlibpath_overrides_runpath=$shlibpath_overrides_runpath
- 
--if eval "test \"`echo '$ac_cv_func_'dlopen`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  lt_cv_dlopen="dlopen"
--else
--  echo "$ac_t""no" 1>&6
--echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
--echo "configure:4805: checking for dlopen in -ldl" >&5
--ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-ldl  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4813 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char dlopen();
--
--int main() {
--dlopen()
--; return 0; }
--EOF
--if { (eval echo configure:4824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
++
 +# How to hardcode a shared library path into an executable.
 +hardcode_action=$hardcode_action_GCJ
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
--else
--  echo "$ac_t""no" 1>&6
--echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6
--echo "configure:4843: checking for dlopen in -lsvld" >&5
--ac_lib_var=`echo svld'_'dlopen | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lsvld  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4851 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char dlopen();
--
--int main() {
--dlopen()
--; return 0; }
--EOF
--if { (eval echo configure:4862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
++
 +# Whether we should hardcode library paths into libraries.
 +hardcode_into_libs=$hardcode_into_libs
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
--else
--  echo "$ac_t""no" 1>&6
--echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6
--echo "configure:4881: checking for dld_link in -ldld" >&5
--ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-ldld  $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 4889 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char dld_link();
--
--int main() {
--dld_link()
--; return 0; }
--EOF
--if { (eval echo configure:4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
++
 +# Flag to hardcode \$libdir into a binary during linking.
 +# This must work even if \$libdir does not exist.
 +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
- 
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
--else
--  echo "$ac_t""no" 1>&6
--fi
++
 +# If ld is used when linking, flag to hardcode \$libdir into
 +# a binary during linking. This must work even if \$libdir does
 +# not exist.
 +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
- 
--	      
--fi
++
 +# Whether we need a single -rpath flag with a separated argument.
 +hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
- 
--	    
--fi
++
 +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
 +# resulting binary.
 +hardcode_direct=$hardcode_direct_GCJ
- 
--	  
--fi
++
 +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
 +# resulting binary.
 +hardcode_minus_L=$hardcode_minus_L_GCJ
- 
--	
--fi
++
 +# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
 +# the resulting binary.
 +hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
- 
--      
--fi
++
 +# Set to yes if building a shared library automatically hardcodes DIR into the library
 +# and all subsequent libraries and executables linked against it.
 +hardcode_automatic=$hardcode_automatic_GCJ
- 
--    ;;
--  esac
++
 +# Variables whose values should be saved in libtool wrapper scripts and
 +# restored at relink time.
 +variables_saved_for_relink="$variables_saved_for_relink"
- 
--  if test "x$lt_cv_dlopen" != xno; then
--    enable_dlopen=yes
--  else
--    enable_dlopen=no
--  fi
++
 +# Whether libtool must link a program against all its dependency libraries.
 +link_all_deplibs=$link_all_deplibs_GCJ
- 
--  case $lt_cv_dlopen in
--  dlopen)
--    save_CPPFLAGS="$CPPFLAGS"
--        test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
++
 +# Compile-time system search path for libraries
 +sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
- 
--    save_LDFLAGS="$LDFLAGS"
--    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++
 +# Run-time system search path for libraries
 +sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- 
--    save_LIBS="$LIBS"
--    LIBS="$lt_cv_dlopen_libs $LIBS"
++
 +# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$fix_srcfile_path_GCJ"
- 
--    echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6
--echo "configure:4956: checking whether a program can dlopen itself" >&5
--if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self=cross
--else
--    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 4966 "configure"
--#include "confdefs.h"
++fix_srcfile_path=$lt_fix_srcfile_path
++
 +# Set to yes if exported symbols are required.
 +always_export_symbols=$always_export_symbols_GCJ
- 
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
++
 +# The commands to list exported symbols.
 +export_symbols_cmds=$lt_export_symbols_cmds_GCJ
- 
--#include <stdio.h>
++
 +# The commands to extract the exported symbol list from a shared archive.
 +extract_expsyms_cmds=$lt_extract_expsyms_cmds
- 
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
++
 +# Symbols that should not be listed in the preloaded symbols.
 +exclude_expsyms=$lt_exclude_expsyms_GCJ
- 
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
++
 +# Symbols that must always be exported.
 +include_expsyms=$lt_include_expsyms_GCJ
- 
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
++
 +# ### END LIBTOOL TAG CONFIG: $tagname
- 
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
++
 +__EOF__
- 
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
- 
--    exit (status);
--}
--EOF
--  if { (eval echo configure:5027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
--    esac
--  else :
--    # compilation failed
--    lt_cv_dlopen_self=no
++
++
 +else
 +  # If there is no Makefile yet, we rely on a make rule to execute
 +  # `config.status --recheck' to rerun these tests and create the
@@ -25759,211 +33748,65 @@
 +  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
 +  if test -f "$ltmain_in"; then
 +    test -f Makefile && make "$ltmain"
-   fi
- fi
--rm -fr conftest*
--
--    
--fi
--
--echo "$ac_t""$lt_cv_dlopen_self" 1>&6
- 
--    if test "x$lt_cv_dlopen_self" = xyes; then
--      LDFLAGS="$LDFLAGS $link_static_flag"
--      echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6
--echo "configure:5050: checking whether a statically linked program can dlopen itself" >&5
--if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  	  if test "$cross_compiling" = yes; then :
--  lt_cv_dlopen_self_static=cross
--else
--    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--#line 5060 "configure"
--#include "confdefs.h"
- 
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
++  fi
++fi
++
++
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--#include <stdio.h>
++
 +CC="$lt_save_CC"
- 
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
++
 +	else
 +	  tagname=""
 +	fi
 +	;;
- 
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
++
 +      RC)
- 
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
- 
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
++
++
 +# Source file extension for RC test sources.
 +ac_ext=rc
- 
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
++
 +# Object file extension for compiled RC test sources.
 +objext=o
 +objext_RC=$objext
- 
--    exit (status);
--}
--EOF
--  if { (eval echo configure:5121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
--      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
--    esac
--  else :
--    # compilation failed
--    lt_cv_dlopen_self_static=no
--  fi
--fi
--rm -fr conftest*
++
 +# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
- 
--      
--fi
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
++
 +# Code to be used in simple link tests
 +lt_simple_link_test_code="$lt_simple_compile_test_code"
- 
--echo "$ac_t""$lt_cv_dlopen_self_static" 1>&6
--    fi
++
 +# ltmain only uses $CC for tagged configurations so make sure $CC is set.
- 
--    CPPFLAGS="$save_CPPFLAGS"
--    LDFLAGS="$save_LDFLAGS"
--    LIBS="$save_LIBS"
--    ;;
--  esac
++
 +# If no C compiler was specified, use CC.
 +LTCC=${LTCC-"$CC"}
- 
--  case $lt_cv_dlopen_self in
--  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
--  *) enable_dlopen_self=unknown ;;
--  esac
++
 +# If no C compiler flags were specified, use CFLAGS.
 +LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- 
--  case $lt_cv_dlopen_self_static in
--  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
--  *) enable_dlopen_self_static=unknown ;;
--  esac
--fi
++
 +# Allow CC to be a program name with arguments.
 +compiler=$CC
- 
- 
--if test "$enable_shared" = yes && test "$GCC" = yes; then
--  case $archive_cmds in
--  *'~'*)
--    # FIXME: we may have to deal with multi-command sequences.
--    ;;
--  '$CC '*)
--    # Test whether the compiler implicitly links with -lc since on some
--    # systems, -lgcc has to come before -lc. If gcc already passes -lc
--    # to ld, don't add -lc before -lgcc.
--    echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6
--echo "configure:5170: checking whether -lc should be explicitly linked in" >&5
--    if eval "test \"`echo '$''{'lt_cv_archive_cmds_need_lc'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  $rm conftest*
--    echo 'static int dummy;' > conftest.$ac_ext
++
++
 +# save warnings/boilerplate of simple test code
 +ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
 +eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_compiler_boilerplate=`cat conftest.err`
 +$rm conftest*
 +
 +ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
 +eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
 +_lt_linker_boilerplate=`cat conftest.err`
 +$rm conftest*
- 
--    if { (eval echo configure:5177: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--      soname=conftest
--      lib=conftest
--      libobjs=conftest.$ac_objext
--      deplibs=
--      wl=$lt_cv_prog_cc_wl
--      compiler_flags=-v
--      linker_flags=-v
--      verstring=
--      output_objdir=.
--      libname=conftest
--      save_allow_undefined_flag=$allow_undefined_flag
--      allow_undefined_flag=
--      if { (eval echo configure:5190: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; }
--      then
--	lt_cv_archive_cmds_need_lc=no
--      else
--	lt_cv_archive_cmds_need_lc=yes
--      fi
--      allow_undefined_flag=$save_allow_undefined_flag
--    else
--      cat conftest.err 1>&5
--    fi
--fi
- 
--    echo "$ac_t""$lt_cv_archive_cmds_need_lc" 1>&6
--    ;;
++
++
 +# Allow CC to be a program name with arguments.
 +lt_save_CC="$CC"
 +CC=${RC-"windres"}
@@ -25975,56 +33818,25 @@
 +    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
 +    \-*) ;;
 +    *) break;;
-   esac
--fi
--need_lc=${lt_cv_archive_cmds_need_lc-yes}
++  esac
 +done
 +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
 +
 +lt_cv_prog_compiler_c_o_RC=yes
- 
--# The second clause should only fire when bootstrapping the
++
 +# The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
- # with your package, and you will get complaints that there are
- # no rules to generate ltmain.sh.
- if test -f "$ltmain"; then
--  :
--else
--  # 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"
--fi
--
--if test -f "$ltmain"; then
--  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
--  $rm -f "${ofile}T"
--
--  echo creating $ofile
--
++# libtool distribution, otherwise you forgot to ship ltmain.sh
++# with your package, and you will get complaints that there are
++# no rules to generate ltmain.sh.
++if test -f "$ltmain"; then
 +  # See if we are running on zsh, and set the options which allow our commands through
 +  # without removal of \ escapes.
 +  if test -n "${ZSH_VERSION+set}" ; then
 +    setopt NO_GLOB_SUBST
 +  fi
-   # 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 SED \
--    AR AR_FLAGS CC LD LN_S NM SHELL \
--    reload_flag reload_cmds wl \
--    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
--    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
--    library_names_spec soname_spec \
--    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
--    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
--    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
--    old_striplib striplib file_magic_cmd export_symbols_cmds \
--    deplibs_check_method allow_undefined_flag no_undefined_flag \
--    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
--    global_symbol_to_c_name_address \
--    hardcode_libdir_flag_spec hardcode_libdir_separator  \
++  # 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 LTCFLAGS NM \
 +    SED SHELL STRIP \
 +    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
@@ -26032,8 +33844,7 @@
 +    deplibs_check_method reload_flag reload_cmds need_locks \
 +    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
 +    lt_cv_sys_global_symbol_to_c_name_address \
-     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
++    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
 +    old_postinstall_cmds old_postuninstall_cmds \
 +    compiler_RC \
 +    CC_RC \
@@ -26068,14 +33879,11 @@
 +    module_cmds_RC \
 +    module_expsym_cmds_RC \
 +    lt_cv_prog_compiler_c_o_RC \
++    fix_srcfile_path_RC \
 +    exclude_expsyms_RC \
 +    include_expsyms_RC; do
- 
-     case $var in
--    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
--    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
++
++    case $var in
 +    old_archive_cmds_RC | \
 +    old_archive_from_new_cmds_RC | \
 +    archive_cmds_RC | \
@@ -26085,100 +33893,66 @@
 +    old_archive_from_expsyms_cmds_RC | \
 +    export_symbols_cmds_RC | \
 +    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-     postinstall_cmds | postuninstall_cmds | \
--    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
++    postinstall_cmds | postuninstall_cmds | \
 +    old_postinstall_cmds | old_postuninstall_cmds | \
 +    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-       # Double-quote double-evaled strings.
-       eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-       ;;
-@@ -5259,46 +19692,16 @@
-     esac
-   done
- 
--  cat <<__EOF__ > "${ofile}T"
--#! $SHELL
--
--# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
--# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
--# NOTE: Changes made to this file will be lost: look at ltmain.sh.
--#
--# Copyright (C) 1996-2000 Free Software Foundation, Inc.
--# Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
--#
--# This program is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# This program is distributed in the hope that it will be useful, but
--# WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--# General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--#
--# As a special exception to the GNU General Public License, if you
--# distribute this file as part of a program that contains a
--# configuration script generated by Autoconf, you may include it under
--# the same distribution terms that you use for the rest of that program.
--
--# A sed that does not truncate output.
--SED=$lt_SED
--
--# Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="${SED} -e s/^X//"
--
--# The HP-UX ksh and POSIX shell print the target directory to stdout
--# if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++      # Double-quote double-evaled strings.
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
++      ;;
++    *)
++      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
++      ;;
++    esac
++  done
++
 +  case $lt_echo in
 +  *'\$0 --fallback-echo"')
 +    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
 +    ;;
 +  esac
- 
--# ### BEGIN LIBTOOL CONFIG
++
 +cfgfile="$ofile"
 +
 +  cat <<__EOF__ >> "$cfgfile"
 +# ### BEGIN LIBTOOL TAG CONFIG: $tagname
- 
- # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- 
-@@ -5312,7 +19715,10 @@
- build_old_libs=$enable_static
- 
- # Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$need_lc
++
++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
++
++# Shell to use when invoking shell scripts.
++SHELL=$lt_SHELL
++
++# Whether or not to build shared libraries.
++build_libtool_libs=$enable_shared
++
++# Whether or not to build static libraries.
++build_old_libs=$enable_static
++
++# Whether or not to add -lc for building shared libraries.
 +build_libtool_need_lc=$archive_cmds_need_lc_RC
 +
 +# Whether or not to disallow shared libs when runtime libs are static
 +allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
- 
- # Whether or not to optimize for fast installation.
- fast_install=$enable_fast_install
-@@ -5320,6 +19726,12 @@
- # The host system.
- host_alias=$host_alias
- host=$host
++
++# Whether or not to optimize for fast installation.
++fast_install=$enable_fast_install
++
++# The host system.
++host_alias=$host_alias
++host=$host
 +host_os=$host_os
 +
 +# The build system.
 +build_alias=$build_alias
 +build=$build
 +build_os=$build_os
- 
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -5328,14 +19740,23 @@
- AR=$lt_AR
- AR_FLAGS=$lt_AR_FLAGS
- 
--# The default C compiler.
--CC=$lt_CC
++
++# An echo program that does not interpret backslashes.
++echo=$lt_echo
++
++# The archiver.
++AR=$lt_AR
++AR_FLAGS=$lt_AR_FLAGS
++
 +# A C compiler.
 +LTCC=$lt_LTCC
 +
@@ -26187,126 +33961,141 @@
 +
 +# A language-specific compiler.
 +CC=$lt_compiler_RC
- 
- # Is the compiler the GNU C compiler?
--with_gcc=$GCC
++
++# Is the compiler the GNU C compiler?
 +with_gcc=$GCC_RC
 +
 +# An ERE matcher.
 +EGREP=$lt_EGREP
- 
- # The linker used to build libraries.
--LD=$lt_LD
++
++# The linker used to build libraries.
 +LD=$lt_LD_RC
- 
- # Whether we need hard or soft links.
- LN_S=$lt_LN_S
-@@ -5344,7 +19765,7 @@
- NM=$lt_NM
- 
- # A symbol stripping program
--STRIP=$STRIP
++
++# Whether we need hard or soft links.
++LN_S=$lt_LN_S
++
++# A BSD-compatible nm program.
++NM=$lt_NM
++
++# A symbol stripping program
 +STRIP=$lt_STRIP
- 
- # Used to examine libraries when file_magic_cmd begins "file"
- MAGIC_CMD=$MAGIC_CMD
-@@ -5366,7 +19787,7 @@
- reload_cmds=$lt_reload_cmds
- 
- # How to pass a linker flag through the compiler.
--wl=$lt_wl
++
++# Used to examine libraries when file_magic_cmd begins "file"
++MAGIC_CMD=$MAGIC_CMD
++
++# Used on cygwin: DLL creation program.
++DLLTOOL="$DLLTOOL"
++
++# Used on cygwin: object dumper.
++OBJDUMP="$OBJDUMP"
++
++# Used on cygwin: assembler.
++AS="$AS"
++
++# The name of the directory that contains temporary libtool files.
++objdir=$objdir
++
++# How to create reloadable object files.
++reload_flag=$lt_reload_flag
++reload_cmds=$lt_reload_cmds
++
++# How to pass a linker flag through the compiler.
 +wl=$lt_lt_prog_compiler_wl_RC
- 
- # Object file suffix (normally "o").
- objext="$ac_objext"
-@@ -5374,20 +19795,23 @@
- # Old archive suffix (normally "a").
- libext="$libext"
- 
++
++# Object file suffix (normally "o").
++objext="$ac_objext"
++
++# Old archive suffix (normally "a").
++libext="$libext"
++
 +# Shared library suffix (normally ".so").
 +shrext_cmds='$shrext_cmds'
 +
- # Executable file suffix (normally "").
- exeext="$exeext"
- 
- # Additional compiler flags for building library objects.
--pic_flag=$lt_pic_flag
++# Executable file suffix (normally "").
++exeext="$exeext"
++
++# Additional compiler flags for building library objects.
 +pic_flag=$lt_lt_prog_compiler_pic_RC
- pic_mode=$pic_mode
- 
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_compiler_c_o
++pic_mode=$pic_mode
++
 +# What is the maximum length of a command?
 +max_cmd_len=$lt_cv_sys_max_cmd_len
- 
--# Can we write directly to a .lo ?
--compiler_o_lo=$lt_compiler_o_lo
++
 +# Does compiler simultaneously support -c and -o options?
 +compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
- 
--# Must we lock files when doing compilation ?
++
 +# Must we lock files when doing compilation?
- need_locks=$lt_need_locks
- 
- # Do we need the lib prefix for modules?
-@@ -5406,19 +19830,19 @@
- dlopen_self_static=$enable_dlopen_self_static
- 
- # Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_link_static_flag
++need_locks=$lt_need_locks
++
++# Do we need the lib prefix for modules?
++need_lib_prefix=$need_lib_prefix
++
++# Do we need a version for libraries?
++need_version=$need_version
++
++# Whether dlopen is supported.
++dlopen_support=$enable_dlopen
++
++# Whether dlopen of programs is supported.
++dlopen_self=$enable_dlopen_self
++
++# Whether dlopen of statically linked programs is supported.
++dlopen_self_static=$enable_dlopen_self_static
++
++# Compiler flag to prevent dynamic linking.
 +link_static_flag=$lt_lt_prog_compiler_static_RC
- 
- # Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_no_builtin_flag
++
++# Compiler flag to turn off builtin functions.
 +no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
- 
- # Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
++
++# Compiler flag to allow reflexive dlopens.
 +export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
- 
- # Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec
++
++# Compiler flag to generate shared objects directly from archives.
 +whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
- 
- # Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec
++
++# Compiler flag to generate thread-safe objects.
 +thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
- 
- # Library versioning type.
- version_type=$version_type
-@@ -5435,26 +19859,50 @@
- 
- # Commands used to build and install an old-style archive.
- RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds
++
++# Library versioning type.
++version_type=$version_type
++
++# Format of library name prefix.
++libname_spec=$lt_libname_spec
++
++# List of archive names.  First name is the real one, the rest are links.
++# The last name is the one that the linker finds with -lNAME.
++library_names_spec=$lt_library_names_spec
++
++# The coded name of the library, if different from the real name.
++soname_spec=$lt_soname_spec
++
++# Commands used to build and install an old-style archive.
++RANLIB=$lt_RANLIB
 +old_archive_cmds=$lt_old_archive_cmds_RC
- old_postinstall_cmds=$lt_old_postinstall_cmds
- old_postuninstall_cmds=$lt_old_postuninstall_cmds
- 
- # Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
++old_postinstall_cmds=$lt_old_postinstall_cmds
++old_postuninstall_cmds=$lt_old_postuninstall_cmds
++
++# Create an old-style archive from a shared archive.
 +old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
- 
- # Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
++
++# Create a temporary old-style archive to link instead of a shared archive.
 +old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
- 
- # Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds
--archive_expsym_cmds=$lt_archive_expsym_cmds
++
++# Commands used to build and install a shared archive.
 +archive_cmds=$lt_archive_cmds_RC
 +archive_expsym_cmds=$lt_archive_expsym_cmds_RC
- postinstall_cmds=$lt_postinstall_cmds
- postuninstall_cmds=$lt_postuninstall_cmds
- 
++postinstall_cmds=$lt_postinstall_cmds
++postuninstall_cmds=$lt_postuninstall_cmds
++
 +# Commands used to build a loadable module (assumed same as above if empty)
 +module_cmds=$lt_module_cmds_RC
 +module_expsym_cmds=$lt_module_expsym_cmds_RC
 +
- # Commands to strip libraries.
- old_striplib=$lt_old_striplib
- striplib=$lt_striplib
- 
++# Commands to strip libraries.
++old_striplib=$lt_old_striplib
++striplib=$lt_striplib
++
 +# Dependencies to place before the objects being linked to create a
 +# shared library.
 +predep_objects=$lt_predep_objects_RC
@@ -26327,134 +34116,112 @@
 +# a shared library.
 +compiler_lib_search_path=$lt_compiler_lib_search_path_RC
 +
- # Method to check whether dependent libraries are shared objects.
- deplibs_check_method=$lt_deplibs_check_method
- 
-@@ -5462,10 +19910,10 @@
- file_magic_cmd=$lt_file_magic_cmd
- 
- # Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag
++# Method to check whether dependent libraries are shared objects.
++deplibs_check_method=$lt_deplibs_check_method
++
++# Command to use when deplibs_check_method == file_magic.
++file_magic_cmd=$lt_file_magic_cmd
++
++# Flag that allows shared libraries with undefined symbols to be built.
 +allow_undefined_flag=$lt_allow_undefined_flag_RC
- 
- # Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag
++
++# Flag that forces no undefined symbols.
 +no_undefined_flag=$lt_no_undefined_flag_RC
- 
- # Commands used to finish a libtool library installation in a directory.
- finish_cmds=$lt_finish_cmds
-@@ -5474,13 +19922,13 @@
- finish_eval=$lt_finish_eval
- 
- # Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_global_symbol_pipe
++
++# Commands used to finish a libtool library installation in a directory.
++finish_cmds=$lt_finish_cmds
++
++# Same as above, but a single script fragment to be evaled but not shown.
++finish_eval=$lt_finish_eval
++
++# Take the output of nm and produce a listing of raw symbols and C names.
 +global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
- 
- # Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
++
++# Transform the output of nm in a proper C declaration
 +global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
- 
- # Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
++
++# Transform the output of nm in a C name address pair
 +global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
- 
- # This is the shared library runtime path variable.
- runpath_var=$runpath_var
-@@ -5492,36 +19940,45 @@
- shlibpath_overrides_runpath=$shlibpath_overrides_runpath
- 
- # How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action
++
++# This is the shared library runtime path variable.
++runpath_var=$runpath_var
++
++# This is the shared library path variable.
++shlibpath_var=$shlibpath_var
++
++# Is shlibpath searched before the hard-coded library search path?
++shlibpath_overrides_runpath=$shlibpath_overrides_runpath
++
++# How to hardcode a shared library path into an executable.
 +hardcode_action=$hardcode_action_RC
- 
- # Whether we should hardcode library paths into libraries.
- hardcode_into_libs=$hardcode_into_libs
- 
- # Flag to hardcode \$libdir into a binary during linking.
- # This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
++
++# Whether we should hardcode library paths into libraries.
++hardcode_into_libs=$hardcode_into_libs
++
++# Flag to hardcode \$libdir into a binary during linking.
++# This must work even if \$libdir does not exist.
 +hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
 +
 +# If ld is used when linking, flag to hardcode \$libdir into
 +# a binary during linking. This must work even if \$libdir does
 +# not exist.
 +hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
- 
- # Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator
++
++# Whether we need a single -rpath flag with a separated argument.
 +hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
- 
--# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
++
 +# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
- # resulting binary.
--hardcode_direct=$hardcode_direct
++# resulting binary.
 +hardcode_direct=$hardcode_direct_RC
- 
- # Set to yes if using the -LDIR flag during linking hardcodes DIR into the
- # resulting binary.
--hardcode_minus_L=$hardcode_minus_L
++
++# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
++# resulting binary.
 +hardcode_minus_L=$hardcode_minus_L_RC
- 
- # Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
- # the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var
++
++# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
++# the resulting binary.
 +hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
 +
 +# Set to yes if building a shared library automatically hardcodes DIR into the library
 +# and all subsequent libraries and executables linked against it.
 +hardcode_automatic=$hardcode_automatic_RC
- 
- # Variables whose values should be saved in libtool wrapper scripts and
- # restored at relink time.
- variables_saved_for_relink="$variables_saved_for_relink"
- 
- # Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs
++
++# Variables whose values should be saved in libtool wrapper scripts and
++# restored at relink time.
++variables_saved_for_relink="$variables_saved_for_relink"
++
++# Whether libtool must link a program against all its dependency libraries.
 +link_all_deplibs=$link_all_deplibs_RC
- 
- # Compile-time system search path for libraries
- sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-@@ -5530,234 +19987,75 @@
- sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
- 
- # Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path"
-+fix_srcfile_path="$fix_srcfile_path_RC"
- 
- # Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols
++
++# Compile-time system search path for libraries
++sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
++
++# Run-time system search path for libraries
++sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
++
++# Fix the shell variable \$srcfile for the compiler.
++fix_srcfile_path=$lt_fix_srcfile_path
++
++# Set to yes if exported symbols are required.
 +always_export_symbols=$always_export_symbols_RC
- 
- # The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds
++
++# The commands to list exported symbols.
 +export_symbols_cmds=$lt_export_symbols_cmds_RC
- 
- # The commands to extract the exported symbol list from a shared archive.
- extract_expsyms_cmds=$lt_extract_expsyms_cmds
- 
- # Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms
++
++# The commands to extract the exported symbol list from a shared archive.
++extract_expsyms_cmds=$lt_extract_expsyms_cmds
++
++# Symbols that should not be listed in the preloaded symbols.
 +exclude_expsyms=$lt_exclude_expsyms_RC
- 
- # Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms
++
++# Symbols that must always be exported.
 +include_expsyms=$lt_include_expsyms_RC
- 
--# ### END LIBTOOL CONFIG
++
 +# ### END LIBTOOL TAG CONFIG: $tagname
- 
- __EOF__
- 
--  case $host_os in
--  aix3*)
--    cat <<\EOF >> "${ofile}T"
- 
--# AIX sometimes has problems with the GCC collect2 program.  For some
--# reason, if we set the COLLECT_NAMES environment variable, the problems
--# vanish in a puff of smoke.
--if test "X${COLLECT_NAMES+set}" != Xset; then
--  COLLECT_NAMES=
--  export COLLECT_NAMES
++
++__EOF__
++
++
 +else
 +  # If there is no Makefile yet, we rely on a make rule to execute
 +  # `config.status --recheck' to rerun these tests and create the
@@ -26463,207 +34230,17 @@
 +  if test -f "$ltmain_in"; then
 +    test -f Makefile && make "$ltmain"
 +  fi
- fi
--EOF
--    ;;
--  esac
- 
--  case $host_os in
--  cygwin* | mingw* | pw32* | os2*)
--    cat <<'EOF' >> "${ofile}T"
--      # This is a source program that is used to create dlls on Windows
--      # Don't remove nor modify the starting and closing comments
--# /* ltdll.c starts here */
--# #define WIN32_LEAN_AND_MEAN
--# #include <windows.h>
--# #undef WIN32_LEAN_AND_MEAN
--# #include <stdio.h>
--#
--# #ifndef __CYGWIN__
--# #  ifdef __CYGWIN32__
--# #    define __CYGWIN__ __CYGWIN32__
--# #  endif
--# #endif
--#
--# #ifdef __cplusplus
--# extern "C" {
--# #endif
--# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
--# #ifdef __cplusplus
--# }
--# #endif
--#
--# #ifdef __CYGWIN__
--# #include <cygwin/cygwin_dll.h>
--# DECLARE_CYGWIN_DLL( DllMain );
--# #endif
--# HINSTANCE __hDllInstance_base;
--#
--# BOOL APIENTRY
--# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
--# {
--#   __hDllInstance_base = hInst;
--#   return TRUE;
--# }
--# /* ltdll.c ends here */
--	# This is a source program that is used to create import libraries
--	# on Windows for dlls which lack them. Don't remove nor modify the
--	# starting and closing comments
--# /* impgen.c starts here */
--# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
--#
--#  This file is part of GNU libtool.
--#
--#  This program is free software; you can redistribute it and/or modify
--#  it under the terms of the GNU General Public License as published by
--#  the Free Software Foundation; either version 2 of the License, or
--#  (at your option) any later version.
--#
--#  This program is distributed in the hope that it will be useful,
--#  but WITHOUT ANY WARRANTY; without even the implied warranty of
--#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--#  GNU General Public License for more details.
--#
--#  You should have received a copy of the GNU General Public License
--#  along with this program; if not, write to the Free Software
--#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--#  */
--#
--# #include <stdio.h>		/* for printf() */
--# #include <unistd.h>		/* for open(), lseek(), read() */
--# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
--# #include <string.h>		/* for strdup() */
--#
--# /* O_BINARY isn't required (or even defined sometimes) under Unix */
--# #ifndef O_BINARY
--# #define O_BINARY 0
--# #endif
--#
--# static unsigned int
--# pe_get16 (fd, offset)
--#      int fd;
--#      int offset;
--# {
--#   unsigned char b[2];
--#   lseek (fd, offset, SEEK_SET);
--#   read (fd, b, 2);
--#   return b[0] + (b[1]<<8);
--# }
--#
--# static unsigned int
--# pe_get32 (fd, offset)
--#     int fd;
--#     int offset;
--# {
--#   unsigned char b[4];
--#   lseek (fd, offset, SEEK_SET);
--#   read (fd, b, 4);
--#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
--# }
--#
--# static unsigned int
--# pe_as32 (ptr)
--#      void *ptr;
--# {
--#   unsigned char *b = ptr;
--#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
--# }
--#
--# int
--# main (argc, argv)
--#     int argc;
--#     char *argv[];
--# {
--#     int dll;
--#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
--#     unsigned long export_rva, export_size, nsections, secptr, expptr;
--#     unsigned long name_rvas, nexp;
--#     unsigned char *expdata, *erva;
--#     char *filename, *dll_name;
--#
--#     filename = argv[1];
--#
--#     dll = open(filename, O_RDONLY|O_BINARY);
--#     if (dll < 1)
--# 	return 1;
--#
--#     dll_name = filename;
--#
--#     for (i=0; filename[i]; i++)
--# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
--# 	    dll_name = filename + i +1;
--#
--#     pe_header_offset = pe_get32 (dll, 0x3c);
--#     opthdr_ofs = pe_header_offset + 4 + 20;
--#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
--#
--#     if (num_entries < 1) /* no exports */
--# 	return 1;
--#
--#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
--#     export_size = pe_get32 (dll, opthdr_ofs + 100);
--#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
--#     secptr = (pe_header_offset + 4 + 20 +
--# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
--#
--#     expptr = 0;
--#     for (i = 0; i < nsections; i++)
--#     {
--# 	char sname[8];
--# 	unsigned long secptr1 = secptr + 40 * i;
--# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
--# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
--# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
--# 	lseek(dll, secptr1, SEEK_SET);
--# 	read(dll, sname, 8);
--# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
--# 	{
--# 	    expptr = fptr + (export_rva - vaddr);
--# 	    if (export_rva + export_size > vaddr + vsize)
--# 		export_size = vsize - (export_rva - vaddr);
--# 	    break;
--# 	}
--#     }
--#
--#     expdata = (unsigned char*)malloc(export_size);
--#     lseek (dll, expptr, SEEK_SET);
--#     read (dll, expdata, export_size);
--#     erva = expdata - export_rva;
--#
--#     nexp = pe_as32 (expdata+24);
--#     name_rvas = pe_as32 (expdata+32);
--#
--#     printf ("EXPORTS\n");
--#     for (i = 0; i<nexp; i++)
--#     {
--# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
--# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
--#     }
--#
--#     return 0;
--# }
--# /* impgen.c ends here */
- 
--EOF
--    ;;
--  esac
++fi
++
++
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--  # We use sed instead of cat because bash on DJGPP gets confused if
--  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
--  # text mode, it properly converts lines to CR/LF.  This bash problem
--  # is reportedly fixed, but why not run on old versions too?
--  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
++
 +CC="$lt_save_CC"
- 
--  mv -f "${ofile}T" "$ofile" || \
--    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
--  chmod +x "$ofile"
--fi
++
 +	;;
 +
 +      *)
@@ -26672,7 +34249,7 @@
 +   { (exit 1); exit 1; }; }
 +	;;
 +      esac
- 
++
 +      # Append the new tag name to the list of available tags.
 +      if test -n "$tagname" ; then
 +      available_tags="$available_tags $tagname"
@@ -26680,7 +34257,7 @@
 +    fi
 +  done
 +  IFS="$lt_save_ifs"
- 
++
 +  # Now substitute the updated list of available tags.
 +  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
 +    mv "${ofile}T" "$ofile"
@@ -26695,7 +34272,7 @@
  
  
  
-@@ -5770,255 +20068,852 @@
+@@ -5770,162 +19797,399 @@
  # Prevent multiple expansion
  
  
@@ -26724,7 +34301,7 @@
 +
 +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; }
-+set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
++set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
 +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -26811,7 +34388,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -26828,12 +34405,19 @@
 -  echo "$ac_t""$CXX" 1>&6
 +  { echo "$as_me:$LINENO: result: $CXX" >&5
 +echo "${ECHO_T}$CXX" >&6; }
-+else
+ else
+-  echo "$ac_t""no" 1>&6
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
-+fi
-+
-+
+ fi
+ 
+-test -n "$CXX" && break
+-done
+-test -n "$CXX" || CXX="gcc"
+-
+ 
+-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:5838: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 +    test -n "$CXX" && break
 +  done
 +fi
@@ -26850,15 +34434,14 @@
 +else
 +  if test -n "$ac_ct_CXX"; then
 +  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
- else
--  echo "$ac_t""no" 1>&6
++else
 +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 +for as_dir in $PATH
 +do
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_prog_ac_ct_CXX="$ac_prog"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -26866,7 +34449,13 @@
 +done
 +done
 +IFS=$as_save_IFS
-+
+ 
+-ac_ext=C
+-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cxx_cross
 +fi
 +fi
 +ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
@@ -26876,17 +34465,26 @@
 +else
 +  { echo "$as_me:$LINENO: result: no" >&5
 +echo "${ECHO_T}no" >&6; }
- fi
++fi
  
--test -n "$CXX" && break
-+
+-cat > conftest.$ac_ext << EOF
+ 
+-#line 5849 "configure"
+-#include "confdefs.h"
 +  test -n "$ac_ct_CXX" && break
- done
--test -n "$CXX" || CXX="gcc"
++done
  
+-int main(){return(0);}
+-EOF
+-if { (eval echo configure:5854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  ac_cv_prog_cxx_works=yes
+-  # If we can't run a trivial program, we are probably using a cross compiler.
+-  if (./conftest; exit) 2>/dev/null; then
+-    ac_cv_prog_cxx_cross=no
 +  if test "x$ac_ct_CXX" = x; then
 +    CXX="g++"
-+  else
+   else
+-    ac_cv_prog_cxx_cross=yes
 +    case $cross_compiling:$ac_tool_warned in
 +yes:)
 +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
@@ -26898,13 +34496,29 @@
 +ac_tool_warned=yes ;;
 +esac
 +    CXX=$ac_ct_CXX
-+  fi
-+fi
+   fi
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_prog_cxx_works=no
+ fi
+-rm -fr conftest*
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
  
--echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:5838: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+-echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
+-if test $ac_cv_prog_cxx_works = no; then
+-  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 +  fi
-+fi
+ fi
+-echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:5880: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
+-cross_compiling=$ac_cv_prog_cxx_cross
 +# Provide some information about the compiler.
 +echo "$as_me:$LINENO: checking for C++ compiler version" >&5
 +ac_compiler=`set X $ac_compile; echo $2`
@@ -26938,33 +34552,36 @@
 +  ac_status=$?
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 +  (exit $ac_status); }
-+
+ 
+-echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
+-echo "configure:5885: checking whether we are using GNU C++" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  cat > conftest.C <<EOF
+-#ifdef __GNUC__
+-  yes;
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
 +cat confdefs.h >>conftest.$ac_ext
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
- 
--ac_ext=C
--# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cxx_cross
++
 +int
 +main ()
 +{
 +#ifndef __GNUC__
 +       choke me
-+#endif
- 
--cat > conftest.$ac_ext << EOF
+ #endif
+-EOF
+-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:5894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-  ac_cv_prog_gxx=yes
++
 +  ;
 +  return 0;
 +}
@@ -26982,39 +34599,23 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_compiler_gnu=yes
-+else
+ else
+-  ac_cv_prog_gxx=no
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_compiler_gnu=no
-+fi
+ fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
 +
-+fi
+ fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
 +GXX=`test $ac_compiler_gnu = yes && echo yes`
@@ -27036,21 +34637,13 @@
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
  
--#line 5849 "configure"
--#include "confdefs.h"
+-echo "$ac_t""$ac_cv_prog_gxx" 1>&6
 +int
 +main ()
 +{
  
--int main(){return(0);}
--EOF
--if { (eval echo configure:5854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  ac_cv_prog_cxx_works=yes
--  # If we can't run a trivial program, we are probably using a cross compiler.
--  if (./conftest; exit) 2>/dev/null; then
--    ac_cv_prog_cxx_cross=no
--  else
--    ac_cv_prog_cxx_cross=yes
+-if test $ac_cv_prog_gxx = yes; then
+-  GXX=yes
 +  ;
 +  return 0;
 +}
@@ -27068,32 +34661,24 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_cv_prog_cxx_g=yes
-+else
+ else
+-  GXX=
+-fi
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
-+
+ 
+-ac_test_CXXFLAGS="${CXXFLAGS+set}"
+-ac_save_CXXFLAGS="$CXXFLAGS"
+-CXXFLAGS=
+-echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
+-echo "configure:5913: checking whether ${CXX-g++} accepts -g" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +	CXXFLAGS=""
 +      cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
@@ -27123,29 +34708,14 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  :
-+else
+ else
+-  echo 'void f(){}' > conftest.cc
+-if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
@@ -27179,93 +34749,50 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_prog_cxx_g=yes
-+else
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
+   ac_cv_prog_cxx_g=yes
+ else
+-  ac_cv_prog_cxx_g=no
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +
+ fi
+-rm -f conftest*
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ 
+-echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
+ if test "$ac_test_CXXFLAGS" = set; then
+-  CXXFLAGS="$ac_save_CXXFLAGS"
 +  CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
+ elif test $ac_cv_prog_cxx_g = yes; then
+   if test "$GXX" = yes; then
+     CXXFLAGS="-g -O2"
+@@ -5939,86 +20203,350 @@
+     CXXFLAGS=
    fi
- else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  ac_cv_prog_cxx_works=no
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-+  fi
  fi
--rm -fr conftest*
- ac_ext=c
--# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
- ac_cpp='$CPP $CPPFLAGS'
--ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cc_cross
--
--echo "$ac_t""$ac_cv_prog_cxx_works" 1>&6
--if test $ac_cv_prog_cxx_works = no; then
--  { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
--fi
--echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:5880: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
--echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
--cross_compiling=$ac_cv_prog_cxx_cross
--
--echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
--echo "configure:5885: checking whether we are using GNU C++" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.C <<EOF
--#ifdef __GNUC__
--  yes;
++ac_ext=c
++ac_cpp='$CPP $CPPFLAGS'
 +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
+ 
+-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:5945: checking how to run the C preprocessor" >&5
 +depcc="$CXX"  am_compiler_list=
 +
 +{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
@@ -27382,14 +34909,19 @@
 +ac_compiler_gnu=$ac_cv_c_compiler_gnu
 +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
-+# On Suns, sometimes $CPP names a directory.
-+if test -n "$CPP" && test -d "$CPP"; then
-+  CPP=
-+fi
-+if test -z "$CPP"; then
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+   CPP=
+ fi
+ if test -z "$CPP"; then
+-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +  if test "${ac_cv_prog_CPP+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-    # This must be in double quotes, not single quotes, because CPP may get
+-  # substituted into the Makefile and "${CC-cc}" will confuse make.
+-  CPP="${CC-cc} -E"
 +      # Double quotes because CPP needs to be expanded
 +    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
 +    do
@@ -27400,7 +34932,35 @@
 +  # with a fresh cross-compiler works.
 +  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 +  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
+   # On the NeXT, cc -E runs the code through the compiler's parser,
+-  # not just through cpp.
+-  cat > conftest.$ac_ext <<EOF
+-#line 5960 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
+-else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -E -traditional-cpp"
+-  cat > conftest.$ac_ext <<EOF
+-#line 5977 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:5983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
 +  # not just through cpp. "Syntax error" is here to catch this case.
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
@@ -27412,10 +34972,7 @@
 +# include <limits.h>
 +#else
 +# include <assert.h>
- #endif
--EOF
--if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:5894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
--  ac_cv_prog_gxx=yes
++#endif
 +		     Syntax error
 +_ACEOF
 +if { (ac_try="$ac_cpp conftest.$ac_ext"
@@ -27430,19 +34987,28 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
-+  :
-+else
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
+   :
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP="${CC-cc} -nologo -E"
+-  cat > conftest.$ac_ext <<EOF
+-#line 5994 "configure"
+-#include "confdefs.h"
+-#include <assert.h>
+-Syntax Error
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  :
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
@@ -27474,21 +35040,18 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  ac_cv_prog_gxx=no
-+  ac_cpp_err=yes
- fi
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  # Broken: success on invalid input.
 +continue
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CPP=/lib/cpp
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
@@ -27496,39 +35059,29 @@
 +ac_preproc_ok=:
 +break
  fi
- 
--echo "$ac_t""$ac_cv_prog_gxx" 1>&6
+-rm -f conftest*
++
 +rm -f conftest.err conftest.$ac_ext
- 
--if test $ac_cv_prog_gxx = yes; then
--  GXX=yes
--else
--  GXX=
++
 +done
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then
 +  break
  fi
- 
--ac_test_CXXFLAGS="${CXXFLAGS+set}"
--ac_save_CXXFLAGS="$CXXFLAGS"
--CXXFLAGS=
--echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
--echo "configure:5913: checking whether ${CXX-g++} accepts -g" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
+-rm -f conftest*
++
 +    done
 +    ac_cv_prog_CPP=$CPP
 +
-+fi
+ fi
+-rm -f conftest*
+-  ac_cv_prog_CPP="$CPP"
 +  CPP=$ac_cv_prog_CPP
- else
--  echo 'void f(){}' > conftest.cc
--if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
--  ac_cv_prog_cxx_g=yes
++else
 +  ac_cv_prog_CPP=$CPP
-+fi
+ fi
+-  CPP="$ac_cv_prog_CPP"
 +{ echo "$as_me:$LINENO: result: $CPP" >&5
 +echo "${ECHO_T}$CPP" >&6; }
 +ac_preproc_ok=false
@@ -27565,34 +35118,21 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  ac_cv_prog_cxx_g=no
-+  ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  :
-+else
+ else
+-  ac_cv_prog_CPP="$CPP"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
++
 +  # Broken: fails on valid input.
 +continue
  fi
- 
--echo "$ac_t""$ac_cv_prog_cxx_g" 1>&6
--if test "$ac_test_CXXFLAGS" = set; then
--  CXXFLAGS="$ac_save_CXXFLAGS"
--elif test $ac_cv_prog_cxx_g = yes; then
--  if test "$GXX" = yes; then
--    CXXFLAGS="-g -O2"
+-echo "$ac_t""$CPP" 1>&6
++
 +rm -f conftest.err conftest.$ac_ext
 +
 +  # OK, works on sane cases.  Now check whether nonexistent headers
@@ -27617,91 +35157,20 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-   else
--    CXXFLAGS="-g"
-+    ac_cpp_err=
-   fi
- else
--  if test "$GXX" = yes; then
--    CXXFLAGS="-O2"
--  else
--    CXXFLAGS=
--  fi
-+  ac_cpp_err=yes
- fi
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  # Broken: success on invalid input.
 +continue
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
- 
--echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:5945: checking how to run the C preprocessor" >&5
--# On Suns, sometimes $CPP names a directory.
--if test -n "$CPP" && test -d "$CPP"; then
--  CPP=
++
 +  # Passes both tests.
 +ac_preproc_ok=:
 +break
- fi
--if test -z "$CPP"; then
--if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--    # This must be in double quotes, not single quotes, because CPP may get
--  # substituted into the Makefile and "${CC-cc}" will confuse make.
--  CPP="${CC-cc} -E"
--  # On the NeXT, cc -E runs the code through the compiler's parser,
--  # not just through cpp.
--  cat > conftest.$ac_ext <<EOF
--#line 5960 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  :
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP="${CC-cc} -E -traditional-cpp"
--  cat > conftest.$ac_ext <<EOF
--#line 5977 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:5983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  :
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP="${CC-cc} -nologo -E"
--  cat > conftest.$ac_ext <<EOF
--#line 5994 "configure"
--#include "confdefs.h"
--#include <assert.h>
--Syntax Error
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
++fi
 +
 +rm -f conftest.err conftest.$ac_ext
 +
@@ -27709,31 +35178,14 @@
 +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
 +rm -f conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then
-   :
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CPP=/lib/cpp
--fi
--rm -f conftest*
--fi
--rm -f conftest*
--fi
--rm -f conftest*
--  ac_cv_prog_CPP="$CPP"
--fi
--  CPP="$ac_cv_prog_CPP"
--else
--  ac_cv_prog_CPP="$CPP"
++  :
++else
 +  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
 +See \`config.log' for more details." >&5
 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
 +See \`config.log' for more details." >&2;}
 +   { (exit 1); exit 1; }; }
- fi
--echo "$ac_t""$CPP" 1>&6
++fi
 +
 +ac_ext=c
 +ac_cpp='$CPP $CPPFLAGS'
@@ -27743,7 +35195,7 @@
  
  # Find a good install program.  We prefer a C program (faster),
  # so one script is as good as another.  But avoid the broken or
-@@ -6027,110 +20922,93 @@
+@@ -6027,110 +20555,93 @@
  # SunOS /usr/etc/install
  # IRIX /sbin/install
  # AIX /bin/install
@@ -27791,7 +35243,7 @@
 +    # by default.
 +    for ac_prog in ginstall scoinst install; do
 +      for ac_exec_ext in '' $ac_executable_extensions; do
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
++	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
  	  if test $ac_prog = install &&
 -            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
 +	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
@@ -27902,7 +35354,7 @@
      CFLAGS="$CFLAGS -Wall"
      if test x$enable_strict_ansi = xyes; then
          CFLAGS="$CFLAGS -ansi -pedantic"
-@@ -6139,10 +21017,9 @@
+@@ -6139,10 +20650,9 @@
  
  
  mpatrol=yes
@@ -27915,7 +35367,7 @@
  else
    mpatrol=no
  fi
-@@ -6151,128 +21028,294 @@
+@@ -6151,128 +20661,254 @@
      have_mpatrol_lib=no
      have_mpatrol_include=no
  
@@ -27939,7 +35391,13 @@
 -/* We use char because int might match the return type of a gcc2
 -    builtin and then its argument prototype would still apply.  */
 -char malloc();
--
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
 -int main() {
 -malloc()
 -; return 0; }
@@ -27947,18 +35405,6 @@
 -if { (eval echo configure:6175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -27987,54 +35433,52 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_mpatrol_malloc=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_mpatrol_malloc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpatrol_malloc" >&5
 +echo "${ECHO_T}$ac_cv_lib_mpatrol_malloc" >&6; }
 +if test $ac_cv_lib_mpatrol_malloc = yes; then
-+  have_mpatrol_lib=yes
+   have_mpatrol_lib=yes
+-else
+-  echo "$ac_t""no" 1>&6
  fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
  
-+
-+    if test x$have_mpatrol_lib = xno; then
+ 
+     if test x$have_mpatrol_lib = xno; then
+-	{ echo "configure: error: *** Unable to find mpatrol library! (http://www.cbmamiga.demon.co.uk/mpatrol)" 1>&2; exit 1; }
 +	{ { echo "$as_me:$LINENO: error: *** Unable to find mpatrol library! (http://www.cbmamiga.demon.co.uk/mpatrol)" >&5
 +echo "$as_me: error: *** Unable to find mpatrol library! (http://www.cbmamiga.demon.co.uk/mpatrol)" >&2;}
 +   { (exit 1); exit 1; }; }
-+    fi
-+
+     fi
+ 
+-    ac_safe=`echo "mpatrol.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for mpatrol.h""... $ac_c" 1>&6
+-echo "configure:6202: checking for mpatrol.h" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +    if test "${ac_cv_header_mpatrol_h+set}" = set; then
 +  { echo "$as_me:$LINENO: checking for mpatrol.h" >&5
 +echo $ECHO_N "checking for mpatrol.h... $ECHO_C" >&6; }
@@ -28043,7 +35487,10 @@
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_mpatrol_h" >&5
 +echo "${ECHO_T}$ac_cv_header_mpatrol_h" >&6; }
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6207 "configure"
+-#include "confdefs.h"
 +  # Is the header compilable?
 +{ echo "$as_me:$LINENO: checking mpatrol.h usability" >&5
 +echo $ECHO_N "checking mpatrol.h usability... $ECHO_C" >&6; }
@@ -28054,7 +35501,14 @@
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
-+#include <mpatrol.h>
+ #include <mpatrol.h>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=yes"
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
@@ -28069,36 +35523,25 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
 +
@@ -28125,36 +35568,25 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  have_mpatrol_lib=yes
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  ac_header_preproc=no
  fi
- 
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  have_mpatrol_include=yes
++
 +rm -f conftest.err conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
- 
--    if test x$have_mpatrol_lib = xno; then
--	{ echo "configure: error: *** Unable to find mpatrol library! (http://www.cbmamiga.demon.co.uk/mpatrol)" 1>&2; exit 1; }
--    fi
++
 +# So?  What about this header?
 +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 +  yes:no: )
@@ -28177,24 +35609,7 @@
 +echo "$as_me: WARNING: mpatrol.h: proceeding with the preprocessor's result" >&2;}
 +    { echo "$as_me:$LINENO: WARNING: mpatrol.h: in the future, the compiler will take precedence" >&5
 +echo "$as_me: WARNING: mpatrol.h: in the future, the compiler will take precedence" >&2;}
- 
--    ac_safe=`echo "mpatrol.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for mpatrol.h""... $ac_c" 1>&6
--echo "configure:6202: checking for mpatrol.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 6207 "configure"
--#include "confdefs.h"
--#include <mpatrol.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
++
 +    ;;
 +esac
 +{ echo "$as_me:$LINENO: checking for mpatrol.h" >&5
@@ -28202,28 +35617,19 @@
 +if test "${ac_cv_header_mpatrol_h+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
+-  echo "$ac_t""no" 1>&6
 +  ac_cv_header_mpatrol_h=$ac_header_preproc
  fi
--rm -f conftest*
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_mpatrol_h" >&5
 +echo "${ECHO_T}$ac_cv_header_mpatrol_h" >&6; }
 +
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
++fi
 +if test $ac_cv_header_mpatrol_h = yes; then
-   have_mpatrol_include=yes
--else
--  echo "$ac_t""no" 1>&6
- fi
++  have_mpatrol_include=yes
++fi
++
  
  
-+
      if test x$have_mpatrol_include = xno; then
 -	{ echo "configure: error: *** Unable to find mpatrol header! (http://www.cbmamiga.demon.co.uk/mpatrol)" 1>&2; exit 1; }
 +	{ { echo "$as_me:$LINENO: error: *** Unable to find mpatrol header! (http://www.cbmamiga.demon.co.uk/mpatrol)" >&5
@@ -28288,7 +35694,7 @@
  CROSSCOMPILE=NO
  
  
-@@ -6295,10 +21338,10 @@
+@@ -6295,10 +20931,10 @@
  	ac_default_prefix=/boot/develop/tools/gnupro
  	LIBSTDCPP="-lstdc++.r4"
          ;;
@@ -28302,7 +35708,7 @@
  if test "$STLPORTPREFIX" != "no"; then
      if test -z "$STLPORTPREFIX" -o "$STLPORTPREFIX" = "yes"; then
          STLPORTPREFIX="$prefix"
-@@ -6308,7 +21351,7 @@
+@@ -6308,7 +20944,7 @@
          if test -f $INCSTLPORT/config/stlcomp.h; then
  	CPPFLAGS="-I$INCSTLPORT $CPPFLAGS"
  	STL_CFLAGS="-I$INCSTLPORT"
@@ -28311,7 +35717,7 @@
  									if test -n "$STLPORTLIB"; then
  	    LIBSTDCPP="-l$STLPORTLIB"
  	else
-@@ -6323,7 +21366,7 @@
+@@ -6323,7 +20959,7 @@
  		    LIBNAME="`echo $l | tr '_.' '  '`"
  		    LIBSUFFIX=`echo $LIBNAME | cut -d ' ' -f 2`
  		    LIBTYPE=`echo $LIBNAME | cut -d ' ' -f 3`
@@ -28320,16 +35726,16 @@
  		    if test "$LIBTYPE" = "stldebug" -a "$enable_stlport_debug" != "no"; then
  			USESTLLIB="-lstlport_${LIBSUFFIX}_stldebug"
  		    elif test "$LIBTYPE" = "so" -a -z "$enable_stlport_debug"; then
-@@ -6337,97 +21380,103 @@
+@@ -6337,97 +20973,103 @@
  	fi
      fi
  fi
 -echo "$ac_t""$LIBSTDCPP" 1>&6
 +{ echo "$as_me:$LINENO: result: $LIBSTDCPP" >&5
 +echo "${ECHO_T}$LIBSTDCPP" >&6; }
-+
  
 -# Check whether --with-libstdcppstatic or --without-libstdcppstatic was given.
++
 +# Check whether --with-libstdcppstatic was given.
  if test "${with_libstdcppstatic+set}" = set; then
 -  withval="$with_libstdcppstatic"
@@ -28437,7 +35843,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_path_SDL_CONFIG="$as_dir/$ac_word$ac_exec_ext"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -28471,7 +35877,7 @@
    no_sdl=""
    if test "$SDL_CONFIG" = "no" ; then
      no_sdl=yes
-@@ -6443,16 +21492,21 @@
+@@ -6443,16 +21085,21 @@
             sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
      if test "x$enable_sdltest" = "xyes" ; then
        ac_save_CFLAGS="$CFLAGS"
@@ -28496,7 +35902,7 @@
  
  #include <stdio.h>
  #include <stdlib.h>
-@@ -6463,7 +21517,7 @@
+@@ -6463,7 +21110,7 @@
  my_strdup (char *str)
  {
    char *new_str;
@@ -28505,7 +35911,7 @@
    if (str)
      {
        new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char));
-@@ -6471,7 +21525,7 @@
+@@ -6471,7 +21118,7 @@
      }
    else
      new_str = NULL;
@@ -28514,7 +35920,7 @@
    return new_str;
  }
  
-@@ -6511,28 +21565,52 @@
+@@ -6511,28 +21158,52 @@
  }
  
  
@@ -28578,7 +35984,7 @@
       if test "$SDL_CONFIG" = "no" ; then
         echo "*** The sdl-config script installed by SDL could not be found"
         echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in"
-@@ -6544,10 +21622,14 @@
+@@ -6544,10 +21215,14 @@
         else
            echo "*** Could not run SDL test program, checking why..."
            CFLAGS="$CFLAGS $SDL_CFLAGS"
@@ -28596,7 +36002,7 @@
  
  #include <stdio.h>
  #include "SDL.h"
-@@ -6557,12 +21639,48 @@
+@@ -6557,12 +21232,32 @@
  #undef  main
  #define main K_and_R_C_main
  
@@ -28627,31 +36033,15 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
     echo "*** The test program compiled, but did not run. This usually means"
            echo "*** that the run-time linker is not finding SDL or finding the wrong"
            echo "*** version of SDL. If it is not finding SDL, you'll need to set your"
-@@ -6573,26 +21691,31 @@
+@@ -6573,26 +21268,31 @@
            echo "*** If you have an old version installed, it is best to remove it, although"
            echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
  else
@@ -28670,7 +36060,7 @@
  fi
 -rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
            CFLAGS="$ac_save_CFLAGS"
 +          CXXFLAGS="$ac_save_CXXFLAGS"
@@ -28692,7 +36082,7 @@
    rm -f conf.sdltest
  
  
-@@ -6604,153 +21727,322 @@
+@@ -6604,153 +21304,282 @@
  
  
  ft2test=yes
@@ -28748,7 +36138,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_path_freetype_config="$as_dir/$ac_word$ac_exec_ext"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -28799,7 +36189,13 @@
 -/* We use char because int might match the return type of a gcc2
 -    builtin and then its argument prototype would still apply.  */
 -char FT_Init_FreeType();
--
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
 -int main() {
 -FT_Init_FreeType()
 -; return 0; }
@@ -28807,18 +36203,6 @@
 -if { (eval echo configure:6681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -28847,47 +36231,44 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_freetype_FT_Init_FreeType=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_freetype_FT_Init_FreeType=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_Init_FreeType" >&5
 +echo "${ECHO_T}$ac_cv_lib_freetype_FT_Init_FreeType" >&6; }
 +if test $ac_cv_lib_freetype_FT_Init_FreeType = yes; then
-+  have_freetype=yes
+   have_freetype=yes
+-else
+-  echo "$ac_t""no" 1>&6
  fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
  
+-	ac_safe=`echo "ft2build.h" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for ft2build.h""... $ac_c" 1>&6
+-echo "configure:6703: checking for ft2build.h" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
 +	if test "${ac_cv_header_ft2build_h+set}" = set; then
 +  { echo "$as_me:$LINENO: checking for ft2build.h" >&5
 +echo $ECHO_N "checking for ft2build.h... $ECHO_C" >&6; }
@@ -28896,7 +36277,10 @@
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_ft2build_h" >&5
 +echo "${ECHO_T}$ac_cv_header_ft2build_h" >&6; }
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6708 "configure"
+-#include "confdefs.h"
 +  # Is the header compilable?
 +{ echo "$as_me:$LINENO: checking ft2build.h usability" >&5
 +echo $ECHO_N "checking ft2build.h usability... $ECHO_C" >&6; }
@@ -28907,7 +36291,14 @@
 +cat >>conftest.$ac_ext <<_ACEOF
 +/* end confdefs.h.  */
 +$ac_includes_default
-+#include <ft2build.h>
+ #include <ft2build.h>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:6713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=yes"
 +_ACEOF
 +rm -f conftest.$ac_objext
 +if { (ac_try="$ac_compile"
@@ -28922,36 +36313,25 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
 +
@@ -28978,46 +36358,21 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  have_freetype=yes
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  ac_header_preproc=yes
- else
--  echo "$ac_t""no" 1>&6
++else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  ac_header_preproc=no
  fi
- 
--	ac_safe=`echo "ft2build.h" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for ft2build.h""... $ac_c" 1>&6
--echo "configure:6703: checking for ft2build.h" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 6708 "configure"
--#include "confdefs.h"
--#include <ft2build.h>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:6713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  have_ft2build=yes
++
 +rm -f conftest.err conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 +echo "${ECHO_T}$ac_header_preproc" >&6; }
@@ -29052,27 +36407,18 @@
 +if test "${ac_cv_header_ft2build_h+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
+-  echo "$ac_t""no" 1>&6
 +  ac_cv_header_ft2build_h=$ac_header_preproc
  fi
--rm -f conftest*
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_ft2build_h" >&5
 +echo "${ECHO_T}$ac_cv_header_ft2build_h" >&6; }
 +
- fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
++fi
 +if test $ac_cv_header_ft2build_h = yes; then
-   have_ft2build=yes
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
++  have_ft2build=yes
++fi
 +
+ 
  	if test "$have_ft2build" != "yes"; then
  	    have_freetype="no"
  	elif test "$have_freetype" = "yes"; then
@@ -29105,7 +36451,7 @@
  fi
  
  CFLAGS="$CFLAGS $FREETYPE_CFLAGS"
-@@ -6762,10 +22054,9 @@
+@@ -6762,10 +21591,9 @@
  LIBEXPAT="-lexpat"
  
  internalexpat=no
@@ -29118,7 +36464,7 @@
  
  fi
  
-@@ -6775,93 +22066,265 @@
+@@ -6775,93 +21603,225 @@
      have_expat_lib=no
      have_expat_include=no
  
@@ -29127,10 +36473,6 @@
 -echo "configure:6781: checking for expat.h" >&5
 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 6786 "configure"
--#include "confdefs.h"
 +    if test "${ac_cv_header_expat_h+set}" = set; then
 +  { echo "$as_me:$LINENO: checking for expat.h" >&5
 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6; }
@@ -29139,7 +36481,10 @@
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6786 "configure"
+-#include "confdefs.h"
 +  # Is the header compilable?
 +{ echo "$as_me:$LINENO: checking expat.h usability" >&5
 +echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6; }
@@ -29172,36 +36517,25 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
 +
@@ -29228,23 +36562,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  ac_header_preproc=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -29292,28 +36613,28 @@
  else
 -  echo "$ac_t""no" 1>&6
 +  ac_cv_header_expat_h=$ac_header_preproc
-+fi
+ fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6; }
 +
 +fi
 +if test $ac_cv_header_expat_h = yes; then
 +  have_expat_include=yes
- fi
++fi
++
  
  
-+
      if test x$have_expat_include = xno; then
 -    	    { echo "configure: error: *** Unable to find expat header file! (http://expat.sourceforge.net)
 +    	    { { echo "$as_me:$LINENO: error: *** Unable to find expat header file! (http://expat.sourceforge.net)
-+		Please install the library and header files if you want to link to the shared library,
-+		or run './configure --enable-internalexpat' to compile an internal version of expat.
-+		" >&5
-+echo "$as_me: error: *** Unable to find expat header file! (http://expat.sourceforge.net)
  		Please install the library and header files if you want to link to the shared library,
 -		or run './configure --enable-internalexpat' to compile an internal version of expat. 
 -		" 1>&2; exit 1; }
 +		or run './configure --enable-internalexpat' to compile an internal version of expat.
++		" >&5
++echo "$as_me: error: *** Unable to find expat header file! (http://expat.sourceforge.net)
++		Please install the library and header files if you want to link to the shared library,
++		or run './configure --enable-internalexpat' to compile an internal version of expat.
 +		" >&2;}
 +   { (exit 1); exit 1; }; }
      fi
@@ -29338,7 +36659,13 @@
 -/* We use char because int might match the return type of a gcc2
 -    builtin and then its argument prototype would still apply.  */
 -char XML_ParserCreate();
--
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
 -int main() {
 -XML_ParserCreate()
 -; return 0; }
@@ -29346,25 +36673,6 @@
 -if { (eval echo configure:6840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -29393,39 +36701,31 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_expat_XML_ParserCreate=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_expat_XML_ParserCreate=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
 +echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6; }
 +if test $ac_cv_lib_expat_XML_ParserCreate = yes; then
@@ -29438,20 +36738,20 @@
      if test x$have_expat_lib = xno; then
 -	{ echo "configure: error: *** Unable to find expat xml library! (http://expat.sourceforge.net)
 +	{ { echo "$as_me:$LINENO: error: *** Unable to find expat xml library! (http://expat.sourceforge.net)
-+	    Please install the library and header files if you want to link to the shared library,
-+	    or run './configure --enable-internalexpat' to compile an internal version of expat.
-+	    " >&5
-+echo "$as_me: error: *** Unable to find expat xml library! (http://expat.sourceforge.net)
  	    Please install the library and header files if you want to link to the shared library,
 -	    or run './configure --enable-internalexpat' to compile an internal version of expat. 
 -	    " 1>&2; exit 1; }
 +	    or run './configure --enable-internalexpat' to compile an internal version of expat.
++	    " >&5
++echo "$as_me: error: *** Unable to find expat xml library! (http://expat.sourceforge.net)
++	    Please install the library and header files if you want to link to the shared library,
++	    or run './configure --enable-internalexpat' to compile an internal version of expat.
 +	    " >&2;}
 +   { (exit 1); exit 1; }; }
      fi
  else
      EXPAT_INCLUDE="-I\$(srcdir)/../expat"
-@@ -6882,10 +22345,9 @@
+@@ -6882,10 +21842,9 @@
  LIBPHYSFS="-lphysfs"
  
  internalphysfs=no
@@ -29464,7 +36764,7 @@
  
  fi
  
-@@ -6895,102 +22357,274 @@
+@@ -6895,102 +21854,234 @@
      have_physfs_lib=no
      have_physfs_include=no
  
@@ -29473,10 +36773,6 @@
 -echo "configure:6901: checking for physfs.h" >&5
 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 6906 "configure"
--#include "confdefs.h"
 +    if test "${ac_cv_header_physfs_h+set}" = set; then
 +  { echo "$as_me:$LINENO: checking for physfs.h" >&5
 +echo $ECHO_N "checking for physfs.h... $ECHO_C" >&6; }
@@ -29485,7 +36781,10 @@
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_physfs_h" >&5
 +echo "${ECHO_T}$ac_cv_header_physfs_h" >&6; }
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 6906 "configure"
+-#include "confdefs.h"
 +  # Is the header compilable?
 +{ echo "$as_me:$LINENO: checking physfs.h usability" >&5
 +echo $ECHO_N "checking physfs.h usability... $ECHO_C" >&6; }
@@ -29518,36 +36817,25 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
 +
@@ -29574,23 +36862,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_c_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  ac_header_preproc=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -29684,7 +36959,13 @@
 -/* We use char because int might match the return type of a gcc2
 -    builtin and then its argument prototype would still apply.  */
 -char PHYSFS_init();
--
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
+ 
 -int main() {
 -PHYSFS_init()
 -; return 0; }
@@ -29692,25 +36973,6 @@
 -if { (eval echo configure:6960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
@@ -29739,39 +37001,31 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_physfs_PHYSFS_init=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_physfs_PHYSFS_init=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_physfs_PHYSFS_init" >&5
 +echo "${ECHO_T}$ac_cv_lib_physfs_PHYSFS_init" >&6; }
 +if test $ac_cv_lib_physfs_PHYSFS_init = yes; then
@@ -29808,7 +37062,7 @@
  
  
  
-@@ -6998,180 +22632,270 @@
+@@ -6998,180 +22089,246 @@
  
  
  
@@ -29823,15 +37077,28 @@
 +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
  
 -echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
 -echo "configure:7011: checking how to run the C++ preprocessor" >&5
 -if test -z "$CXXCPP"; then
 -if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
++
++
++
++for ac_header in hash_map ext/hash_map
++do
++as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  { echo "$as_me:$LINENO: checking for $ac_header" >&5
++echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
++if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
++fi
++ac_res=`eval echo '${'$as_ac_Header'}'`
++	       { echo "$as_me:$LINENO: result: $ac_res" >&5
++echo "${ECHO_T}$ac_res" >&6; }
+ else
 -  ac_ext=C
 -# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
 -ac_cpp='$CXXCPP $CPPFLAGS'
@@ -29849,57 +37116,6 @@
 -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 -if test -z "$ac_err"; then
 -  :
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  CXXCPP=/lib/cpp
--fi
--rm -f conftest*
--  ac_cv_prog_CXXCPP="$CXXCPP"
--ac_ext=C
--# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--cross_compiling=$ac_cv_prog_cxx_cross
--fi
--fi
--CXXCPP="$ac_cv_prog_CXXCPP"
--echo "$ac_t""$CXXCPP" 1>&6
- 
--for ac_hdr in hash_map ext/hash_map
-+for ac_header in hash_map ext/hash_map
- do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:7057: checking for $ac_hdr" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 7062 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:7067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
-+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  { echo "$as_me:$LINENO: checking for $ac_header" >&5
-+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+else
 +  # Is the header compilable?
 +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
@@ -29925,36 +37141,43 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  CXXCPP=/lib/cpp
+-fi
+-rm -f conftest*
+-  ac_cv_prog_CXXCPP="$CXXCPP"
+-ac_ext=C
+-# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CXXCPP $CPPFLAGS'
+-ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cxx_cross
+-fi
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_header_compiler=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-CXXCPP="$ac_cv_prog_CXXCPP"
+-echo "$ac_t""$CXXCPP" 1>&6
+ 
+-for ac_hdr in hash_map ext/hash_map
+-do
+-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:7057: checking for $ac_hdr" >&5
+-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
 +
@@ -29981,34 +37204,23 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  ac_cpp_err=yes
- fi
--rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
--EOF
-- 
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  ac_header_preproc=yes
  else
--  echo "$ac_t""no" 1>&6
+-  cat > conftest.$ac_ext <<EOF
+-#line 7062 "configure"
+-#include "confdefs.h"
+-#include <$ac_hdr>
+-EOF
+-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:7067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+-if test -z "$ac_err"; then
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=yes"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
@@ -30048,14 +37260,29 @@
 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
 +  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
+ fi
+-rm -f conftest*
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_hdr 1
+-EOF
+- 
+-else
+-  echo "$ac_t""no" 1>&6
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
 +  cat >>confdefs.h <<_ACEOF
 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
@@ -30195,7 +37422,7 @@
  else
    PARAGUI_THEMEDIR=$prefix/share/paragui
  fi
-@@ -7180,83 +22904,126 @@
+@@ -7180,83 +22337,110 @@
  if test "$PARAGUI_THEMEDIR" = "NONE/share/paragui"; then
  	PARAGUI_THEMEDIR=$SDL_PREFIX/share/paragui
  fi
@@ -30251,18 +37478,6 @@
 -if { (eval echo configure:7215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
 +char IMG_Load ();
 +int
 +main ()
@@ -30285,39 +37500,31 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_SDL_image_IMG_Load=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_SDL_image_IMG_Load=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_SDL_image_IMG_Load" >&5
 +echo "${ECHO_T}$ac_cv_lib_SDL_image_IMG_Load" >&6; }
 +if test $ac_cv_lib_SDL_image_IMG_Load = yes; then
@@ -30371,7 +37578,7 @@
      fi
  
  fi
-@@ -7264,9 +23031,10 @@
+@@ -7264,9 +22448,10 @@
  if test "x$have_SDL_image" = xyes; then
      IMAGE_LIBS="-lSDL_image"
      IMAGE_INCLUDE="$IMAGE_INCLUDE"
@@ -30384,7 +37591,7 @@
  
  else
      IMAGE_LIBS=""
-@@ -7279,19 +23047,17 @@
+@@ -7279,19 +22464,17 @@
  python_p=no
  ruby_p=no
  
@@ -30408,7 +37615,7 @@
       swig_p=$enable_ruby
  
  fi
-@@ -7301,203 +23067,582 @@
+@@ -7301,203 +22484,510 @@
    SWIG=""
    # Extract the first word of "swig", so it can be a program name with args.
  set dummy swig; ac_word=$2
@@ -30447,7 +37654,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_path_SWIG="$as_dir/$ac_word$ac_exec_ext"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -30521,7 +37728,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -30561,10 +37768,6 @@
 -echo "configure:7390: checking for python2.2/Python.h" >&5
 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 7395 "configure"
--#include "confdefs.h"
 +    if test "${ac_cv_header_python2_2_Python_h+set}" = set; then
 +  { echo "$as_me:$LINENO: checking for python2.2/Python.h" >&5
 +echo $ECHO_N "checking for python2.2/Python.h... $ECHO_C" >&6; }
@@ -30573,7 +37776,10 @@
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_python2_2_Python_h" >&5
 +echo "${ECHO_T}$ac_cv_header_python2_2_Python_h" >&6; }
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 7395 "configure"
+-#include "confdefs.h"
 +  # Is the header compilable?
 +{ echo "$as_me:$LINENO: checking python2.2/Python.h usability" >&5
 +echo $ECHO_N "checking python2.2/Python.h usability... $ECHO_C" >&6; }
@@ -30606,36 +37812,25 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
 +
@@ -30662,23 +37857,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  ac_header_preproc=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -30726,16 +37908,16 @@
  else
 -  echo "$ac_t""no" 1>&6
 +  ac_cv_header_python2_2_Python_h=$ac_header_preproc
-+fi
+ fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_python2_2_Python_h" >&5
 +echo "${ECHO_T}$ac_cv_header_python2_2_Python_h" >&6; }
 +
 +fi
 +if test $ac_cv_header_python2_2_Python_h = yes; then
 +  have_python_include=yes
- fi
- 
++fi
 +
+ 
      PYTHON_INCLUDE_DIR=$prefix/include/python2.2
      PYTHON_LIB_DIR=$libdir/python2.2
      if test x$have_python_include = xno; then
@@ -30744,10 +37926,6 @@
 -echo "configure:7426: checking for python2.1/Python.h" >&5
 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 7431 "configure"
--#include "confdefs.h"
 +        if test "${ac_cv_header_python2_1_Python_h+set}" = set; then
 +  { echo "$as_me:$LINENO: checking for python2.1/Python.h" >&5
 +echo $ECHO_N "checking for python2.1/Python.h... $ECHO_C" >&6; }
@@ -30756,7 +37934,10 @@
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_python2_1_Python_h" >&5
 +echo "${ECHO_T}$ac_cv_header_python2_1_Python_h" >&6; }
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 7431 "configure"
+-#include "confdefs.h"
 +  # Is the header compilable?
 +{ echo "$as_me:$LINENO: checking python2.1/Python.h usability" >&5
 +echo $ECHO_N "checking python2.1/Python.h usability... $ECHO_C" >&6; }
@@ -30789,36 +37970,25 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
 +
@@ -30845,24 +38015,20 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
-+else
-+  ac_cpp_err=yes
-+fi
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  ac_header_preproc=yes
 +else
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +  ac_header_preproc=no
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-  have_python_include=yes
 +
 +rm -f conftest.err conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
@@ -30898,27 +38064,18 @@
 +if test "${ac_cv_header_python2_1_Python_h+set}" = set; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
  else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
+-  echo "$ac_t""no" 1>&6
 +  ac_cv_header_python2_1_Python_h=$ac_header_preproc
- fi
--rm -f conftest*
++fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_python2_1_Python_h" >&5
 +echo "${ECHO_T}$ac_cv_header_python2_1_Python_h" >&6; }
 +
  fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
 +if test $ac_cv_header_python2_1_Python_h = yes; then
-   have_python_include=yes
--else
--  echo "$ac_t""no" 1>&6
- fi
- 
++  have_python_include=yes
++fi
 +
+ 
  	PYTHON_INCLUDE_DIR=$prefix/include/python2.1
  	PYTHON_LIB_DIR=$libdir/python2.1
      fi
@@ -30928,10 +38085,6 @@
 -echo "configure:7463: checking for python2.0/Python.h" >&5
 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 7468 "configure"
--#include "confdefs.h"
 +        if test "${ac_cv_header_python2_0_Python_h+set}" = set; then
 +  { echo "$as_me:$LINENO: checking for python2.0/Python.h" >&5
 +echo $ECHO_N "checking for python2.0/Python.h... $ECHO_C" >&6; }
@@ -30940,7 +38093,10 @@
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_python2_0_Python_h" >&5
 +echo "${ECHO_T}$ac_cv_header_python2_0_Python_h" >&6; }
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 7468 "configure"
+-#include "confdefs.h"
 +  # Is the header compilable?
 +{ echo "$as_me:$LINENO: checking python2.0/Python.h usability" >&5
 +echo $ECHO_N "checking python2.0/Python.h usability... $ECHO_C" >&6; }
@@ -30973,36 +38129,25 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
 +
@@ -31029,23 +38174,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  ac_header_preproc=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -31119,7 +38251,7 @@
  
      BINDINGS="$BINDINGS python"
  fi
-@@ -7505,87 +23650,220 @@
+@@ -7505,87 +22995,196 @@
  if test "x$ruby_p" = xyes; then
      # Extract the first word of "ruby", so it can be a program name with args.
  set dummy ruby; ac_word=$2
@@ -31158,7 +38290,7 @@
 +  IFS=$as_save_IFS
 +  test -z "$as_dir" && as_dir=.
 +  for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
++  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
 +    ac_cv_path_RUBY="$as_dir/$ac_word$ac_exec_ext"
 +    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
 +    break 2
@@ -31200,10 +38332,6 @@
 -echo "configure:7553: checking for $RUBY_INCLUDE_DIR/ruby.h" >&5
 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 7558 "configure"
--#include "confdefs.h"
 +    as_ac_Header=`echo "ac_cv_header_$RUBY_INCLUDE_DIR/ruby.h" | $as_tr_sh`
 +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
 +  { echo "$as_me:$LINENO: checking for $RUBY_INCLUDE_DIR/ruby.h" >&5
@@ -31214,7 +38342,10 @@
 +ac_res=`eval echo '${'$as_ac_Header'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 7558 "configure"
+-#include "confdefs.h"
 +  # Is the header compilable?
 +{ echo "$as_me:$LINENO: checking $RUBY_INCLUDE_DIR/ruby.h usability" >&5
 +echo $ECHO_N "checking $RUBY_INCLUDE_DIR/ruby.h usability... $ECHO_C" >&6; }
@@ -31247,36 +38378,25 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
 +
@@ -31303,23 +38423,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  ac_header_preproc=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -31372,12 +38479,12 @@
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
 +
-+fi
+ fi
 +if test `eval echo '${'$as_ac_Header'}'` = yes; then
 +  have_ruby_include=yes
- fi
- 
++fi
 +
+ 
      if test "x$have_ruby_include" = xno; then
 -      { echo "configure: error: *** ruby.h not found! ***" 1>&2; exit 1; }
 +      { { echo "$as_me:$LINENO: error: *** ruby.h not found! ***" >&5
@@ -31392,7 +38499,7 @@
  
      BINDINGS="$BINDINGS ruby"
  fi
-@@ -7601,420 +23879,860 @@
+@@ -7601,420 +23200,724 @@
  # Grab all extra libs from SDL_CONFIG to build the static lib list.
  # Unfortunately libs like jpeg and png will be missing still so we check
  # for those manually.
@@ -31438,23 +38545,6 @@
 -if { (eval echo configure:7628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
 +char jpeg_read_header ();
 +int
 +main ()
@@ -31477,39 +38567,36 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_jpeg_jpeg_read_header=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_jpeg_jpeg_read_header=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo jpeg | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
+-EOF
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_read_header" >&5
 +echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_read_header" >&6; }
 +if test $ac_cv_lib_jpeg_jpeg_read_header = yes; then
@@ -31565,23 +38652,6 @@
 -if { (eval echo configure:7678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo tiff | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
 +char TIFFClose ();
 +int
 +main ()
@@ -31604,39 +38674,36 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_tiff_TIFFClose=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_tiff_TIFFClose=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo tiff | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
+-EOF
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_tiff_TIFFClose" >&5
 +echo "${ECHO_T}$ac_cv_lib_tiff_TIFFClose" >&6; }
 +if test $ac_cv_lib_tiff_TIFFClose = yes; then
@@ -31692,23 +38759,6 @@
 -if { (eval echo configure:7728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
--fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
--
--fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_lib=HAVE_LIB`echo png | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_lib 1
--EOF
 +char png_create_read_struct ();
 +int
 +main ()
@@ -31731,39 +38781,36 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  ac_cv_lib_png_png_create_read_struct=yes
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_cv_lib_png_png_create_read_struct=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_objext \
+ fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+ 
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
-+fi
+ fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo png | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
+-EOF
 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_create_read_struct" >&5
 +echo "${ECHO_T}$ac_cv_lib_png_png_create_read_struct" >&6; }
 +if test $ac_cv_lib_png_png_create_read_struct = yes; then
@@ -31785,16 +38832,15 @@
 -echo "configure:7759: checking for $ac_func" >&5
 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 7764 "configure"
--#include "confdefs.h"
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 7764 "configure"
+-#include "confdefs.h"
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -31849,14 +38895,6 @@
 -if { (eval echo configure:7790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_func_$ac_func=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
--fi
--rm -f conftest*
--fi
 +int
 +main ()
 +{
@@ -31878,38 +38916,27 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  eval "$as_ac_var=yes"
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_func_$ac_func=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
-+fi
+ fi
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
@@ -31937,16 +38964,15 @@
 -echo "configure:7817: checking for $ac_func" >&5
 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 7822 "configure"
--#include "confdefs.h"
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 7822 "configure"
+-#include "confdefs.h"
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -32001,14 +39027,6 @@
 -if { (eval echo configure:7848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_func_$ac_func=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
--fi
--rm -f conftest*
--fi
 +int
 +main ()
 +{
@@ -32030,38 +39048,27 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  eval "$as_ac_var=yes"
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_func_$ac_func=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
-+fi
+ fi
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
@@ -32089,16 +39096,15 @@
 -echo "configure:7875: checking for $ac_func" >&5
 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 7880 "configure"
--#include "confdefs.h"
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 7880 "configure"
+-#include "confdefs.h"
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -32153,14 +39159,6 @@
 -if { (eval echo configure:7906: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_func_$ac_func=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
--fi
--rm -f conftest*
--fi
 +int
 +main ()
 +{
@@ -32182,38 +39180,27 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  eval "$as_ac_var=yes"
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_func_$ac_func=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
-+fi
+ fi
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
@@ -32239,10 +39226,6 @@
 -echo "configure:7932: checking for fnmatch.h" >&5
 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 7937 "configure"
--#include "confdefs.h"
 +if test "${ac_cv_header_fnmatch_h+set}" = set; then
 +  { echo "$as_me:$LINENO: checking for fnmatch.h" >&5
 +echo $ECHO_N "checking for fnmatch.h... $ECHO_C" >&6; }
@@ -32251,7 +39234,10 @@
 +fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_fnmatch_h" >&5
 +echo "${ECHO_T}$ac_cv_header_fnmatch_h" >&6; }
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 7937 "configure"
+-#include "confdefs.h"
 +  # Is the header compilable?
 +{ echo "$as_me:$LINENO: checking fnmatch.h usability" >&5
 +echo $ECHO_N "checking fnmatch.h usability... $ECHO_C" >&6; }
@@ -32284,36 +39270,25 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest.$ac_objext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
 +  ac_header_compiler=yes
-+else
+ else
+-  echo "$ac_err" >&5
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_header_$ac_safe=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	ac_header_compiler=no
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 +echo "${ECHO_T}$ac_header_compiler" >&6; }
 +
@@ -32340,23 +39315,10 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } >/dev/null; then
-+  if test -s conftest.err; then
-+    ac_cpp_err=$ac_cxx_preproc_warn_flag
-+    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-+  else
-+    ac_cpp_err=
-+  fi
- else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
-+  ac_cpp_err=yes
- fi
--rm -f conftest*
-+if test -z "$ac_cpp_err"; then
++  (exit $ac_status); } >/dev/null && {
++	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       }; then
 +  ac_header_preproc=yes
 +else
 +  echo "$as_me: failed program was:" >&5
@@ -32404,16 +39366,16 @@
  else
 -  echo "$ac_t""no" 1>&6
 +  ac_cv_header_fnmatch_h=$ac_header_preproc
-+fi
+ fi
 +{ echo "$as_me:$LINENO: result: $ac_cv_header_fnmatch_h" >&5
 +echo "${ECHO_T}$ac_cv_header_fnmatch_h" >&6; }
 +
 +fi
 +if test $ac_cv_header_fnmatch_h = yes; then
 +  have_fnmatch_h=yes
- fi
- 
++fi
 +
+ 
  if test x$have_fnmatch_h = xyes; then
 -    for ac_func in fnmatch
 +
@@ -32423,16 +39385,15 @@
 -echo "configure:7967: checking for $ac_func" >&5
 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
 -  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 7972 "configure"
--#include "confdefs.h"
 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +{ echo "$as_me:$LINENO: checking for $ac_func" >&5
 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
 +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
 +  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
+ else
+-  cat > conftest.$ac_ext <<EOF
+-#line 7972 "configure"
+-#include "confdefs.h"
 +  cat >conftest.$ac_ext <<_ACEOF
 +/* confdefs.h.  */
 +_ACEOF
@@ -32487,14 +39448,6 @@
 -if { (eval echo configure:7998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
 -  rm -rf conftest*
 -  eval "ac_cv_func_$ac_func=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_func_$ac_func=no"
--fi
--rm -f conftest*
--fi
 +int
 +main ()
 +{
@@ -32516,38 +39469,27 @@
 +  rm -f conftest.er1
 +  cat conftest.err >&5
 +  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+	 { ac_try='test -s conftest$ac_exeext'
-+  { (case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
++  (exit $ac_status); } && {
++	 test -z "$ac_cxx_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest$ac_exeext &&
++       $as_test_x conftest$ac_exeext; then
 +  eval "$as_ac_var=yes"
-+else
+ else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_func_$ac_func=no"
 +  echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
 +	eval "$as_ac_var=no"
-+fi
+ fi
+-rm -f conftest*
 +
-+rm -f conftest.err conftest.$ac_objext \
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
-+fi
+ fi
 +ac_res=`eval echo '${'$as_ac_var'}'`
 +	       { echo "$as_me:$LINENO: result: $ac_res" >&5
 +echo "${ECHO_T}$ac_res" >&6; }
@@ -32568,7 +39510,7 @@
  fi
  done
  
-@@ -8043,579 +24761,1639 @@
+@@ -8043,579 +23946,1659 @@
  
  
  # Finally create all the generated files
@@ -32715,8 +39657,15 @@
  
 -DEFS=-DHAVE_CONFIG_H
 +LTLIBOBJS=$ac_ltlibobjs
-+
-+
+ 
+-# Without the "./", some shells look in PATH for config.status.
+-: ${CONFIG_STATUS=./config.status}
+ 
+-echo creating $CONFIG_STATUS
+-rm -f $CONFIG_STATUS
+-cat > $CONFIG_STATUS <<EOF
+-#! /bin/sh
+-# Generated automatically by configure.
 +if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
 +  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
 +Usually this means the macro was only invoked conditionally." >&5
@@ -32752,9 +39701,8 @@
 +Usually this means the macro was only invoked conditionally." >&2;}
 +   { (exit 1); exit 1; }; }
 +fi
- 
--# Without the "./", some shells look in PATH for config.status.
- : ${CONFIG_STATUS=./config.status}
++
++: ${CONFIG_STATUS=./config.status}
 +ac_clean_files_save=$ac_clean_files
 +ac_clean_files="$ac_clean_files $CONFIG_STATUS"
 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
@@ -32762,22 +39710,72 @@
 +cat >$CONFIG_STATUS <<_ACEOF
 +#! $SHELL
 +# Generated by $as_me.
-+# Run this file to recreate the current configuration.
-+# Compiler output produced by configure, useful for debugging
+ # Run this file to recreate the current configuration.
+-# This directory was configured as follows,
+-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
+-#
+-# $0 $ac_configure_args
+-#
+ # Compiler output produced by configure, useful for debugging
+-# configure, is in ./config.log if it exists.
 +# configure, is in config.log if it exists.
-+
+ 
+-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
+-for ac_option
+-do
+-  case "\$ac_option" in
+-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
+-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
+-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
+-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
+-    exit 0 ;;
+-  -help | --help | --hel | --he | --h)
+-    echo "\$ac_cs_usage"; exit 0 ;;
+-  *) echo "\$ac_cs_usage"; exit 1 ;;
+-  esac
+-done
 +debug=false
 +ac_cs_recheck=false
 +ac_cs_silent=false
 +SHELL=\${CONFIG_SHELL-$SHELL}
 +_ACEOF
-+
+ 
+-ac_given_srcdir=$srcdir
+-ac_given_INSTALL="$INSTALL"
 +cat >>$CONFIG_STATUS <<\_ACEOF
 +## --------------------- ##
 +## M4sh Initialization.  ##
 +## --------------------- ##
-+
-+# Be Bourne compatible
+ 
+-trap 'rm -fr `echo "
+-Makefile
+-doc/Makefile
+-include/Makefile
+-src/Makefile
+-src/expat/Makefile
+-src/draw/Makefile
+-src/font/Makefile
+-src/themes/Makefile
+-src/core/Makefile
+-src/widgets/Makefile
+-data/Makefile
+-bindings/Makefile
+-bindings/python/Makefile
+-bindings/ruby/Makefile
+-test/Makefile
+-test/fireworks/Makefile
+-test/colorselector/Makefile
+-test/keyboard/Makefile
+-sdk/Makefile
+-paragui.spec
+-paragui-config
+-paragui.pc
+- include/paraconfig_gnu.h:include/paraconfig_gnu.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+-EOF
+-cat >> $CONFIG_STATUS <<EOF
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
 +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
 +  emulate sh
 +  NULLCMD=:
@@ -32786,12 +39784,137 @@
 +  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
 +else
-+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
++  case `(set -o) 2>/dev/null` in
++  *posix*) set -o posix ;;
++esac
+ 
+-# Protect against being on the right side of a sed subst in config.status.
+-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
+- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
+-$ac_vpsub
+-$extrasub
+-s%@SHELL@%$SHELL%g
+-s%@CFLAGS@%$CFLAGS%g
+-s%@CPPFLAGS@%$CPPFLAGS%g
+-s%@CXXFLAGS@%$CXXFLAGS%g
+-s%@FFLAGS@%$FFLAGS%g
+-s%@DEFS@%$DEFS%g
+-s%@LDFLAGS@%$LDFLAGS%g
+-s%@LIBS@%$LIBS%g
+-s%@exec_prefix@%$exec_prefix%g
+-s%@prefix@%$prefix%g
+-s%@program_transform_name@%$program_transform_name%g
+-s%@bindir@%$bindir%g
+-s%@sbindir@%$sbindir%g
+-s%@libexecdir@%$libexecdir%g
+-s%@datadir@%$datadir%g
+-s%@sysconfdir@%$sysconfdir%g
+-s%@sharedstatedir@%$sharedstatedir%g
+-s%@localstatedir@%$localstatedir%g
+-s%@libdir@%$libdir%g
+-s%@includedir@%$includedir%g
+-s%@oldincludedir@%$oldincludedir%g
+-s%@infodir@%$infodir%g
+-s%@mandir@%$mandir%g
+-s%@TOP_BUILDDIR@%$TOP_BUILDDIR%g
+-s%@PARAGUI_MAJOR_VERSION@%$PARAGUI_MAJOR_VERSION%g
+-s%@PARAGUI_MINOR_VERSION@%$PARAGUI_MINOR_VERSION%g
+-s%@PARAGUI_MICRO_VERSION@%$PARAGUI_MICRO_VERSION%g
+-s%@PARAGUI_INTERFACE_AGE@%$PARAGUI_INTERFACE_AGE%g
+-s%@PARAGUI_BINARY_AGE@%$PARAGUI_BINARY_AGE%g
+-s%@PARAGUI_VERSION@%$PARAGUI_VERSION%g
+-s%@LT_RELEASE@%$LT_RELEASE%g
+-s%@LT_CURRENT@%$LT_CURRENT%g
+-s%@LT_REVISION@%$LT_REVISION%g
+-s%@LT_AGE@%$LT_AGE%g
+-s%@host@%$host%g
+-s%@host_alias@%$host_alias%g
+-s%@host_cpu@%$host_cpu%g
+-s%@host_vendor@%$host_vendor%g
+-s%@host_os@%$host_os%g
+-s%@target@%$target%g
+-s%@target_alias@%$target_alias%g
+-s%@target_cpu@%$target_cpu%g
+-s%@target_vendor@%$target_vendor%g
+-s%@target_os@%$target_os%g
+-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
+-s%@INSTALL_DATA@%$INSTALL_DATA%g
+-s%@PACKAGE@%$PACKAGE%g
+-s%@VERSION@%$VERSION%g
+-s%@ACLOCAL@%$ACLOCAL%g
+-s%@AUTOCONF@%$AUTOCONF%g
+-s%@AUTOMAKE@%$AUTOMAKE%g
+-s%@AUTOHEADER@%$AUTOHEADER%g
+-s%@MAKEINFO@%$MAKEINFO%g
+-s%@SET_MAKE@%$SET_MAKE%g
+-s%@build@%$build%g
+-s%@build_alias@%$build_alias%g
+-s%@build_cpu@%$build_cpu%g
+-s%@build_vendor@%$build_vendor%g
+-s%@build_os@%$build_os%g
+-s%@CC@%$CC%g
+-s%@LN_S@%$LN_S%g
+-s%@OBJEXT@%$OBJEXT%g
+-s%@EXEEXT@%$EXEEXT%g
+-s%@ECHO@%$ECHO%g
+-s%@RANLIB@%$RANLIB%g
+-s%@STRIP@%$STRIP%g
+-s%@DLLTOOL@%$DLLTOOL%g
+-s%@AS@%$AS%g
+-s%@OBJDUMP@%$OBJDUMP%g
+-s%@CPP@%$CPP%g
+-s%@LIBTOOL@%$LIBTOOL%g
+-s%@CXX@%$CXX%g
+-s%@LIBSTDCPP@%$LIBSTDCPP%g
+-s%@SDL_CONFIG@%$SDL_CONFIG%g
+-s%@SDL_CFLAGS@%$SDL_CFLAGS%g
+-s%@SDL_LIBS@%$SDL_LIBS%g
+-s%@SDL_PREFIX@%$SDL_PREFIX%g
+-s%@freetype_config@%$freetype_config%g
+-s%@EXPAT_INCLUDE@%$EXPAT_INCLUDE%g
+-s%@EXPAT_LIB@%$EXPAT_LIB%g
+-s%@EXPAT_SUBDIR@%$EXPAT_SUBDIR%g
+-s%@LIBEXPAT@%$LIBEXPAT%g
+-s%@subdirs@%$subdirs%g
+-s%@PHYSFS_INCLUDE@%$PHYSFS_INCLUDE%g
+-s%@PHYSFS_LIB@%$PHYSFS_LIB%g
+-s%@PHYSFS_SUBDIR@%$PHYSFS_SUBDIR%g
+-s%@LIBPHYSFS@%$LIBPHYSFS%g
+-s%@CXXCPP@%$CXXCPP%g
+-s%@SWIG@%$SWIG%g
+-s%@PYTHON@%$PYTHON%g
+-s%@PYTHON_INCLUDE_DIR@%$PYTHON_INCLUDE_DIR%g
+-s%@PYTHON_LIB_DIR@%$PYTHON_LIB_DIR%g
+-s%@RUBY@%$RUBY%g
+-s%@RUBY_INCLUDE_DIR@%$RUBY_INCLUDE_DIR%g
+-s%@RUBY_INSTALL_DIR@%$RUBY_INSTALL_DIR%g
+-s%@BINDINGS@%$BINDINGS%g
+-s%@IMAGE_LIBS@%$IMAGE_LIBS%g
+-s%@IMAGE_INCLUDE@%$IMAGE_INCLUDE%g
+-s%@SYSTEM_LIBS@%$SYSTEM_LIBS%g
+-s%@PARAGUI_CFLAGS@%$PARAGUI_CFLAGS%g
+-s%@PARAGUI_LIBS@%$PARAGUI_LIBS%g
+-s%@RPM_ROOT@%$RPM_ROOT%g
 +fi
-+BIN_SH=xpg4; export BIN_SH # for Tru64
-+DUALCASE=1; export DUALCASE # for MKS sh
+ 
+-CEOF
+-EOF
+ 
+-cat >> $CONFIG_STATUS <<\EOF
+ 
+-# Split the substitutions into bite-sized pieces for seds with
+-# small command number limits, like on Digital OSF/1 and HP-UX.
+-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+-ac_file=1 # Number of current file.
+-ac_beg=1 # First line for current file.
+-ac_end=$ac_max_sed_cmds # Line after last line for current file.
+-ac_more_lines=:
+-ac_sed_cmds=""
+-while $ac_more_lines; do
+-  if test $ac_beg -gt 1; then
+-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
 +
-+
 +# PATH needs CR
 +# Avoid depending upon Character Ranges.
 +as_cr_letters='abcdefghijklmnopqrstuvwxyz'
@@ -32807,9 +39930,13 @@
 +  chmod +x conf$$.sh
 +  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
 +    PATH_SEPARATOR=';'
-+  else
+   else
+-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
 +    PATH_SEPARATOR=:
-+  fi
+   fi
+-  if test ! -s conftest.s$ac_file; then
+-    ac_more_lines=false
+-    rm -f conftest.s$ac_file
 +  rm -f conf$$.sh
 +fi
 +
@@ -32870,10 +39997,20 @@
 +do
 +  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
 +    eval $as_var=C; export $as_var
-+  else
+   else
+-    if test -z "$ac_sed_cmds"; then
+-      ac_sed_cmds="sed -f conftest.s$ac_file"
+-    else
+-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+-    fi
+-    ac_file=`expr $ac_file + 1`
+-    ac_beg=$ac_end
+-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
 +    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+  fi
-+done
+   fi
+ done
+-if test -z "$ac_sed_cmds"; then
+-  ac_sed_cmds=cat
 +
 +# Required to use basename.
 +if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -32881,15 +40018,50 @@
 +  as_expr=expr
 +else
 +  as_expr=false
-+fi
-+
+ fi
+-EOF
+ 
+-cat >> $CONFIG_STATUS <<EOF
 +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
 +  as_basename=basename
 +else
 +  as_basename=false
 +fi
-+
-+
+ 
+-CONFIG_FILES=\${CONFIG_FILES-"Makefile
+-doc/Makefile
+-include/Makefile
+-src/Makefile
+-src/expat/Makefile
+-src/draw/Makefile
+-src/font/Makefile
+-src/themes/Makefile
+-src/core/Makefile
+-src/widgets/Makefile
+-data/Makefile
+-bindings/Makefile
+-bindings/python/Makefile
+-bindings/ruby/Makefile
+-test/Makefile
+-test/fireworks/Makefile
+-test/colorselector/Makefile
+-test/keyboard/Makefile
+-sdk/Makefile
+-paragui.spec
+-paragui-config
+-paragui.pc
+-"}
+-EOF
+-cat >> $CONFIG_STATUS <<\EOF
+-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+-  case "$ac_file" in
+-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+-  *) ac_file_in="${ac_file}.in" ;;
+-  esac
+ 
+-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
 +# Name of the executable.
 +as_me=`$as_basename -- "$0" ||
 +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
@@ -32909,7 +40081,15 @@
 +	    q
 +	  }
 +	  s/.*/./; q'`
-+
+ 
+-  # Remove last slash and all that follows it.  Not all systems have dirname.
+-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+-    # The file is in a subdirectory.
+-    test ! -d "$ac_dir" && mkdir "$ac_dir"
+-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
+-    # A "../" for each directory in $ac_dir_suffix.
+-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
 +# CDPATH.
 +$as_unset CDPATH
 +
@@ -32963,10 +40143,7 @@
 +else
 +  as_dirname=false
 +fi
- 
--echo creating $CONFIG_STATUS
--rm -f $CONFIG_STATUS
--cat > $CONFIG_STATUS <<EOF
++
 +ECHO_C= ECHO_N= ECHO_T=
 +case `echo -n x` in
 +-n*)
@@ -33016,24 +40193,38 @@
 +  as_mkdir_p=false
 +fi
 +
-+# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
-+# systems may use methods other than mode bits to determine executability.
-+cat >conf$$.file <<_ASEOF
- #! /bin/sh
--# Generated automatically by configure.
--# Run this file to recreate the current configuration.
--# This directory was configured as follows,
--# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-+exit 0
-+_ASEOF
-+chmod +x conf$$.file
-+if test -x conf$$.file >/dev/null 2>&1; then
-+  as_executable_p="test -x"
++if test -x / >/dev/null 2>&1; then
++  as_test_x='test -x'
 +else
-+  as_executable_p=:
++  if ls -dL / >/dev/null 2>&1; then
++    as_ls_L_option=L
+   else
+-    ac_dir_suffix= ac_dots=
++    as_ls_L_option=
+   fi
++  as_test_x='
++    eval sh -c '\''
++      if test -d "$1"; then
++        test -d "$1/.";
++      else
++	case $1 in
++        -*)set "./$1";;
++	esac;
++	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
++	???[sx]*):;;*)false;;esac;fi
++    '\'' sh
++  '
 +fi
-+rm -f conf$$.file
-+
++as_executable_p=$as_test_x
+ 
+-  case "$ac_given_srcdir" in
+-  .)  srcdir=.
+-      if test -z "$ac_dots"; then top_srcdir=.
+-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
+-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
+-  *) # Relative path.
+-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
+-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
 +# Sed expression to map a string onto a valid CPP name.
 +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
 +
@@ -33048,7 +40239,7 @@
 +# values after options handling.
 +ac_log="
 +This file was extended by $as_me, which was
-+generated by GNU Autoconf 2.59e.  Invocation command line was
++generated by GNU Autoconf 2.61.  Invocation command line was
 +
 +  CONFIG_FILES    = $CONFIG_FILES
 +  CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -33077,7 +40268,7 @@
 +Usage: $0 [OPTIONS] [FILE]...
 +
 +  -h, --help       print this help, then exit
-+  -V, --version    print version number, then exit
++  -V, --version    print version number and configuration settings, then exit
 +  -q, --quiet      do not print progress messages
 +  -d, --debug      don't remove temporary files
 +      --recheck    update $as_me by reconfiguring in the same conditions
@@ -33101,7 +40292,7 @@
 +cat >>$CONFIG_STATUS <<_ACEOF
 +ac_cs_version="\\
 +config.status
-+configured by $0, generated by GNU Autoconf 2.59e,
++configured by $0, generated by GNU Autoconf 2.61,
 +  with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 +
 +Copyright (C) 2006 Free Software Foundation, Inc.
@@ -33130,8 +40321,11 @@
 +    ac_optarg=$2
 +    ac_shift=shift
 +    ;;
-+  esac
-+
+   esac
+ 
+-  case "$ac_given_INSTALL" in
+-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
 +  case $ac_option in
 +  # Handling of the options.
 +  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
@@ -33167,10 +40361,17 @@
 +  *) ac_config_targets="$ac_config_targets $1"
 +     ac_need_defaults=false ;;
 +
-+  esac
+   esac
 +  shift
 +done
-+
+ 
+-  echo creating "$ac_file"
+-  rm -f "$ac_file"
+-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
+-  case "$ac_file" in
+-  *Makefile*) ac_comsub="1i\\
+-# $configure_input" ;;
+-  *) ac_comsub= ;;
 +ac_configure_extra_args=
 +
 +if $ac_cs_silent; then
@@ -33200,33 +40401,18 @@
 +
 +_ACEOF
 +cat >>$CONFIG_STATUS <<_ACEOF
- #
--# $0 $ac_configure_args
++#
 +# INIT-COMMANDS
- #
--# Compiler output produced by configure, useful for debugging
--# configure, is in ./config.log if it exists.
++#
 +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
- 
--ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
--for ac_option
++
 +_ACEOF
 +
 +cat >>$CONFIG_STATUS <<\_ACEOF
 +
 +# Handling of arguments.
 +for ac_config_target in $ac_config_targets
- do
--  case "\$ac_option" in
--  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
--    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
--    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
--  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
--    echo "$CONFIG_STATUS generated by autoconf version 2.13"
--    exit 0 ;;
--  -help | --help | --hel | --he | --h)
--    echo "\$ac_cs_usage"; exit 0 ;;
--  *) echo "\$ac_cs_usage"; exit 1 ;;
++do
 +  case $ac_config_target in
 +    "include/paraconfig_gnu.h") CONFIG_HEADERS="$CONFIG_HEADERS include/paraconfig_gnu.h:include/paraconfig_gnu.h.in" ;;
 +    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
@@ -33258,146 +40444,20 @@
 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
 +   { (exit 1); exit 1; }; };;
    esac
- done
++done
  
--ac_given_srcdir=$srcdir
--ac_given_INSTALL="$INSTALL"
--
--trap 'rm -fr `echo "
--Makefile
--doc/Makefile
--include/Makefile
--src/Makefile
--src/expat/Makefile
--src/draw/Makefile
--src/font/Makefile
--src/themes/Makefile
--src/core/Makefile
--src/widgets/Makefile
--data/Makefile
--bindings/Makefile
--bindings/python/Makefile
--bindings/ruby/Makefile
--test/Makefile
--test/fireworks/Makefile
--test/colorselector/Makefile
--test/keyboard/Makefile
--sdk/Makefile
--paragui.spec
--paragui-config
--paragui.pc
-- include/paraconfig_gnu.h:include/paraconfig_gnu.h.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
--EOF
--cat >> $CONFIG_STATUS <<EOF
+-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
+-  sed -e "$ac_comsub
+-s%@configure_input@%$configure_input%g
+-s%@srcdir@%$srcdir%g
+-s%@top_srcdir@%$top_srcdir%g
+-s%@INSTALL@%$INSTALL%g
+-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
+-fi; done
+-rm -f conftest.s*
  
--# Protect against being on the right side of a sed subst in config.status.
--sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
-- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
--$ac_vpsub
--$extrasub
--s%@SHELL@%$SHELL%g
--s%@CFLAGS@%$CFLAGS%g
--s%@CPPFLAGS@%$CPPFLAGS%g
--s%@CXXFLAGS@%$CXXFLAGS%g
--s%@FFLAGS@%$FFLAGS%g
--s%@DEFS@%$DEFS%g
--s%@LDFLAGS@%$LDFLAGS%g
--s%@LIBS@%$LIBS%g
--s%@exec_prefix@%$exec_prefix%g
--s%@prefix@%$prefix%g
--s%@program_transform_name@%$program_transform_name%g
--s%@bindir@%$bindir%g
--s%@sbindir@%$sbindir%g
--s%@libexecdir@%$libexecdir%g
--s%@datadir@%$datadir%g
--s%@sysconfdir@%$sysconfdir%g
--s%@sharedstatedir@%$sharedstatedir%g
--s%@localstatedir@%$localstatedir%g
--s%@libdir@%$libdir%g
--s%@includedir@%$includedir%g
--s%@oldincludedir@%$oldincludedir%g
--s%@infodir@%$infodir%g
--s%@mandir@%$mandir%g
--s%@TOP_BUILDDIR@%$TOP_BUILDDIR%g
--s%@PARAGUI_MAJOR_VERSION@%$PARAGUI_MAJOR_VERSION%g
--s%@PARAGUI_MINOR_VERSION@%$PARAGUI_MINOR_VERSION%g
--s%@PARAGUI_MICRO_VERSION@%$PARAGUI_MICRO_VERSION%g
--s%@PARAGUI_INTERFACE_AGE@%$PARAGUI_INTERFACE_AGE%g
--s%@PARAGUI_BINARY_AGE@%$PARAGUI_BINARY_AGE%g
--s%@PARAGUI_VERSION@%$PARAGUI_VERSION%g
--s%@LT_RELEASE@%$LT_RELEASE%g
--s%@LT_CURRENT@%$LT_CURRENT%g
--s%@LT_REVISION@%$LT_REVISION%g
--s%@LT_AGE@%$LT_AGE%g
--s%@host@%$host%g
--s%@host_alias@%$host_alias%g
--s%@host_cpu@%$host_cpu%g
--s%@host_vendor@%$host_vendor%g
--s%@host_os@%$host_os%g
--s%@target@%$target%g
--s%@target_alias@%$target_alias%g
--s%@target_cpu@%$target_cpu%g
--s%@target_vendor@%$target_vendor%g
--s%@target_os@%$target_os%g
--s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
--s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
--s%@INSTALL_DATA@%$INSTALL_DATA%g
--s%@PACKAGE@%$PACKAGE%g
--s%@VERSION@%$VERSION%g
--s%@ACLOCAL@%$ACLOCAL%g
--s%@AUTOCONF@%$AUTOCONF%g
--s%@AUTOMAKE@%$AUTOMAKE%g
--s%@AUTOHEADER@%$AUTOHEADER%g
--s%@MAKEINFO@%$MAKEINFO%g
--s%@SET_MAKE@%$SET_MAKE%g
--s%@build@%$build%g
--s%@build_alias@%$build_alias%g
--s%@build_cpu@%$build_cpu%g
--s%@build_vendor@%$build_vendor%g
--s%@build_os@%$build_os%g
--s%@CC@%$CC%g
--s%@LN_S@%$LN_S%g
--s%@OBJEXT@%$OBJEXT%g
--s%@EXEEXT@%$EXEEXT%g
--s%@ECHO@%$ECHO%g
--s%@RANLIB@%$RANLIB%g
--s%@STRIP@%$STRIP%g
--s%@DLLTOOL@%$DLLTOOL%g
--s%@AS@%$AS%g
--s%@OBJDUMP@%$OBJDUMP%g
--s%@CPP@%$CPP%g
--s%@LIBTOOL@%$LIBTOOL%g
--s%@CXX@%$CXX%g
--s%@LIBSTDCPP@%$LIBSTDCPP%g
--s%@SDL_CONFIG@%$SDL_CONFIG%g
--s%@SDL_CFLAGS@%$SDL_CFLAGS%g
--s%@SDL_LIBS@%$SDL_LIBS%g
--s%@SDL_PREFIX@%$SDL_PREFIX%g
--s%@freetype_config@%$freetype_config%g
--s%@EXPAT_INCLUDE@%$EXPAT_INCLUDE%g
--s%@EXPAT_LIB@%$EXPAT_LIB%g
--s%@EXPAT_SUBDIR@%$EXPAT_SUBDIR%g
--s%@LIBEXPAT@%$LIBEXPAT%g
--s%@subdirs@%$subdirs%g
--s%@PHYSFS_INCLUDE@%$PHYSFS_INCLUDE%g
--s%@PHYSFS_LIB@%$PHYSFS_LIB%g
--s%@PHYSFS_SUBDIR@%$PHYSFS_SUBDIR%g
--s%@LIBPHYSFS@%$LIBPHYSFS%g
--s%@CXXCPP@%$CXXCPP%g
--s%@SWIG@%$SWIG%g
--s%@PYTHON@%$PYTHON%g
--s%@PYTHON_INCLUDE_DIR@%$PYTHON_INCLUDE_DIR%g
--s%@PYTHON_LIB_DIR@%$PYTHON_LIB_DIR%g
--s%@RUBY@%$RUBY%g
--s%@RUBY_INCLUDE_DIR@%$RUBY_INCLUDE_DIR%g
--s%@RUBY_INSTALL_DIR@%$RUBY_INSTALL_DIR%g
--s%@BINDINGS@%$BINDINGS%g
--s%@IMAGE_LIBS@%$IMAGE_LIBS%g
--s%@IMAGE_INCLUDE@%$IMAGE_INCLUDE%g
--s%@SYSTEM_LIBS@%$SYSTEM_LIBS%g
--s%@PARAGUI_CFLAGS@%$PARAGUI_CFLAGS%g
--s%@PARAGUI_LIBS@%$PARAGUI_LIBS%g
--s%@RPM_ROOT@%$RPM_ROOT%g
+-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
+-# NAME is the cpp macro being defined and VALUE is the value it is being given.
 +# If the user did not use the arguments to specify the items to instantiate,
 +# then the envvar interface is used.  Set only those that are not.
 +# We use the long form for the default assignment because of an extremely
@@ -33423,9 +40483,7 @@
 +  trap '{ (exit 1); exit 1; }' 1 2 13 15
 +}
 +# Create a (secure) tmp directory for tmp files.
- 
--CEOF
--EOF
++
 +{
 +  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
 +  test -n "$tmp" && test -d "$tmp"
@@ -33441,8 +40499,29 @@
 +
 +#
 +# Set up the sed scripts for CONFIG_FILES section.
-+#
-+
+ #
+-# ac_d sets the value in "#define NAME VALUE" lines.
+-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
+-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
+-ac_dC='\3'
+-ac_dD='%g'
+-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
+-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+-ac_uB='\([ 	]\)%\1#\2define\3'
+-ac_uC=' '
+-ac_uD='\4%g'
+-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
+-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
+-ac_eB='$%\1#\2define\3'
+-ac_eC=' '
+-ac_eD='%g'
+ 
+-if test "${CONFIG_HEADERS+set}" != set; then
+-EOF
+-cat >> $CONFIG_STATUS <<EOF
+-  CONFIG_HEADERS="include/paraconfig_gnu.h:include/paraconfig_gnu.h.in"
+-EOF
+-cat >> $CONFIG_STATUS <<\EOF
 +# No need to generate the scripts if there are no CONFIG_FILES.
 +# This happens for instance when ./config.status config.h
 +if test -n "$CONFIG_FILES"; then
@@ -33552,8 +40631,7 @@
 +AMDEP_FALSE!$AMDEP_FALSE$ac_delim
 +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
 +_ACEOF
- 
--cat >> $CONFIG_STATUS <<\EOF
++
 +  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
 +    break
 +  elif $ac_last_try; then
@@ -33564,29 +40642,18 @@
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
 +  fi
 +done
- 
--# Split the substitutions into bite-sized pieces for seds with
--# small command number limits, like on Digital OSF/1 and HP-UX.
--ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
--ac_file=1 # Number of current file.
--ac_beg=1 # First line for current file.
--ac_end=$ac_max_sed_cmds # Line after last line for current file.
--ac_more_lines=:
--ac_sed_cmds=""
--while $ac_more_lines; do
--  if test $ac_beg -gt 1; then
--    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
--  else
--    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
--  fi
--  if test ! -s conftest.s$ac_file; then
--    ac_more_lines=false
--    rm -f conftest.s$ac_file
++
 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
 +if test -n "$ac_eof"; then
 +  ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
 +  ac_eof=`expr $ac_eof + 1`
-+fi
+ fi
+-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
+-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
+-  case "$ac_file" in
+-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
+-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
+-  *) ac_file_in="${ac_file}.in" ;;
 +
 +cat >>$CONFIG_STATUS <<_ACEOF
 +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
@@ -33613,6 +40680,7 @@
 +CCDEPMODE!$CCDEPMODE$ac_delim
 +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
 +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
++SED!$SED$ac_delim
 +GREP!$GREP$ac_delim
 +EGREP!$EGREP$ac_delim
 +LN_S!$LN_S$ac_delim
@@ -33667,26 +40735,16 @@
 +LTLIBOBJS!$LTLIBOBJS$ac_delim
 +_ACEOF
 +
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 56; then
 +    break
 +  elif $ac_last_try; then
 +    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 +   { (exit 1); exit 1; }; }
-   else
--    if test -z "$ac_sed_cmds"; then
--      ac_sed_cmds="sed -f conftest.s$ac_file"
--    else
--      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
--    fi
--    ac_file=`expr $ac_file + 1`
--    ac_beg=$ac_end
--    ac_end=`expr $ac_end + $ac_max_sed_cmds`
++  else
 +    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
- done
--if test -z "$ac_sed_cmds"; then
--  ac_sed_cmds=cat
++  fi
++done
 +
 +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
 +if test -n "$ac_eof"; then
@@ -33728,131 +40786,17 @@
 +s/:*$//
 +s/^[^=]*=[	 ]*$//
 +}'
- fi
--EOF
- 
--cat >> $CONFIG_STATUS <<EOF
++fi
++
 +cat >>$CONFIG_STATUS <<\_ACEOF
 +fi # test -n "$CONFIG_FILES"
- 
--CONFIG_FILES=\${CONFIG_FILES-"Makefile
--doc/Makefile
--include/Makefile
--src/Makefile
--src/expat/Makefile
--src/draw/Makefile
--src/font/Makefile
--src/themes/Makefile
--src/core/Makefile
--src/widgets/Makefile
--data/Makefile
--bindings/Makefile
--bindings/python/Makefile
--bindings/ruby/Makefile
--test/Makefile
--test/fireworks/Makefile
--test/colorselector/Makefile
--test/keyboard/Makefile
--sdk/Makefile
--paragui.spec
--paragui-config
--paragui.pc
--"}
--EOF
--cat >> $CONFIG_STATUS <<\EOF
--for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case "$ac_file" in
--  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
--       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
--  *) ac_file_in="${ac_file}.in" ;;
--  esac
--
--  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
--
--  # Remove last slash and all that follows it.  Not all systems have dirname.
--  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
--  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
--    # The file is in a subdirectory.
--    test ! -d "$ac_dir" && mkdir "$ac_dir"
--    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
--    # A "../" for each directory in $ac_dir_suffix.
--    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
--  else
--    ac_dir_suffix= ac_dots=
--  fi
--
--  case "$ac_given_srcdir" in
--  .)  srcdir=.
--      if test -z "$ac_dots"; then top_srcdir=.
--      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
--  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
--  *) # Relative path.
--    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
--    top_srcdir="$ac_dots$ac_given_srcdir" ;;
--  esac
--
--  case "$ac_given_INSTALL" in
--  [/$]*) INSTALL="$ac_given_INSTALL" ;;
--  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--  esac
--
--  echo creating "$ac_file"
--  rm -f "$ac_file"
--  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
--  case "$ac_file" in
--  *Makefile*) ac_comsub="1i\\
--# $configure_input" ;;
--  *) ac_comsub= ;;
--  esac
--
--  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
--  sed -e "$ac_comsub
--s%@configure_input@%$configure_input%g
--s%@srcdir@%$srcdir%g
--s%@top_srcdir@%$top_srcdir%g
--s%@INSTALL@%$INSTALL%g
--" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
--fi; done
--rm -f conftest.s*
--
--# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
--# NAME is the cpp macro being defined and VALUE is the value it is being given.
--#
--# ac_d sets the value in "#define NAME VALUE" lines.
--ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
--ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
--ac_dC='\3'
--ac_dD='%g'
--# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
--ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
--ac_uB='\([ 	]\)%\1#\2define\3'
--ac_uC=' '
--ac_uD='\4%g'
--# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
--ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
--ac_eB='$%\1#\2define\3'
--ac_eC=' '
--ac_eD='%g'
- 
--if test "${CONFIG_HEADERS+set}" != set; then
--EOF
--cat >> $CONFIG_STATUS <<EOF
--  CONFIG_HEADERS="include/paraconfig_gnu.h:include/paraconfig_gnu.h.in"
--EOF
--cat >> $CONFIG_STATUS <<\EOF
--fi
--for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
--  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
--  case "$ac_file" in
--  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
--       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
--  *) ac_file_in="${ac_file}.in" ;;
++
++
 +for ac_tag in  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS
 +do
 +  case $ac_tag in
 +  :[FHLC]) ac_mode=$ac_tag; continue;;
-   esac
++  esac
 +  case $ac_mode$ac_tag in
 +  :[FHL]*:*);;
 +  :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
@@ -33860,7 +40804,7 @@
 +   { (exit 1); exit 1; }; };;
 +  :[FH]-) ac_tag=-:-;;
 +  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+  esac
+   esac
 +  ac_save_IFS=$IFS
 +  IFS=:
 +  set x $ac_tag
@@ -33993,7 +40937,8 @@
 +echo "$as_me: error: cannot create directory $as_dir" >&2;}
 +   { (exit 1); exit 1; }; }; }
 +  ac_builddir=.
-+
+ 
+-# This sed command replaces #undef with comments.  This is necessary, for
 +case "$ac_dir" in
 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +*)
@@ -34095,6 +41040,7 @@
 +
 +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
 +  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
++  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
 +  { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 +which seems to be undefined.  Please make sure it is defined." >&5
 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
@@ -34111,8 +41057,7 @@
 +  # CONFIG_HEADER
 +  #
 +_ACEOF
- 
--# This sed command replaces #undef with comments.  This is necessary, for
++
 +# Transform confdefs.h into a sed script `conftest.defines', that
 +# substitutes the proper values into config.h.in to produce config.h.
 +rm -f conftest.defines conftest.tail
@@ -34156,7 +41101,9 @@
 +# (The regexp can be short, since the line contains either #define or #undef.)
 +echo 's/ $//
 +s,^[	 #]*u.*,/* & */,' >>conftest.defines
-+
+ 
+-# Break up conftest.vals because some shells have a limit on
+-# the size of here documents, and old seds have small limits too.
 +# Break up conftest.defines:
 +ac_max_sed_lines=50
 +
@@ -34168,9 +41115,6 @@
 +ac_out='"$tmp/out1"'
 +ac_nxt='"$tmp/out2"'
  
--# Break up conftest.vals because some shells have a limit on
--# the size of here documents, and old seds have small limits too.
--
 -rm -f conftest.tail
  while :
  do
@@ -34198,9 +41142,16 @@
 -  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
 -  rm -f conftest.vals
 -  mv conftest.tail conftest.vals
--done
++    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
++  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
++  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
++  grep . conftest.tail >/dev/null || break
++  rm -f conftest.defines
++  mv conftest.tail conftest.defines
+ done
 -rm -f conftest.vals
--
++rm -f conftest.defines conftest.tail
+ 
 -cat >> $CONFIG_STATUS <<\EOF
 -  rm -f conftest.frag conftest.h
 -  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
@@ -34215,15 +41166,6 @@
 -      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
 -      # The file is in a subdirectory.
 -      test ! -d "$ac_dir" && mkdir "$ac_dir"
-+    sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS
-+  ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in
-+  sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail
-+  grep . conftest.tail >/dev/null || break
-+  rm -f conftest.defines
-+  mv conftest.tail conftest.defines
-+done
-+rm -f conftest.defines conftest.tail
-+
 +echo "ac_result=$ac_in" >>$CONFIG_STATUS
 +cat >>$CONFIG_STATUS <<\_ACEOF
 +  if test x"$ac_file" != x-; then
@@ -34430,7 +41372,7 @@
 -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 +ac_clean_files=$ac_clean_files_save
 +
- 
++
 +# configure is writing to config.log, and then calls config.status.
 +# config.status does its own redirection, appending to config.log.
 +# Unfortunately, on DOS this fails, as config.log is still kept open
@@ -34451,7 +41393,7 @@
 +  # would make configure fail if this is the last instruction.
 +  $ac_cs_success || { (exit 1); exit 1; }
 +fi
-+
+ 
 +#
 +# CONFIG_SUBDIRS section.
 +#
@@ -34505,8 +41447,13 @@
 +  case $ac_arg in
 +  *\'*) ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
 +  esac
-+  ac_sub_configure_args="$ac_arg $ac_sub_configure_args"
++  ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args"
 +
++  # Pass --silent
++  if test "$silent" = yes; then
++    ac_sub_configure_args="--silent $ac_sub_configure_args"
++  fi
++
 +  ac_popdir=`pwd`
 +  for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue
  
@@ -34515,19 +41462,9 @@
 -    if test ! -d $srcdir/$ac_config_dir; then
 -      continue
 -    fi
--
--    echo configuring in $ac_config_dir
 +    test -d "$srcdir/$ac_dir" || continue
  
--    case "$srcdir" in
--    .) ;;
--    *)
--      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
--      else
--        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
--      fi
--      ;;
--    esac
+-    echo configuring in $ac_config_dir
 +    ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)"
 +    echo "$as_me:$LINENO: $ac_msg" >&5
 +    echo "$ac_msg" >&6
@@ -34574,8 +41511,15 @@
 +   { (exit 1); exit 1; }; }; }
 +    ac_builddir=.
  
--    ac_popdir=`pwd`
--    cd $ac_config_dir
+-    case "$srcdir" in
+-    .) ;;
+-    *)
+-      if test -d ./$ac_config_dir || mkdir ./$ac_config_dir; then :;
+-      else
+-        { echo "configure: error: can not create `pwd`/$ac_config_dir" 1>&2; exit 1; }
+-      fi
+-      ;;
+-    esac
 +case "$ac_dir" in
 +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 +*)
@@ -34591,7 +41535,9 @@
 +ac_abs_builddir=$ac_pwd$ac_dir_suffix
 +# for backward compatibility:
 +ac_top_builddir=$ac_top_build_prefix
-+
+ 
+-    ac_popdir=`pwd`
+-    cd $ac_config_dir
 +case $srcdir in
 +  .)  # We are building in place.
 +    ac_srcdir=.
@@ -34648,16 +41594,15 @@
 -      /*) ac_sub_cache_file=$cache_file ;;
 -      *) # Relative path.
 -        ac_sub_cache_file="$ac_dots$cache_file" ;;
--      esac
--  case "$ac_given_INSTALL" in
--        [/$]*) INSTALL="$ac_given_INSTALL" ;;
--        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
--        esac
 +      case $cache_file in
 +      [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;;
 +      *) # Relative name.
 +	ac_sub_cache_file=$ac_top_build_prefix$cache_file ;;
-+      esac
+       esac
+-  case "$ac_given_INSTALL" in
+-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
+-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
+-        esac
  
 -      echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
 +      { echo "$as_me:$LINENO: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5
@@ -34680,10 +41625,9 @@
    done
  fi
  
-Index: libparagui1.0-1.0.4/data/Makefile.in
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/data/Makefile.in libparagui1.0-1.0.4/data/Makefile.in
 --- libparagui1.0-1.0.4.orig/data/Makefile.in	2003-07-07 11:06:17.000000000 +0200
-+++ libparagui1.0-1.0.4/data/Makefile.in	2006-06-15 22:26:29.000000000 +0200
++++ libparagui1.0-1.0.4/data/Makefile.in	2007-12-21 23:59:16.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -34856,10 +41800,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,143 +149,253 @@
+@@ -110,143 +149,256 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -34945,15 +41890,7 @@
 -DIST_COMMON =  Makefile.am Makefile.in
 +all: all-am
  
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
--TAR = gtar
--GZIP_ENV = --best
--all: all-redirect
- .SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps data/Makefile
++.SUFFIXES:
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -34963,9 +41900,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  data/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  data/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  data/Makefile
++	  $(AUTOMAKE) --gnu  data/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -34975,10 +41912,17 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-TAR = gtar
+-GZIP_ENV = --best
+-all: all-redirect
+-.SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps data/Makefile
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -35121,6 +42065,8 @@
 +clean-am: clean-generic clean-libtool mostlyclean-am
  
 -mostlyclean: mostlyclean-am
++distclean: distclean-am
++	-rm -f Makefile
 +distclean-am: clean-am distclean-generic distclean-libtool
  
 -clean-am:  clean-generic mostlyclean-am
@@ -35154,10 +42100,6 @@
  maintainer-clean: maintainer-clean-am
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
  
 -.PHONY: uninstall-paraguidataDATA install-paraguidataDATA tags distdir \
 -info-am info dvi-am dvi check check-am installcheck-am installcheck \
@@ -35165,6 +42107,10 @@
 -install uninstall-am uninstall all-redirect all-am all installdirs \
 -mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
 +pdf: pdf-am
 +
 +pdf-am:
@@ -35188,18 +42134,553 @@
  
  
  default.zip:
-@@ -274,7 +423,6 @@
- clean:
+@@ -272,9 +424,6 @@
+ #	qnx.zip
  
- distclean: clean
+ clean:
 -
+-distclean: clean
+-
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/doc/Makefile.in
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/depcomp libparagui1.0-1.0.4/depcomp
+--- libparagui1.0-1.0.4.orig/depcomp	1970-01-01 01:00:00.000000000 +0100
++++ libparagui1.0-1.0.4/depcomp	2007-12-21 23:58:30.000000000 +0100
+@@ -0,0 +1,530 @@
++#! /bin/sh
++# depcomp - compile a program generating dependencies as side-effects
++
++scriptversion=2005-07-09.11
++
++# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++
++# This program is free software; you can redistribute it and/or modify
++# it under the terms of the GNU General Public License as published by
++# 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., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, USA.
++
++# As a special exception to the GNU General Public License, if you
++# distribute this file as part of a program that contains a
++# configuration script generated by Autoconf, you may include it under
++# the same distribution terms that you use for the rest of that program.
++
++# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
++
++case $1 in
++  '')
++     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
++     exit 1;
++     ;;
++  -h | --h*)
++    cat <<\EOF
++Usage: depcomp [--help] [--version] PROGRAM [ARGS]
++
++Run PROGRAMS ARGS to compile a file, generating dependencies
++as side-effects.
++
++Environment variables:
++  depmode     Dependency tracking mode.
++  source      Source file read by `PROGRAMS ARGS'.
++  object      Object file output by `PROGRAMS ARGS'.
++  DEPDIR      directory where to store dependencies.
++  depfile     Dependency file to output.
++  tmpdepfile  Temporary file to use when outputing dependencies.
++  libtool     Whether libtool is used (yes/no).
++
++Report bugs to <bug-automake at gnu.org>.
++EOF
++    exit $?
++    ;;
++  -v | --v*)
++    echo "depcomp $scriptversion"
++    exit $?
++    ;;
++esac
++
++if test -z "$depmode" || test -z "$source" || test -z "$object"; then
++  echo "depcomp: Variables source, object and depmode must be set" 1>&2
++  exit 1
++fi
++
++# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
++depfile=${depfile-`echo "$object" |
++  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
++tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
++
++rm -f "$tmpdepfile"
++
++# Some modes work just like other modes, but use different flags.  We
++# parameterize here, but still list the modes in the big case below,
++# to make depend.m4 easier to write.  Note that we *cannot* use a case
++# here, because this file can only contain one case statement.
++if test "$depmode" = hp; then
++  # HP compiler uses -M and no extra arg.
++  gccflag=-M
++  depmode=gcc
++fi
++
++if test "$depmode" = dashXmstdout; then
++   # This is just like dashmstdout with a different argument.
++   dashmflag=-xM
++   depmode=dashmstdout
++fi
++
++case "$depmode" in
++gcc3)
++## gcc 3 implements dependency tracking that does exactly what
++## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
++## it if -MD -MP comes after the -MF stuff.  Hmm.
++  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  mv "$tmpdepfile" "$depfile"
++  ;;
++
++gcc)
++## There are various ways to get dependency output from gcc.  Here's
++## why we pick this rather obscure method:
++## - Don't want to use -MD because we'd like the dependencies to end
++##   up in a subdir.  Having to rename by hand is ugly.
++##   (We might end up doing this anyway to support other compilers.)
++## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
++##   -MM, not -M (despite what the docs say).
++## - Using -M directly means running the compiler twice (even worse
++##   than renaming).
++  if test -z "$gccflag"; then
++    gccflag=-MD,
++  fi
++  "$@" -Wp,"$gccflag$tmpdepfile"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
++## The second -e expression handles DOS-style file names with drive letters.
++  sed -e 's/^[^:]*: / /' \
++      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
++## This next piece of magic avoids the `deleted header file' problem.
++## The problem is that when a header file which appears in a .P file
++## is deleted, the dependency causes make to die (because there is
++## typically no way to rebuild the header).  We avoid this by adding
++## dummy dependencies for each header file.  Too bad gcc doesn't do
++## this for us directly.
++  tr ' ' '
++' < "$tmpdepfile" |
++## Some versions of gcc put a space before the `:'.  On the theory
++## that the space means something, we add a space to the output as
++## well.
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++hp)
++  # This case exists only to let depend.m4 do its work.  It works by
++  # looking at the text of this script.  This case will never be run,
++  # since it is checked for above.
++  exit 1
++  ;;
++
++sgi)
++  if test "$libtool" = yes; then
++    "$@" "-Wp,-MDupdate,$tmpdepfile"
++  else
++    "$@" -MDupdate "$tmpdepfile"
++  fi
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  rm -f "$depfile"
++
++  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
++    echo "$object : \\" > "$depfile"
++
++    # Clip off the initial element (the dependent).  Don't try to be
++    # clever and replace this with sed code, as IRIX sed won't handle
++    # lines with more than a fixed number of characters (4096 in
++    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
++    # the IRIX cc adds comments like `#:fec' to the end of the
++    # dependency line.
++    tr ' ' '
++' < "$tmpdepfile" \
++    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
++    tr '
++' ' ' >> $depfile
++    echo >> $depfile
++
++    # The second pass generates a dummy entry for each header file.
++    tr ' ' '
++' < "$tmpdepfile" \
++   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
++   >> $depfile
++  else
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
++  fi
++  rm -f "$tmpdepfile"
++  ;;
++
++aix)
++  # The C for AIX Compiler uses -M and outputs the dependencies
++  # in a .u file.  In older versions, this file always lives in the
++  # current directory.  Also, the AIX compiler puts `$object:' at the
++  # start of each line; $object doesn't have directory information.
++  # Version 6 uses the directory in both cases.
++  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
++  tmpdepfile="$stripped.u"
++  if test "$libtool" = yes; then
++    "$@" -Wc,-M
++  else
++    "$@" -M
++  fi
++  stat=$?
++
++  if test -f "$tmpdepfile"; then :
++  else
++    stripped=`echo "$stripped" | sed 's,^.*/,,'`
++    tmpdepfile="$stripped.u"
++  fi
++
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++
++  if test -f "$tmpdepfile"; then
++    outname="$stripped.o"
++    # Each line is of the form `foo.o: dependent.h'.
++    # Do two passes, one to just change these to
++    # `$object: dependent.h' and one to simply `dependent.h:'.
++    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
++    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
++  else
++    # The sourcefile does not contain any dependencies, so just
++    # store a dummy comment line, to avoid errors with the Makefile
++    # "include basename.Plo" scheme.
++    echo "#dummy" > "$depfile"
++  fi
++  rm -f "$tmpdepfile"
++  ;;
++
++icc)
++  # Intel's C compiler understands `-MD -MF file'.  However on
++  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
++  # ICC 7.0 will fill foo.d with something like
++  #    foo.o: sub/foo.c
++  #    foo.o: sub/foo.h
++  # which is wrong.  We want:
++  #    sub/foo.o: sub/foo.c
++  #    sub/foo.o: sub/foo.h
++  #    sub/foo.c:
++  #    sub/foo.h:
++  # ICC 7.1 will output
++  #    foo.o: sub/foo.c sub/foo.h
++  # and will wrap long lines using \ :
++  #    foo.o: sub/foo.c ... \
++  #     sub/foo.h ... \
++  #     ...
++
++  "$@" -MD -MF "$tmpdepfile"
++  stat=$?
++  if test $stat -eq 0; then :
++  else
++    rm -f "$tmpdepfile"
++    exit $stat
++  fi
++  rm -f "$depfile"
++  # Each line is of the form `foo.o: dependent.h',
++  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
++  # Do two passes, one to just change these to
++  # `$object: dependent.h' and one to simply `dependent.h:'.
++  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
++  # Some versions of the HPUX 10.20 sed can't process this invocation
++  # correctly.  Breaking it into two sed invocations is a workaround.
++  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
++    sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++tru64)
++   # The Tru64 compiler uses -MD to generate dependencies as a side
++   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
++   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
++   # dependencies in `foo.d' instead, so we check for that too.
++   # Subdirectories are respected.
++   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++   test "x$dir" = "x$object" && dir=
++   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
++
++   if test "$libtool" = yes; then
++      # With Tru64 cc, shared objects can also be used to make a
++      # static library.  This mecanism is used in libtool 1.4 series to
++      # handle both shared and static libraries in a single compilation.
++      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
++      #
++      # With libtool 1.5 this exception was removed, and libtool now
++      # generates 2 separate objects for the 2 libraries.  These two
++      # compilations output dependencies in in $dir.libs/$base.o.d and
++      # in $dir$base.o.d.  We have to check for both files, because
++      # one of the two compilations can be disabled.  We should prefer
++      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
++      # automatically cleaned when .libs/ is deleted, while ignoring
++      # the former would cause a distcleancheck panic.
++      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
++      tmpdepfile2=$dir$base.o.d          # libtool 1.5
++      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
++      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
++      "$@" -Wc,-MD
++   else
++      tmpdepfile1=$dir$base.o.d
++      tmpdepfile2=$dir$base.d
++      tmpdepfile3=$dir$base.d
++      tmpdepfile4=$dir$base.d
++      "$@" -MD
++   fi
++
++   stat=$?
++   if test $stat -eq 0; then :
++   else
++      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++      exit $stat
++   fi
++
++   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
++   do
++     test -f "$tmpdepfile" && break
++   done
++   if test -f "$tmpdepfile"; then
++      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
++      # That's a tab and a space in the [].
++      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
++   else
++      echo "#dummy" > "$depfile"
++   fi
++   rm -f "$tmpdepfile"
++   ;;
++
++#nosideeffect)
++  # This comment above is used by automake to tell side-effect
++  # dependency tracking mechanisms from slower ones.
++
++dashmstdout)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the preprocessed file to stdout, regardless of -o.
++  "$@" || exit $?
++
++  # Remove the call to Libtool.
++  if test "$libtool" = yes; then
++    while test $1 != '--mode=compile'; do
++      shift
++    done
++    shift
++  fi
++
++  # Remove `-o $object'.
++  IFS=" "
++  for arg
++  do
++    case $arg in
++    -o)
++      shift
++      ;;
++    $object)
++      shift
++      ;;
++    *)
++      set fnord "$@" "$arg"
++      shift # fnord
++      shift # $arg
++      ;;
++    esac
++  done
++
++  test -z "$dashmflag" && dashmflag=-M
++  # Require at least two characters before searching for `:'
++  # in the target name.  This is to cope with DOS-style filenames:
++  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
++  "$@" $dashmflag |
++    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
++  rm -f "$depfile"
++  cat < "$tmpdepfile" > "$depfile"
++  tr ' ' '
++' < "$tmpdepfile" | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++dashXmstdout)
++  # This case only exists to satisfy depend.m4.  It is never actually
++  # run, as this mode is specially recognized in the preamble.
++  exit 1
++  ;;
++
++makedepend)
++  "$@" || exit $?
++  # Remove any Libtool call
++  if test "$libtool" = yes; then
++    while test $1 != '--mode=compile'; do
++      shift
++    done
++    shift
++  fi
++  # X makedepend
++  shift
++  cleared=no
++  for arg in "$@"; do
++    case $cleared in
++    no)
++      set ""; shift
++      cleared=yes ;;
++    esac
++    case "$arg" in
++    -D*|-I*)
++      set fnord "$@" "$arg"; shift ;;
++    # Strip any option that makedepend may not understand.  Remove
++    # the object too, otherwise makedepend will parse it as a source file.
++    -*|$object)
++      ;;
++    *)
++      set fnord "$@" "$arg"; shift ;;
++    esac
++  done
++  obj_suffix="`echo $object | sed 's/^.*\././'`"
++  touch "$tmpdepfile"
++  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
++  rm -f "$depfile"
++  cat < "$tmpdepfile" > "$depfile"
++  sed '1,2d' "$tmpdepfile" | tr ' ' '
++' | \
++## Some versions of the HPUX 10.20 sed can't process this invocation
++## correctly.  Breaking it into two sed invocations is a workaround.
++    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile" "$tmpdepfile".bak
++  ;;
++
++cpp)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the preprocessed file to stdout.
++  "$@" || exit $?
++
++  # Remove the call to Libtool.
++  if test "$libtool" = yes; then
++    while test $1 != '--mode=compile'; do
++      shift
++    done
++    shift
++  fi
++
++  # Remove `-o $object'.
++  IFS=" "
++  for arg
++  do
++    case $arg in
++    -o)
++      shift
++      ;;
++    $object)
++      shift
++      ;;
++    *)
++      set fnord "$@" "$arg"
++      shift # fnord
++      shift # $arg
++      ;;
++    esac
++  done
++
++  "$@" -E |
++    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
++       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
++    sed '$ s: \\$::' > "$tmpdepfile"
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  cat < "$tmpdepfile" >> "$depfile"
++  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++msvisualcpp)
++  # Important note: in order to support this mode, a compiler *must*
++  # always write the preprocessed file to stdout, regardless of -o,
++  # because we must use -o when running libtool.
++  "$@" || exit $?
++  IFS=" "
++  for arg
++  do
++    case "$arg" in
++    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
++	set fnord "$@"
++	shift
++	shift
++	;;
++    *)
++	set fnord "$@" "$arg"
++	shift
++	shift
++	;;
++    esac
++  done
++  "$@" -E |
++  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
++  rm -f "$depfile"
++  echo "$object : \\" > "$depfile"
++  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
++  echo "	" >> "$depfile"
++  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
++  rm -f "$tmpdepfile"
++  ;;
++
++none)
++  exec "$@"
++  ;;
++
++*)
++  echo "Unknown depmode $depmode" 1>&2
++  exit 1
++  ;;
++esac
++
++exit 0
++
++# Local Variables:
++# mode: shell-script
++# sh-indentation: 2
++# eval: (add-hook 'write-file-hooks 'time-stamp)
++# time-stamp-start: "scriptversion="
++# time-stamp-format: "%:y-%02m-%02d.%02H"
++# time-stamp-end: "$"
++# End:
+diff -Nurd libparagui1.0-1.0.4.orig/doc/Makefile.in libparagui1.0-1.0.4/doc/Makefile.in
 --- libparagui1.0-1.0.4.orig/doc/Makefile.in	2003-07-07 11:06:26.000000000 +0200
-+++ libparagui1.0-1.0.4/doc/Makefile.in	2006-06-15 22:26:29.000000000 +0200
++++ libparagui1.0-1.0.4/doc/Makefile.in	2007-12-21 23:59:16.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -35363,10 +42844,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,114 +139,231 @@
+@@ -110,114 +139,232 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -35434,22 +42916,13 @@
 +	VisualC.html
  
 -EXTRA_DIST =  	paragui-config.sgml 	RELEASENOTES 	COPYRIGHT-FONTS.TXT 	VisualC.html
--
++all: all-am
+ 
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 -CONFIG_HEADER = ../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
 -DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+all: all-am
- 
--TAR = gtar
--GZIP_ENV = --best
--all: all-redirect
- .SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps doc/Makefile
++.SUFFIXES:
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -35459,9 +42932,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  doc/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  doc/Makefile
++	  $(AUTOMAKE) --gnu  doc/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -35471,24 +42944,31 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-TAR = gtar
+-GZIP_ENV = --best
+-all: all-redirect
+-.SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps doc/Makefile
 +mostlyclean-libtool:
 +	-rm -f *.lo
  
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 +clean-libtool:
 +	-rm -rf .libs _libs
-+
+ 
 +distclean-libtool:
 +	-rm -f libtool
 +uninstall-info-am:
@@ -35623,9 +43103,15 @@
  maintainer-clean: maintainer-clean-am
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
+ 
+-.PHONY: tags distdir info-am info dvi-am dvi check check-am \
+-installcheck-am installcheck install-exec-am install-exec \
+-install-data-am install-data install-am install uninstall-am uninstall \
+-all-redirect all-am all installdirs mostlyclean-generic \
+-distclean-generic clean-generic maintainer-clean-generic clean \
+-mostlyclean distclean maintainer-clean
 +mostlyclean: mostlyclean-am
-+
+ 
 +mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 +
 +pdf: pdf-am
@@ -35635,15 +43121,9 @@
 +ps: ps-am
 +
 +ps-am:
- 
--.PHONY: tags distdir info-am info dvi-am dvi check check-am \
--installcheck-am installcheck install-exec-am install-exec \
--install-data-am install-data install-am install uninstall-am uninstall \
--all-redirect all-am all installdirs mostlyclean-generic \
--distclean-generic clean-generic maintainer-clean-generic clean \
--mostlyclean distclean maintainer-clean
++
 +uninstall-am: uninstall-info-am
- 
++
 +.PHONY: all all-am check check-am clean clean-generic clean-libtool \
 +	distclean distclean-generic distclean-libtool distdir dvi \
 +	dvi-am html html-am info info-am install install-am \
@@ -35656,10 +43136,9 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libparagui1.0-1.0.4/include/Makefile.in
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/include/Makefile.in libparagui1.0-1.0.4/include/Makefile.in
 --- libparagui1.0-1.0.4.orig/include/Makefile.in	2003-07-07 11:06:01.000000000 +0200
-+++ libparagui1.0-1.0.4/include/Makefile.in	2006-06-15 22:26:29.000000000 +0200
++++ libparagui1.0-1.0.4/include/Makefile.in	2007-12-21 23:59:16.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -35835,10 +43314,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,197 +152,365 @@
+@@ -110,197 +152,366 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -35951,11 +43431,6 @@
 +	pgcompat.h \
 +	pgdatacontainer.h \
 +	pgtimerobject.h
-+
-+EXTRA_DIST = \
-+	paraconfig_win32.h \
-+	paraconfig_macos.h \
-+	paraconfig_gnu.h.in
  
 -libparaguiinclude_HEADERS =  	paraconfig.h 	paraconfig_gnu.h 	paragui.h 	paragui_types.h 	pgrect.h 	pgrectlist.h 	pgwidgetlist.h 	pglabel.h 	pgwidgetdnd.h 	pgwidget.h 	pgthemewidget.h 	pgmessageobject.h 	pgbutton.h 	pgapplication.h 	pgscrollbar.h 	pgwindow.h 	pglineedit.h 	pgprogressbar.h 	pgradiobutton.h 	pgcheckbutton.h 	pgslider.h 	pgtheme.h 	pglistboxbaseitem.h 	pglistboxitem.h 	pglistbox.h 	pgcolumnitem.h 	pgdropdown.h 	pgsurfacecache.h 	pgeventobject.h 	pgpopupmenu.h 	pgmessagebox.h 	pgmaskedit.h 	pgspinnerbox.h 	pgnavigator.h 	pgwidgetlistex.h 	pgrichedit.h 	pgimage.h 	pglayout.h 	pglog.h 	pgfilearchive.h 	pgfile.h 	pgfont.h 	pgcolors.h 	pgdraw.h 	pginfo.h 	pgmenubar.h 	pgcompat.h 	pgdatacontainer.h 	pgtimerobject.h
 -
@@ -35969,7 +43444,11 @@
 -
 -DIST_COMMON =  ./stamp-h.in Makefile.am Makefile.in paraconfig_gnu.h.in
 -
--
++EXTRA_DIST = \
++	paraconfig_win32.h \
++	paraconfig_macos.h \
++	paraconfig_gnu.h.in
+ 
 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +all: paraconfig_gnu.h
 +	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -35989,9 +43468,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  include/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  include/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  include/Makefile
++	  $(AUTOMAKE) --gnu  include/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -36001,20 +43480,18 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
  
--Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) \
--	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
 -paraconfig_gnu.h: stamp-h
 -	@if test ! -f $@; then \
 -		rm -f stamp-h; \
@@ -36036,9 +43513,9 @@
 -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
 -	cd $(top_srcdir) && $(AUTOHEADER)
 -	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
--
--mostlyclean-hdr:
  
+-mostlyclean-hdr:
+-
 -clean-hdr:
 +stamp-h1: $(srcdir)/paraconfig_gnu.h.in $(top_builddir)/config.status
 +	@rm -f stamp-h1
@@ -36051,11 +43528,11 @@
  distclean-hdr:
 -	-rm -f paraconfig_gnu.h
 +	-rm -f paraconfig_gnu.h stamp-h1
-+
-+mostlyclean-libtool:
-+	-rm -f *.lo
  
 -maintainer-clean-hdr:
++mostlyclean-libtool:
++	-rm -f *.lo
++
 +clean-libtool:
 +	-rm -rf .libs _libs
  
@@ -36137,12 +43614,11 @@
 -	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags paraconfig_gnu.h.in $$unique $(LISP) -o $$here/TAGS)
 -
 -mostlyclean-tags:
--
--clean-tags:
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -36288,14 +43764,6 @@
  maintainer-clean: maintainer-clean-am
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
  
 -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
 -uninstall-libparaguiincludeHEADERS install-libparaguiincludeHEADERS \
@@ -36306,6 +43774,14 @@
 -all-redirect all-am all installdirs mostlyclean-generic \
 -distclean-generic clean-generic maintainer-clean-generic clean \
 -mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
++
 +ps: ps-am
 +
 +ps-am:
@@ -36326,7 +43802,7 @@
  
  
  style_cvs:
-@@ -308,7 +518,6 @@
+@@ -308,7 +519,6 @@
  
  style_personal:
  	astyle *.h
@@ -36334,10 +43810,9 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/install-sh
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/install-sh libparagui1.0-1.0.4/install-sh
 --- libparagui1.0-1.0.4.orig/install-sh	2003-04-16 11:01:50.000000000 +0200
-+++ libparagui1.0-1.0.4/install-sh	2006-06-15 22:26:28.000000000 +0200
++++ libparagui1.0-1.0.4/install-sh	2007-12-21 23:58:30.000000000 +0100
 @@ -1,19 +1,38 @@
  #!/bin/sh
 -#
@@ -36349,7 +43824,8 @@
 +# This originates from X11R5 (mit/util/scripts/install.sh), which was
 +# later released in X11R6 (xc/config/util/install.sh) with the
 +# following copyright and license.
-+#
+ #
+-# Copyright 1991 by the Massachusetts Institute of Technology
 +# Copyright (C) 1994 X Consortium
 +#
 +# Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -36361,14 +43837,18 @@
 +#
 +# The above copyright notice and this permission notice shall be included in
 +# all copies or substantial portions of the Software.
- #
--# Copyright 1991 by the Massachusetts Institute of Technology
++#
 +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++# Except as contained in this notice, the name of the X Consortium shall not
++# be used in advertising or otherwise to promote the sale, use or other deal-
++# ings in this Software without prior written authorization from the X Consor-
++# tium.
  #
 -# Permission to use, copy, modify, distribute, and sell this software and its
 -# documentation for any purpose is hereby granted without fee, provided that
@@ -36379,12 +43859,7 @@
 -# written prior permission.  M.I.T. makes no representations about the
 -# suitability of this software for any purpose.  It is provided "as is"
 -# without express or implied warranty.
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
 +#
-+#
 +# FSF changes to this file are in the public domain.
  #
  # Calling this script install-sh is preferred over install.sh, to prevent
@@ -36437,29 +43912,59 @@
 -	    shift
 -	    shift
 -	    continue;;
--
++src=
++dst=
++dir_arg=
++dstarg=
++no_target_directory=
+ 
 -	-o) chowncmd="$chownprog $2"
 -	    shift
 -	    shift
 -	    continue;;
--
++usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
++   or: $0 [OPTION]... SRCFILES... DIRECTORY
++   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
++   or: $0 [OPTION]... -d DIRECTORIES...
+ 
 -	-g) chgrpcmd="$chgrpprog $2"
 -	    shift
 -	    shift
 -	    continue;;
--
++In the 1st form, copy SRCFILE to DSTFILE.
++In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
++In the 4th, create DIRECTORIES.
+ 
 -	-s) stripcmd="$stripprog"
 -	    shift
 -	    continue;;
--
++Options:
++-c         (ignored)
++-d         create directories instead of installing files.
++-g GROUP   $chgrpprog installed files to GROUP.
++-m MODE    $chmodprog installed files to MODE.
++-o USER    $chownprog installed files to USER.
++-s         $stripprog installed files.
++-t DIRECTORY  install into DIRECTORY.
++-T         report an error if DSTFILE is a directory.
++--help     display this help and exit.
++--version  display version info and exit.
+ 
 -	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
 -	    shift
 -	    continue;;
--
++Environment variables override the default commands:
++  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
++"
+ 
 -	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
 -	    shift
 -	    continue;;
--
++while test -n "$1"; do
++  case $1 in
++    -c) shift
++        continue;;
+ 
 -	*)  if [ x"$src" = x ]
 -	    then
 -		src=$1
@@ -36472,7 +43977,10 @@
 -	    continue;;
 -    esac
 -done
--
++    -d) dir_arg=true
++        shift
++        continue;;
+ 
 -if [ x"$src" = x ]
 -then
 -	echo "install:	no input file specified"
@@ -36480,7 +43988,11 @@
 -else
 -	true
 -fi
--
++    -g) chgrpcmd="$chgrpprog $2"
++        shift
++        shift
++        continue;;
+ 
 -if [ x"$dir_arg" != x ]; then
 -	dst=$src
 -	src=""
@@ -36492,11 +44004,16 @@
 -		instcmd=mkdir
 -	fi
 -else
--
++    --help) echo "$usage"; exit $?;;
+ 
 -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
 -# might cause directories to be created, which would be especially bad 
 -# if $src (and thus $dsttmp) contains '*'.
--
++    -m) chmodcmd="$chmodprog $2"
++        shift
++        shift
++        continue;;
+ 
 -	if [ -f $src -o -d $src ]
 -	then
 -		true
@@ -36512,10 +44029,17 @@
 -	else
 -		true
 -	fi
--
++    -o) chowncmd="$chownprog $2"
++        shift
++        shift
++        continue;;
+ 
 -# If destination is a directory, append the input filename; if your system
 -# does not like double slashes in filenames, you may need to add some logic
--
++    -s) stripcmd=$stripprog
++        shift
++        continue;;
+ 
 -	if [ -d $dst ]
 -	then
 -		dst="$dst"/`basename $src`
@@ -36523,106 +44047,26 @@
 -		true
 -	fi
 -fi
--
--## this sed command emulates the dirname command
--dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
--
--# Make sure that the destination directory exists.
--#  this part is taken from Noah Friedman's mkinstalldirs script
-+src=
-+dst=
-+dir_arg=
-+dstarg=
-+no_target_directory=
-+
-+usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+   or: $0 [OPTION]... SRCFILES... DIRECTORY
-+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+   or: $0 [OPTION]... -d DIRECTORIES...
-+
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
-+
-+Options:
-+-c         (ignored)
-+-d         create directories instead of installing files.
-+-g GROUP   $chgrpprog installed files to GROUP.
-+-m MODE    $chmodprog installed files to MODE.
-+-o USER    $chownprog installed files to USER.
-+-s         $stripprog installed files.
-+-t DIRECTORY  install into DIRECTORY.
-+-T         report an error if DSTFILE is a directory.
-+--help     display this help and exit.
-+--version  display version info and exit.
-+
-+Environment variables override the default commands:
-+  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-+"
-+
-+while test -n "$1"; do
-+  case $1 in
-+    -c) shift
-+        continue;;
-+
-+    -d) dir_arg=true
-+        shift
-+        continue;;
-+
-+    -g) chgrpcmd="$chgrpprog $2"
-+        shift
-+        shift
-+        continue;;
-+
-+    --help) echo "$usage"; exit $?;;
-+
-+    -m) chmodcmd="$chmodprog $2"
-+        shift
-+        shift
-+        continue;;
-+
-+    -o) chowncmd="$chownprog $2"
-+        shift
-+        shift
-+        continue;;
-+
-+    -s) stripcmd=$stripprog
-+        shift
-+        continue;;
- 
--# Skip lots of stat calls in the usual case.
--if [ ! -d "$dstdir" ]; then
--defaultIFS='	
--'
--IFS="${IFS-${defaultIFS}}"
--
--oIFS="${IFS}"
--# Some sh's can't handle IFS=/ for some reason.
--IFS='%'
--set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
--IFS="${oIFS}"
--
--pathcomp=''
 +    -t) dstarg=$2
 +	shift
 +	shift
 +	continue;;
  
--while [ $# -ne 0 ] ; do
--	pathcomp="${pathcomp}${1}"
+-## this sed command emulates the dirname command
+-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 +    -T) no_target_directory=true
- 	shift
++	shift
 +	continue;;
  
--	if [ ! -d "${pathcomp}" ] ;
--        then
--		$mkdirprog "${pathcomp}"
--	else
--		true
--	fi
+-# Make sure that the destination directory exists.
+-#  this part is taken from Noah Friedman's mkinstalldirs script
 +    --version) echo "$0 $scriptversion"; exit $?;;
  
--	pathcomp="${pathcomp}/"
+-# Skip lots of stat calls in the usual case.
+-if [ ! -d "$dstdir" ]; then
+-defaultIFS='	
+-'
+-IFS="${IFS-${defaultIFS}}"
 +    *)  # When -d is used, all remaining arguments are directories to create.
 +	# When -t is used, the destination is already specified.
 +	test -n "$dir_arg$dstarg" && break
@@ -36639,63 +44083,13 @@
 +	done
 +	break;;
 +  esac
- done
--fi
--
--if [ x"$dir_arg" != x ]
--then
--	$doit $instcmd $dst &&
--
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
--else
--
--# If we're going to rename the final executable, determine the name now.
--
--	if [ x"$transformarg" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		dstfile=`basename $dst $transformbasename | 
--			sed $transformarg`$transformbasename
--	fi
--
--# don't allow the sed command to completely eliminate the filename
--
--	if [ x"$dstfile" = x ] 
--	then
--		dstfile=`basename $dst`
--	else
--		true
--	fi
--
--# Make a temp file name in the proper directory.
--
--	dsttmp=$dstdir/#inst.$$#
--
--# Move or copy the file name to the temp name
++done
  
--	$doit $instcmd $src $dsttmp &&
--
--	trap "rm -f ${dsttmp}" 0 &&
--
--# and set any options; do chmod last to preserve setuid bits
--
--# If any of these fail, we abort the whole thing.  If we want to
--# ignore errors from any of these, just make sure not to ignore
--# errors from the above "$doit $instcmd $src $dsttmp" command.
--
--	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
--	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
--	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
--	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
--
--# Now rename the file to the real destination.
--
--	$doit $rmcmd -f $dstdir/$dstfile &&
--	$doit $mvcmd $dsttmp $dstdir/$dstfile 
+-oIFS="${IFS}"
+-# Some sh's can't handle IFS=/ for some reason.
+-IFS='%'
+-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
+-IFS="${oIFS}"
 +if test -z "$1"; then
 +  if test -z "$dir_arg"; then
 +    echo "$0: no input file specified." >&2
@@ -36706,18 +44100,27 @@
 +  exit 0
 +fi
  
--fi &&
+-pathcomp=''
 +for src
 +do
 +  # Protect names starting with `-'.
 +  case $src in
 +    -*) src=./$src ;;
 +  esac
-+
+ 
+-while [ $# -ne 0 ] ; do
+-	pathcomp="${pathcomp}${1}"
+-	shift
 +  if test -n "$dir_arg"; then
 +    dst=$src
 +    src=
-+
+ 
+-	if [ ! -d "${pathcomp}" ] ;
+-        then
+-		$mkdirprog "${pathcomp}"
+-	else
+-		true
+-	fi
 +    if test -d "$dst"; then
 +      mkdircmd=:
 +      chmodcmd=
@@ -36732,18 +44135,29 @@
 +      echo "$0: $src does not exist." >&2
 +      exit 1
 +    fi
-+
+ 
+-	pathcomp="${pathcomp}/"
+-done
+-fi
 +    if test -z "$dstarg"; then
 +      echo "$0: no destination specified." >&2
 +      exit 1
 +    fi
-+
+ 
+-if [ x"$dir_arg" != x ]
+-then
+-	$doit $instcmd $dst &&
 +    dst=$dstarg
 +    # Protect names starting with `-'.
 +    case $dst in
 +      -*) dst=./$dst ;;
 +    esac
  
+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else true ; fi &&
+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else true ; fi &&
+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else true ; fi &&
+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else true ; fi
+-else
 +    # If destination is a directory, append the input filename; won't work
 +    # if double slashes aren't ignored.
 +    if test -d "$dst"; then
@@ -36754,27 +44168,44 @@
 +      dst=$dst/`basename "$src"`
 +    fi
 +  fi
-+
+ 
+-# If we're going to rename the final executable, determine the name now.
 +  # This sed command emulates the dirname command.
 +  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-+
+ 
+-	if [ x"$transformarg" = x ] 
+-	then
+-		dstfile=`basename $dst`
+-	else
+-		dstfile=`basename $dst $transformbasename | 
+-			sed $transformarg`$transformbasename
+-	fi
 +  # Make sure that the destination directory exists.
-+
+ 
+-# don't allow the sed command to completely eliminate the filename
 +  # Skip lots of stat calls in the usual case.
 +  if test ! -d "$dstdir"; then
 +    defaultIFS='
 +	 '
 +    IFS="${IFS-$defaultIFS}"
-+
+ 
+-	if [ x"$dstfile" = x ] 
+-	then
+-		dstfile=`basename $dst`
+-	else
+-		true
+-	fi
 +    oIFS=$IFS
 +    # Some sh's can't handle IFS=/ for some reason.
 +    IFS='%'
 +    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
 +    shift
 +    IFS=$oIFS
-+
+ 
+-# Make a temp file name in the proper directory.
 +    pathcomp=
-+
+ 
+-	dsttmp=$dstdir/#inst.$$#
 +    while test $# -ne 0 ; do
 +      pathcomp=$pathcomp$1
 +      shift
@@ -36788,28 +44219,39 @@
 +      pathcomp=$pathcomp/
 +    done
 +  fi
-+
+ 
+-# Move or copy the file name to the temp name
 +  if test -n "$dir_arg"; then
 +    $doit $mkdircmd "$dst" \
 +      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
 +      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
 +      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
 +      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-+
+ 
+-	$doit $instcmd $src $dsttmp &&
 +  else
 +    dstfile=`basename "$dst"`
-+
+ 
+-	trap "rm -f ${dsttmp}" 0 &&
 +    # Make a couple of temp file names in the proper directory.
 +    dsttmp=$dstdir/_inst.$$_
 +    rmtmp=$dstdir/_rm.$$_
-+
+ 
+-# and set any options; do chmod last to preserve setuid bits
 +    # Trap to clean up those temp files at exit.
 +    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
 +    trap '(exit $?); exit' 1 2 13 15
-+
+ 
+-# If any of these fail, we abort the whole thing.  If we want to
+-# ignore errors from any of these, just make sure not to ignore
+-# errors from the above "$doit $instcmd $src $dsttmp" command.
 +    # Copy the file name to the temp name.
 +    $doit $cpprog "$src" "$dsttmp" &&
-+
+ 
+-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else true;fi &&
+-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else true;fi &&
+-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else true;fi &&
+-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else true;fi &&
 +    # and set any options; do chmod last to preserve setuid bits.
 +    #
 +    # If any of these fail, we abort the whole thing.  If we want to
@@ -36820,14 +44262,17 @@
 +      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
 +      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
 +      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-+
+ 
+-# Now rename the file to the real destination.
 +    # Now rename the file to the real destination.
 +    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
 +      || {
 +	   # The rename failed, perhaps because mv can't rename something else
 +	   # to itself, or perhaps because mv is so ancient that it does not
 +	   # support -f.
-+
+ 
+-	$doit $rmcmd -f $dstdir/$dstfile &&
+-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
 +	   # Now remove or move aside any old file at destination location.
 +	   # We try this two ways since rm can't unlink itself on some
 +	   # systems and the destination file might be busy for other
@@ -36845,7 +44290,8 @@
 +	       :
 +	     fi
 +	   } &&
-+
+ 
+-fi &&
 +	   # Now rename the file to the real destination.
 +	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 +	 }
@@ -36853,32 +44299,33 @@
 +  fi || { (exit 1); exit 1; }
 +done
  
--exit 0
 +# The final little trick to "correctly" pass the exit status to the exit trap.
 +{
 +  (exit 0); exit 0
 +}
-+
+ 
+-exit 0
 +# Local variables:
 +# eval: (add-hook 'write-file-hooks 'time-stamp)
 +# time-stamp-start: "scriptversion="
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-Index: libparagui1.0-1.0.4/ltmain.sh
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/ltmain.sh libparagui1.0-1.0.4/ltmain.sh
 --- libparagui1.0-1.0.4.orig/ltmain.sh	2003-06-27 10:31:51.000000000 +0200
-+++ libparagui1.0-1.0.4/ltmain.sh	2006-03-11 19:49:04.000000000 +0100
-@@ -1,7 +1,7 @@
++++ libparagui1.0-1.0.4/ltmain.sh	2007-12-21 23:58:30.000000000 +0100
+@@ -1,8 +1,8 @@
  # ltmain.sh - Provide generalized library-building support services.
  # NOTE: Changing this file will not affect anything until you rerun configure.
  #
 -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
- # Free Software Foundation, Inc.
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007  Free Software Foundation, Inc.
  # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
  #
-@@ -17,13 +17,41 @@
+ # This program is free software; you can redistribute it and/or modify
+@@ -17,13 +17,49 @@
  #
  # You should have received a copy of the GNU General Public License
  # along with this program; if not, write to the Free Software
@@ -36909,19 +44356,27 @@
 +
 +PROGRAM=ltmain.sh
 +PACKAGE=libtool
-+VERSION="1.5.22 Debian 1.5.22-4"
-+TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
++VERSION="1.5.24 Debian 1.5.24-2"
++TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
 +
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes.
-+if test -n "${ZSH_VERSION+set}" ; then
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '${1+"$@"}'='"$@"'
 +  setopt NO_GLOB_SUBST
++else
++  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
 +fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
 +
  # Check that we have a working $echo.
  if test "X$1" = X--no-reexec; then
    # Discard the --no-reexec flag, and continue.
-@@ -36,7 +64,7 @@
+@@ -36,7 +72,7 @@
    :
  else
    # Restart under the correct shell, and then maybe $echo will work.
@@ -36930,7 +44385,7 @@
  fi
  
  if test "X$1" = X--fallback-echo; then
-@@ -45,22 +73,9 @@
+@@ -45,22 +81,9 @@
    cat <<EOF
  $*
  EOF
@@ -36954,7 +44409,7 @@
  default_mode=
  help="Try \`$progname --help' for more information."
  magic="%%%MAGIC variable%%%"
-@@ -72,17 +87,18 @@
+@@ -72,37 +95,42 @@
  # metacharacters that are still active within double-quoted strings.
  Xsed="${SED}"' -e 1s/^X//'
  sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
@@ -36984,8 +44439,23 @@
  
  # NLS nuisances.
  # Only set LANG and LC_ALL to C if already set.
-@@ -97,12 +113,14 @@
- fi
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+-if test "${LC_ALL+set}" = set; then
+-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+-  save_LANG="$LANG"; LANG=C; export LANG
+-fi
++for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++  eval "if test \"\${$lt_var+set}\" = set; then
++	  save_$lt_var=\$$lt_var
++	  $lt_var=C
++	  export $lt_var
++	fi"
++done
  
  # Make sure IFS has a sensible default
 -: ${IFS=" 	"}
@@ -37003,7 +44473,7 @@
  fi
  
  # Global variables.
-@@ -114,11 +132,268 @@
+@@ -114,11 +142,286 @@
  show="$echo"
  show_help=
  execute_dlfiles=
@@ -37011,7 +44481,9 @@
 +preserve_args=
  lo2o="s/\\.lo\$/.${objext}/"
  o2lo="s/\\.${objext}\$/.lo/"
- 
++extracted_archives=
++extracted_serial=0
++
 +#####################################
 +# Shell function definitions:
 +# This seems to be the best place for them
@@ -37071,7 +44543,13 @@
 +    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
 +      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
 +      win32_nmres=`eval $NM -f posix -A $1 | \
-+	$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
++	$SED -n -e '1,100{
++		/ I /{
++			s,.*,import,
++			p
++			q
++			}
++		}'`
 +      case $win32_nmres in
 +      import*)  win32_libid_type="x86 archive import";;
 +      *)        win32_libid_type="x86 archive static";;
@@ -37202,7 +44680,17 @@
 +	*) my_xabs=`pwd`"/$my_xlib" ;;
 +      esac
 +      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-+      my_xdir="$my_gentop/$my_xlib"
++      my_xlib_u=$my_xlib
++      while :; do
++        case " $extracted_archives " in
++	*" $my_xlib_u "*)
++	  extracted_serial=`expr $extracted_serial + 1`
++	  my_xlib_u=lt$extracted_serial-$my_xlib ;;
++	*) break ;;
++	esac
++      done
++      extracted_archives="$extracted_archives $my_xlib_u"
++      my_xdir="$my_gentop/$my_xlib_u"
 +
 +      $show "${rm}r $my_xdir"
 +      $run ${rm}r "$my_xdir"
@@ -37266,14 +44754,14 @@
 +eval std_shrext=\"$shrext_cmds\"
 +
 +disable_libs=no
-+
+ 
  # Parse our command line options once, thoroughly.
 -while test $# -gt 0
 +while test "$#" -gt 0
  do
    arg="$1"
    shift
-@@ -134,6 +409,34 @@
+@@ -134,6 +437,34 @@
      execute_dlfiles)
        execute_dlfiles="$execute_dlfiles $arg"
        ;;
@@ -37308,17 +44796,18 @@
      *)
        eval "$prev=\$arg"
        ;;
-@@ -151,18 +454,27 @@
+@@ -151,18 +482,28 @@
      ;;
  
    --version)
 -    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
 -    exit 0
-+    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-+    $echo
-+    $echo "Copyright (C) 2005  Free Software Foundation, Inc."
-+    $echo "This is free software; see the source for copying conditions.  There is NO"
-+    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++    echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2007  Free Software Foundation, Inc.
++This is free software; see the source for copying conditions.  There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
 +    exit $?
      ;;
  
@@ -37341,7 +44830,7 @@
      ;;
  
    --dry-run | -n)
-@@ -170,18 +482,18 @@
+@@ -170,18 +511,18 @@
      ;;
  
    --features)
@@ -37366,7 +44855,7 @@
      ;;
  
    --finish) mode="finish" ;;
-@@ -193,6 +505,19 @@
+@@ -193,6 +534,19 @@
  
    --quiet | --silent)
      show=:
@@ -37386,7 +44875,7 @@
      ;;
  
    -dlopen)
-@@ -203,7 +528,7 @@
+@@ -203,7 +557,7 @@
    -*)
      $echo "$modename: unrecognized option \`$arg'" 1>&2
      $echo "$help" 1>&2
@@ -37395,7 +44884,7 @@
      ;;
  
    *)
-@@ -216,19 +541,20 @@
+@@ -216,19 +570,20 @@
  if test -n "$prevopt"; then
    $echo "$modename: option \`$prevopt' requires an argument" 1>&2
    $echo "$help" 1>&2
@@ -37427,7 +44916,7 @@
  
  # If this variable is set in any of the actions, the command in it
  # will be execed at the end.  This prevents here-documents from being
-@@ -239,8 +565,10 @@
+@@ -239,8 +594,10 @@
  
    # Infer the operation mode.
    if test -z "$mode"; then
@@ -37439,7 +44928,7 @@
        mode=link
        for arg
        do
-@@ -281,7 +609,7 @@
+@@ -281,7 +638,7 @@
    if test -n "$execute_dlfiles" && test "$mode" != execute; then
      $echo "$modename: unrecognized option \`-dlopen'" 1>&2
      $echo "$help" 1>&2
@@ -37448,7 +44937,7 @@
    fi
  
    # Change the help message to a mode-specific one.
-@@ -295,158 +623,127 @@
+@@ -295,158 +652,127 @@
      modename="$modename: compile"
      # Get the compilation command and the source file.
      base_compile=
@@ -37480,17 +44969,26 @@
 -	  arg="\"$arg\""
 -	  ;;
 -	esac
--
++      case $arg_mode in
++      arg  )
++	# do not "continue".  Instead, add this to base_compile
++	lastarg="$arg"
++	arg_mode=normal
++	;;
+ 
 -	# Add the previous argument to base_compile.
 -	if test -z "$base_compile"; then
 -	  base_compile="$lastarg"
 -	else
 -	  base_compile="$base_compile $lastarg"
 -	fi
--	continue
--	;;
++      target )
++	libobj="$arg"
++	arg_mode=normal
+ 	continue
+ 	;;
 -      esac
--
+ 
 -      # Accept any command-line options.
 -      case $arg in
 -      -o)
@@ -37499,24 +44997,6 @@
 -	  exit 1
 -	fi
 -	user_target=next
-+      case $arg_mode in
-+      arg  )
-+	# do not "continue".  Instead, add this to base_compile
-+	lastarg="$arg"
-+	arg_mode=normal
- 	;;
- 
--      -static)
--	build_old_libs=yes
-+      target )
-+	libobj="$arg"
-+	arg_mode=normal
- 	continue
- 	;;
- 
--      -prefer-pic)
--	pic_mode=yes
--	continue
 -	;;
 +      normal )
 +	# Accept any command-line options.
@@ -37530,8 +45010,8 @@
 +	  continue
 +	  ;;
  
--      -prefer-non-pic)
--	pic_mode=no
+-      -static)
+-	build_old_libs=yes
 -	continue
 -	;;
 +	-static | -prefer-pic | -prefer-non-pic)
@@ -37539,8 +45019,8 @@
 +	  continue
 +	  ;;
  
--      -Xcompiler)
--	prev=xcompiler
+-      -prefer-pic)
+-	pic_mode=yes
 -	continue
 -	;;
 +	-no-suppress)
@@ -37548,17 +45028,19 @@
 +	  continue
 +	  ;;
  
--      -Wc,*)
--	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
--	lastarg=
--	save_ifs="$IFS"; IFS=','
--	for arg in $args; do
--	  IFS="$save_ifs"
+-      -prefer-non-pic)
+-	pic_mode=no
+-	continue
+-	;;
 +	-Xcompiler)
 +	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
 +	  continue      #  The current "srcfile" will either be retained or
 +	  ;;            #  replaced later.  I would guess that would be a bug.
-+
+ 
+-      -Xcompiler)
+-	prev=xcompiler
+-	continue
+-	;;
 +	-Wc,*)
 +	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
 +	  lastarg=
@@ -37566,18 +45048,11 @@
 + 	  for arg in $args; do
 +	    IFS="$save_ifs"
  
--	  # Double-quote args containing other shell metacharacters.
--	  # Many Bourne shells cannot handle close brackets correctly
--	  # in scan sets, so we specify it separately.
--	  case $arg in
--	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	    arg="\"$arg\""
--	    ;;
--	  esac
--	  lastarg="$lastarg $arg"
--	done
--	IFS="$save_ifs"
--	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+-      -Wc,*)
+-	args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+-	lastarg=
+-	save_ifs="$IFS"; IFS=','
+-	for arg in $args; do
 +	    # Double-quote args containing other shell metacharacters.
 +	    # Many Bourne shells cannot handle close brackets correctly
 +	    # in scan sets, so we specify it separately.
@@ -37588,9 +45063,22 @@
 +	    esac
 +	    lastarg="$lastarg $arg"
 +	  done
-+	  IFS="$save_ifs"
+ 	  IFS="$save_ifs"
 +	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
  
+-	  # Double-quote args containing other shell metacharacters.
+-	  # Many Bourne shells cannot handle close brackets correctly
+-	  # in scan sets, so we specify it separately.
+-	  case $arg in
+-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
+-	    arg="\"$arg\""
+-	    ;;
+-	  esac
+-	  lastarg="$lastarg $arg"
+-	done
+-	IFS="$save_ifs"
+-	lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+-
 -	# Add the arguments to base_compile.
 -	if test -z "$base_compile"; then
 -	  base_compile="$lastarg"
@@ -37691,7 +45179,7 @@
      case $libobj in
      *.ada) xform=ada ;;
      *.adb) xform=adb ;;
-@@ -454,10 +751,13 @@
+@@ -454,10 +780,14 @@
      *.asm) xform=asm ;;
      *.c++) xform=c++ ;;
      *.cc) xform=cc ;;
@@ -37699,13 +45187,15 @@
 +    *.class) xform=class ;;
      *.cpp) xform=cpp ;;
      *.cxx) xform=cxx ;;
-     *.f90) xform=f90 ;;
+-    *.f90) xform=f90 ;;
++    *.[fF][09]?) xform=[fF][09]. ;;
      *.for) xform=for ;;
 +    *.java) xform=java ;;
++    *.obj) xform=obj ;;
      esac
  
      libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -466,25 +766,63 @@
+@@ -466,25 +796,63 @@
      *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
      *)
        $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
@@ -37774,7 +45264,7 @@
  
      # On Cygwin there's no "real" PIC flag so we must build both object types
      case $host_os in
-@@ -503,8 +841,9 @@
+@@ -503,8 +871,9 @@
        output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
        lockfile="$output_obj.lock"
        removelist="$removelist $output_obj $lockfile"
@@ -37785,7 +45275,7 @@
        need_locks=no
        lockfile=
      fi
-@@ -512,13 +851,13 @@
+@@ -512,13 +881,13 @@
      # Lock this critical section if it is needed
      # We use this script file to make the link, it avoids creating a new file
      if test "$need_locks" = yes; then
@@ -37801,7 +45291,7 @@
  *** ERROR, $lockfile exists and contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -530,14 +869,33 @@
+@@ -530,14 +899,33 @@
  compiler."
  
  	$run $rm $removelist
@@ -37837,7 +45327,7 @@
  
      # Only build a PIC object if we are building libtool libraries.
      if test "$build_libtool_libs" = yes; then
-@@ -545,53 +903,38 @@
+@@ -545,53 +933,38 @@
        fbsd_hideous_sh_bug=$base_compile
  
        if test "$pic_mode" != no; then
@@ -37908,7 +45398,7 @@
  *** ERROR, $lockfile contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -606,13 +949,13 @@
+@@ -606,13 +979,13 @@
  compiler."
  
  	$run $rm $removelist
@@ -37926,7 +45416,7 @@
  	else
  	  error=$?
  	  $run $rm $removelist
-@@ -620,77 +963,50 @@
+@@ -620,77 +993,50 @@
  	fi
        fi
  
@@ -38023,7 +45513,7 @@
  *** ERROR, $lockfile contains:
  `cat $lockfile 2>/dev/null`
  
-@@ -705,11 +1021,11 @@
+@@ -705,11 +1051,11 @@
  compiler."
  
  	$run $rm $removelist
@@ -38037,7 +45527,7 @@
  	$show "$mv $output_obj $obj"
  	if $run $mv $output_obj $obj; then :
  	else
-@@ -719,29 +1035,31 @@
+@@ -719,29 +1065,31 @@
  	fi
        fi
  
@@ -38085,7 +45575,7 @@
      ;;
  
    # libtool link mode
-@@ -752,7 +1070,7 @@
+@@ -752,7 +1100,7 @@
        # It is impossible to link a dll without this setting, and
        # we shouldn't force the makefile maintainer to figure out
        # which system we are compiling for in order to pass an extra
@@ -38094,7 +45584,7 @@
        # allow_undefined=no
  
        # FIXME: Unfortunately, there are problems with the above when trying
-@@ -767,6 +1085,7 @@
+@@ -767,6 +1115,7 @@
        ;;
      esac
      libtool_args="$nonopt"
@@ -38102,7 +45592,7 @@
      compile_command="$nonopt"
      finalize_command="$nonopt"
  
-@@ -797,6 +1116,9 @@
+@@ -797,6 +1146,9 @@
      module=no
      no_install=no
      objs=
@@ -38112,7 +45602,7 @@
      prefer_static_libs=no
      preload=no
      prev=
-@@ -808,6 +1130,9 @@
+@@ -808,27 +1160,40 @@
      temp_rpath=
      thread_safe=no
      vinfo=
@@ -38122,24 +45612,43 @@
  
      # We need to know -static, to get the right output filenames.
      for arg
-@@ -821,14 +1146,15 @@
+     do
+       case $arg in
+-      -all-static | -static)
+-	if test "X$arg" = "X-all-static"; then
++      -all-static | -static | -static-libtool-libs)
++	case $arg in
++	-all-static)
+ 	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ 	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ 	  fi
  	  if test -n "$link_static_flag"; then
  	    dlopen_self=$dlopen_self_static
  	  fi
+-	else
 +	  prefer_static_libs=yes
- 	else
++	  ;;
++	-static)
  	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
  	    dlopen_self=$dlopen_self_static
  	  fi
+-	fi
 +	  prefer_static_libs=built
- 	fi
++	  ;;
++	-static-libtool-libs)
++	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
++	    dlopen_self=$dlopen_self_static
++	  fi
++	  prefer_static_libs=yes
++	  ;;
++	esac
  	build_libtool_libs=no
  	build_old_libs=yes
 -	prefer_static_libs=yes
  	break
  	;;
        esac
-@@ -838,7 +1164,7 @@
+@@ -838,7 +1203,7 @@
      test -n "$old_archive_from_new_cmds" && build_old_libs=yes
  
      # Go through the arguments, transforming them on the way.
@@ -38148,7 +45657,7 @@
        arg="$1"
        shift
        case $arg in
-@@ -903,7 +1229,7 @@
+@@ -903,7 +1268,7 @@
  	  export_symbols="$arg"
  	  if test ! -f "$arg"; then
  	    $echo "$modename: symbol file \`$arg' does not exist"
@@ -38157,7 +45666,7 @@
  	  fi
  	  prev=
  	  continue
-@@ -913,23 +1239,140 @@
+@@ -913,23 +1278,140 @@
  	  prev=
  	  continue
  	  ;;
@@ -38300,7 +45809,7 @@
  	    ;;
  	  esac
  	  if test "$prev" = rpath; then
-@@ -961,13 +1404,33 @@
+@@ -961,13 +1443,33 @@
  	  finalize_command="$finalize_command $wl$qarg"
  	  continue
  	  ;;
@@ -38335,7 +45844,7 @@
  
        prevarg="$arg"
  
-@@ -1009,7 +1472,7 @@
+@@ -1009,7 +1511,7 @@
        -export-symbols | -export-symbols-regex)
  	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
  	  $echo "$modename: more than one -exported-symbols argument is not allowed"
@@ -38344,7 +45853,7 @@
  	fi
  	if test "X$arg" = "X-export-symbols"; then
  	  prev=expsyms
-@@ -1019,6 +1482,18 @@
+@@ -1019,6 +1521,18 @@
  	continue
  	;;
  
@@ -38363,7 +45872,7 @@
        -inst-prefix-dir)
  	prev=inst_prefix
  	continue
-@@ -1028,7 +1503,7 @@
+@@ -1028,7 +1542,7 @@
        # so, if we see these flags be careful not to treat them like -L
        -L[A-Z][A-Z]*:*)
  	case $with_gcc/$host in
@@ -38372,7 +45881,7 @@
  	  compile_command="$compile_command $arg"
  	  finalize_command="$finalize_command $arg"
  	  ;;
-@@ -1045,7 +1520,8 @@
+@@ -1045,7 +1559,8 @@
  	  absdir=`cd "$dir" && pwd`
  	  if test -z "$absdir"; then
  	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
@@ -38382,7 +45891,7 @@
  	  fi
  	  dir="$absdir"
  	  ;;
-@@ -1059,10 +1535,15 @@
+@@ -1059,10 +1574,15 @@
  	esac
  	case $host in
  	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -38398,7 +45907,7 @@
  	  ;;
  	esac
  	continue
-@@ -1071,36 +1552,98 @@
+@@ -1071,36 +1591,99 @@
        -l*)
  	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
  	  case $host in
@@ -38458,7 +45967,7 @@
 +	continue
 +	;;
 +
-+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 +	compiler_flags="$compiler_flags $arg"
 +	compile_command="$compile_command $arg"
 +	finalize_command="$finalize_command $arg"
@@ -38478,10 +45987,11 @@
 +      # -m* pass through architecture-specific compiler args for GCC
 +      # -m*, -t[45]*, -txscale* pass through architecture-specific
 +      # compiler args for GCC
-+      # -pg pass through profiling flag for GCC
++      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++      # -F/path gives path to uninstalled frameworks, gcc on darwin
 +      # @file GCC response files
-+      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-+      -t[45]*|-txscale*|@*)
++      -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
 +
 +	# Unknown arguments in both finalize_command and compile_command need
 +	# to be aesthetically quoted because they are evaled later.
@@ -38505,7 +46015,19 @@
        -no-fast-install)
  	fast_install=no
  	continue
-@@ -1125,8 +1668,18 @@
+@@ -1108,9 +1691,9 @@
+ 
+       -no-install)
+ 	case $host in
+-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+ 	  # The PATH hackery in wrapper scripts is required on Windows
+-	  # in order for the loader to find any dlls it needs.
++	  # and Darwin in order for the loader to find any dlls it needs.
+ 	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ 	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ 	  fast_install=no
+@@ -1125,8 +1708,18 @@
  	continue
  	;;
  
@@ -38524,7 +46046,7 @@
        -release)
  	prev=release
  	continue
-@@ -1149,7 +1702,7 @@
+@@ -1149,7 +1742,7 @@
  	[\\/]* | [A-Za-z]:[\\/]*) ;;
  	*)
  	  $echo "$modename: only absolute run-paths are allowed" 1>&2
@@ -38533,7 +46055,16 @@
  	  ;;
  	esac
  	case "$xrpath " in
-@@ -1177,6 +1730,11 @@
+@@ -1159,7 +1752,7 @@
+ 	continue
+ 	;;
+ 
+-      -static)
++      -static | -static-libtool-libs)
+ 	# The effects of -static are defined in a previous loop.
+ 	# We used to do the same as -all-static on platforms that
+ 	# didn't have a PIC flag, but the assumption that the effects
+@@ -1177,6 +1770,11 @@
  	prev=vinfo
  	continue
  	;;
@@ -38545,7 +46076,7 @@
  
        -Wc,*)
  	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-@@ -1225,6 +1783,11 @@
+@@ -1225,6 +1823,11 @@
  	continue
  	;;
  
@@ -38557,7 +46088,7 @@
        # Some other compiler flag.
        -* | +*)
  	# Unknown arguments in both finalize_command and compile_command need
-@@ -1237,29 +1800,106 @@
+@@ -1237,29 +1840,106 @@
  	esac
  	;;
  
@@ -38572,11 +46103,18 @@
 -	  else
 -	    # If libtool objects are unsupported, then we need to preload.
 -	    prev=dlprefiles
+-	  fi
+-	fi
 +      *.$objext)
 +	# A standard object.
 +	objs="$objs $arg"
 +	;;
-+
+ 
+-	if test "$prev" = dlprefiles; then
+-	  # Preload the old-style object.
+-	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
+-	  prev=
+-	else
 +      *.lo)
 +	# A libtool-controlled object.
 +
@@ -38587,10 +46125,12 @@
 +
 +	  # Read the .lo file
 +	  # If there is no directory component, then add one.
-+	  case $arg in
+ 	  case $arg in
+-	  *.lo) libobjs="$libobjs $arg" ;;
+-	  *) objs="$objs $arg" ;;
 +	  */* | *\\*) . $arg ;;
 +	  *) . ./$arg ;;
-+	  esac
+ 	  esac
 +
 +	  if test -z "$pic_object" || \
 +	     test -z "$non_pic_object" ||
@@ -38633,13 +46173,8 @@
 +	    # A PIC object.
 +	    libobjs="$libobjs $pic_object"
 +	    arg="$pic_object"
- 	  fi
--	fi
- 
--	if test "$prev" = dlprefiles; then
--	  # Preload the old-style object.
--	  dlprefiles="$dlprefiles "`$echo "X$arg" | $Xsed -e "$lo2o"`
--	  prev=
++	  fi
++
 +	  # Non-PIC object.
 +	  if test "$non_pic_object" != none; then
 +	    # Prepend the subdirectory the object is found in.
@@ -38656,11 +46191,7 @@
 +	    non_pic_object="$pic_object"
 +	    non_pic_objects="$non_pic_objects $non_pic_object"
 +	  fi
- 	else
--	  case $arg in
--	  *.lo) libobjs="$libobjs $arg" ;;
--	  *) objs="$objs $arg" ;;
--	  esac
++	else
 +	  # Only an error if not doing a dry-run.
 +	  if test -z "$run"; then
 +	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
@@ -38684,7 +46215,7 @@
  	fi
  	;;
  
-@@ -1310,7 +1950,7 @@
+@@ -1310,7 +1990,7 @@
      if test -n "$prev"; then
        $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
        $echo "$help" 1>&2
@@ -38693,7 +46224,7 @@
      fi
  
      if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1319,6 +1959,7 @@
+@@ -1319,6 +1999,7 @@
        finalize_command="$finalize_command $arg"
      fi
  
@@ -38701,7 +46232,7 @@
      # calculate the name of the file, without its directory
      outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
      libobjs_save="$libobjs"
-@@ -1339,12 +1980,12 @@
+@@ -1339,12 +2020,12 @@
        output_objdir="$output_objdir/$objdir"
      fi
      # Create the object directory.
@@ -38718,7 +46249,7 @@
        fi
      fi
  
-@@ -1353,7 +1994,7 @@
+@@ -1353,7 +2034,7 @@
      "")
        $echo "$modename: you must specify an output file" 1>&2
        $echo "$help" 1>&2
@@ -38727,7 +46258,7 @@
        ;;
      *.$libext) linkmode=oldlib ;;
      *.lo | *.$objext) linkmode=obj ;;
-@@ -1361,7 +2002,17 @@
+@@ -1361,7 +2042,17 @@
      *) linkmode=prog ;; # Anything else should be a program.
      esac
  
@@ -38745,7 +46276,7 @@
      libs=
      # Find all interdependent deplibs by searching for libraries
      # that are linked more than once (e.g. -la -lb -la)
-@@ -1373,12 +2024,30 @@
+@@ -1373,12 +2064,30 @@
        fi
        libs="$libs $deplib"
      done
@@ -38777,7 +46308,7 @@
      case $linkmode in
      lib)
  	passes="conv link"
-@@ -1387,7 +2056,7 @@
+@@ -1387,7 +2096,7 @@
  	  *.la) ;;
  	  *)
  	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
@@ -38786,7 +46317,7 @@
  	    ;;
  	  esac
  	done
-@@ -1404,39 +2073,58 @@
+@@ -1404,39 +2113,58 @@
  	;;
      esac
      for pass in $passes; do
@@ -38826,7 +46357,7 @@
 -	  if test $linkmode = oldlib && test $linkmode = obj; then
 -	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
 -	    continue
-+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
++	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
 +	  if test "$linkmode,$pass" = "prog,link"; then
 +	    compile_deplibs="$deplib $compile_deplibs"
 +	    finalize_deplibs="$deplib $finalize_deplibs"
@@ -38865,7 +46396,7 @@
  	  done
  	  if test "$found" != yes; then
  	    # deplib doesn't seem to be a libtool library
-@@ -1445,40 +2133,76 @@
+@@ -1445,40 +2173,76 @@
  	      finalize_deplibs="$deplib $finalize_deplibs"
  	    else
  	      deplibs="$deplib $deplibs"
@@ -38949,7 +46480,7 @@
  	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
  	    # Make sure the xrpath contains only unique directories.
  	    case "$xrpath " in
-@@ -1491,30 +2215,45 @@
+@@ -1491,30 +2255,45 @@
  	  ;;
  	*.la) lib="$deplib" ;;
  	*.$libext)
@@ -39008,7 +46539,7 @@
  	      deplibs="$deplib $deplibs"
  	    else
  	      compile_deplibs="$deplib $compile_deplibs"
-@@ -1525,14 +2264,18 @@
+@@ -1525,14 +2304,18 @@
  	  esac # linkmode
  	  ;; # *.$libext
  	*.lo | *.$objext)
@@ -39035,7 +46566,7 @@
  	  fi
  	  continue
  	  ;;
-@@ -1541,17 +2284,17 @@
+@@ -1541,17 +2324,17 @@
  	  continue
  	  ;;
  	esac # case $deplib
@@ -39058,7 +46589,7 @@
  	fi
  
  	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -1564,8 +2307,11 @@
+@@ -1564,8 +2347,11 @@
  	library_names=
  	old_library=
  	# If the library was installed with an old release of libtool,
@@ -39071,7 +46602,7 @@
  
  	# Read the .la file
  	case $lib in
-@@ -1575,19 +2321,18 @@
+@@ -1575,19 +2361,18 @@
  
  	if test "$linkmode,$pass" = "lib,link" ||
  	   test "$linkmode,$pass" = "prog,scan" ||
@@ -39094,7 +46625,7 @@
  	    fi
  	    # It is a libtool convenience library, so add in its objects.
  	    convenience="$convenience $ladir/$objdir/$old_library"
-@@ -1602,13 +2347,14 @@
+@@ -1602,13 +2387,14 @@
                fi
  	      tmp_libs="$tmp_libs $deplib"
  	    done
@@ -39111,7 +46642,7 @@
  	# Get the name of the library we link against.
  	linklib=
  	for l in $old_library $library_names; do
-@@ -1616,19 +2362,23 @@
+@@ -1616,19 +2402,23 @@
  	done
  	if test -z "$linklib"; then
  	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
@@ -39141,7 +46672,7 @@
  	  else
  	    newdlfiles="$newdlfiles $lib"
  	  fi
-@@ -1660,19 +2410,27 @@
+@@ -1660,19 +2450,27 @@
  	    dir="$libdir"
  	    absdir="$libdir"
  	  fi
@@ -39175,7 +46706,7 @@
  	  fi
  	  # Prefer using a static library (so that no silly _DYNAMIC symbols
  	  # are required to link).
-@@ -1688,18 +2446,19 @@
+@@ -1688,18 +2486,19 @@
  
  	if test -z "$libdir"; then
  	  # Link the convenience library
@@ -39198,7 +46729,7 @@
  	  newlib_search_path="$newlib_search_path $ladir"
  	  deplibs="$lib $deplibs"
  
-@@ -1715,7 +2474,7 @@
+@@ -1715,7 +2514,7 @@
  	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
  	    esac
  	    # Need to link against all dependency_libs?
@@ -39207,7 +46738,7 @@
  	      deplibs="$deplib $deplibs"
  	    else
  	      # Need to hardcode shared library paths
-@@ -1732,13 +2491,19 @@
+@@ -1732,13 +2531,21 @@
  	  continue
  	fi # $linkmode = prog...
  
@@ -39217,7 +46748,9 @@
 -	  # Link against this shared library
 +	if test "$linkmode,$pass" = "prog,link"; then
 +	  if test -n "$library_names" &&
-+	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++	     { { test "$prefer_static_libs" = no ||
++		 test "$prefer_static_libs,$installed" = "built,yes"; } ||
++	       test -z "$old_library"; }; then
 +	    # We need to hardcode the library path
 +	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
 +	      # Make sure the rpath contains only unique directories.
@@ -39233,7 +46766,7 @@
  	    # Hardcode the library path.
  	    # Skip directories that are in the system default run-time
  	    # search path.
-@@ -1760,17 +2525,6 @@
+@@ -1760,17 +2567,6 @@
  	      esac
  	      ;;
  	    esac
@@ -39251,7 +46784,7 @@
  	  fi # $linkmode,$pass = prog,link...
  
  	  if test "$alldeplibs" = yes &&
-@@ -1780,11 +2534,56 @@
+@@ -1780,11 +2576,56 @@
  	    # We only need to search for static libraries
  	    continue
  	  fi
@@ -39308,7 +46841,7 @@
  
  	  if test -n "$old_archive_from_expsyms_cmds"; then
  	    # figure out the soname
-@@ -1798,7 +2597,7 @@
+@@ -1798,7 +2639,7 @@
  	    elif test -n "$soname_spec"; then
  	      # bleh windows
  	      case $host in
@@ -39317,7 +46850,7 @@
  		major=`expr $current - $age`
  		versuffix="-$major"
  		;;
-@@ -1810,17 +2609,18 @@
+@@ -1810,17 +2651,18 @@
  
  	    # Make a new name for the extract_expsyms_cmds to use
  	    soroot="$soname"
@@ -39339,7 +46872,7 @@
  		$show "$cmd"
  		$run eval "$cmd" || exit $?
  	      done
-@@ -1831,9 +2631,10 @@
+@@ -1831,9 +2673,10 @@
  	    if test -f "$output_objdir/$newlib"; then :; else
  	      $show "generating import library for \`$soname'"
  	      save_ifs="$IFS"; IFS='~'
@@ -39351,7 +46884,7 @@
  		$show "$cmd"
  		$run eval "$cmd" || exit $?
  	      done
-@@ -1842,9 +2643,9 @@
+@@ -1842,9 +2685,9 @@
  	    # make sure the library variables are pointing to the new library
  	    dir=$output_objdir
  	    linklib=$newlib
@@ -39363,7 +46896,7 @@
  	    add_shlibpath=
  	    add_dir=
  	    add=
-@@ -1853,6 +2654,26 @@
+@@ -1853,6 +2696,26 @@
  	    immediate | unsupported)
  	      if test "$hardcode_direct" = no; then
  		add="$dir/$linklib"
@@ -39390,7 +46923,7 @@
  	      elif test "$hardcode_minus_L" = no; then
  		case $host in
  		*-*-sunos*) add_shlibpath="$dir" ;;
-@@ -1871,6 +2692,14 @@
+@@ -1871,6 +2734,14 @@
  		add="$dir/$linklib"
  	      elif test "$hardcode_minus_L" = yes; then
  		add_dir="-L$dir"
@@ -39405,7 +46938,7 @@
  		add="-l$name"
  	      elif test "$hardcode_shlibpath_var" = yes; then
  		add_shlibpath="$dir"
-@@ -1884,7 +2713,7 @@
+@@ -1884,7 +2755,7 @@
  
  	    if test "$lib_linked" != yes; then
  	      $echo "$modename: configuration error: unsupported hardcode properties"
@@ -39414,7 +46947,7 @@
  	    fi
  
  	    if test -n "$add_shlibpath"; then
-@@ -1893,7 +2722,7 @@
+@@ -1893,7 +2764,7 @@
  	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
  	      esac
  	    fi
@@ -39423,7 +46956,7 @@
  	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
  	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
  	    else
-@@ -1910,9 +2739,8 @@
+@@ -1910,9 +2781,8 @@
  	    fi
  	  fi
  
@@ -39434,7 +46967,7 @@
  	    add_dir=
  	    add=
  	    # Finalize command for both is simple: just hardcode it.
-@@ -1927,43 +2755,36 @@
+@@ -1927,43 +2797,36 @@
  	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
  	      esac
  	      add="-l$name"
@@ -39495,7 +47028,7 @@
  	  # Here we assume that one of hardcode_direct or hardcode_minus_L
  	  # is not unsupported.  This is valid on all known static and
  	  # shared platforms.
-@@ -1983,21 +2804,21 @@
+@@ -1983,21 +2846,21 @@
  
  	    # Just print a warning and add the library to dependency_libs so
  	    # that the program can be linked against the static library.
@@ -39530,7 +47063,7 @@
  	      fi
  	      if test "$build_old_libs" = no; then
  		build_libtool_libs=module
-@@ -2007,17 +2828,16 @@
+@@ -2007,17 +2870,16 @@
  	      fi
  	    fi
  	  else
@@ -39552,7 +47085,7 @@
  	    # Extract -R from dependency_libs
  	    temp_deplibs=
  	    for libdir in $dependency_libs; do
-@@ -2048,7 +2868,7 @@
+@@ -2048,7 +2910,7 @@
  	    tmp_libs="$tmp_libs $deplib"
  	  done
  
@@ -39561,7 +47094,7 @@
  	    # Add the search paths of all dependency libraries
  	    for deplib in $dependency_libs; do
  	      case $deplib in
-@@ -2068,38 +2888,83 @@
+@@ -2068,38 +2930,83 @@
  		  ;;
  		esac
  		if grep "^installed=no" $deplib > /dev/null; then
@@ -39653,7 +47186,7 @@
  	  # Make sure lib_search_path contains only unique directories.
  	  lib_search_path=
  	  for dir in $newlib_search_path; do
-@@ -2121,9 +2986,30 @@
+@@ -2121,9 +3028,30 @@
  	  eval tmp_libs=\"\$$var\"
  	  new_libs=
  	  for deplib in $tmp_libs; do
@@ -39684,7 +47217,7 @@
  	      case " $specialdeplibs " in
  	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
  	      *)
-@@ -2151,19 +3037,32 @@
+@@ -2151,19 +3079,32 @@
  	  eval $var=\"$tmp_libs\"
  	done # for var
        fi
@@ -39723,7 +47256,7 @@
        if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
  	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
        fi
-@@ -2177,7 +3076,7 @@
+@@ -2177,7 +3118,7 @@
        fi
  
        if test -n "$vinfo"; then
@@ -39732,7 +47265,7 @@
        fi
  
        if test -n "$release"; then
-@@ -2199,17 +3098,19 @@
+@@ -2199,17 +3140,19 @@
        case $outputname in
        lib*)
  	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
@@ -39753,7 +47286,7 @@
  	  eval libname=\"$libname_spec\"
  	else
  	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2220,11 +3121,11 @@
+@@ -2220,11 +3163,11 @@
        if test -n "$objs"; then
  	if test "$deplibs_check_method" != pass_all; then
  	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
@@ -39769,7 +47302,7 @@
  	  libobjs="$libobjs $objs"
  	fi
        fi
-@@ -2234,7 +3135,7 @@
+@@ -2234,7 +3177,7 @@
        fi
  
        set dummy $rpath
@@ -39778,7 +47311,7 @@
  	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
        fi
        install_libdir="$2"
-@@ -2243,14 +3144,16 @@
+@@ -2243,14 +3186,16 @@
        if test -z "$rpath"; then
  	if test "$build_libtool_libs" = yes; then
  	  # Building a libtool convenience library.
@@ -39797,7 +47330,7 @@
  	fi
  
  	if test -n "$release"; then
-@@ -2266,45 +3169,87 @@
+@@ -2266,45 +3211,88 @@
  	if test -n "$8"; then
  	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
  	  $echo "$help" 1>&2
@@ -39825,7 +47358,7 @@
 +	  # which has an extra 1 added just for fun
 +	  #
 +	  case $version_type in
-+	  darwin|linux|osf|windows)
++	  darwin|linux|osf|windows|none)
 +	    current=`expr $number_major + $number_minor`
 +	    age="$number_minor"
 +	    revision="$number_revision"
@@ -39836,9 +47369,10 @@
 +	    age="0"
 +	    ;;
 +	  irix|nonstopux)
-+	    current=`expr $number_major + $number_minor - 1`
++	    current=`expr $number_major + $number_minor`
 +	    age="$number_minor"
 +	    revision="$number_minor"
++	    lt_irix_increment=no
 +	    ;;
 +	  *)
 +	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
@@ -39900,17 +47434,30 @@
  	fi
  
  	# Calculate the version variables.
-@@ -2321,7 +3266,7 @@
+@@ -2321,6 +3309,7 @@
  	  versuffix="$major.$age.$revision"
  	  # Darwin ld doesn't like 0 for these options...
  	  minor_current=`expr $current + 1`
--	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
++	  xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ 	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
  	  ;;
  
- 	freebsd-aout)
-@@ -2345,7 +3290,7 @@
+@@ -2335,8 +3324,11 @@
+ 	  ;;
  
+ 	irix | nonstopux)
+-	  major=`expr $current - $age + 1`
+-
++	  if test "X$lt_irix_increment" = "Xno"; then
++	    major=`expr $current - $age`
++	  else
++	    major=`expr $current - $age + 1`
++	  fi
+ 	  case $version_type in
+ 	    nonstopux) verstring_prefix=nonstopux ;;
+ 	    *)         verstring_prefix=sgi ;;
+@@ -2345,7 +3337,7 @@
+ 
  	  # Add in all the interfaces that we are compatible with.
  	  loop=$revision
 -	  while test $loop != 0; do
@@ -39918,7 +47465,7 @@
  	    iface=`expr $revision - $loop`
  	    loop=`expr $loop - 1`
  	    verstring="$verstring_prefix$major.$iface:$verstring"
-@@ -2368,7 +3313,7 @@
+@@ -2368,7 +3360,7 @@
  
  	  # Add in all the interfaces that we are compatible with.
  	  loop=$age
@@ -39927,7 +47474,7 @@
  	    iface=`expr $current - $loop`
  	    loop=`expr $loop - 1`
  	    verstring="$verstring:${iface}.0"
-@@ -2392,20 +3337,19 @@
+@@ -2392,20 +3384,19 @@
  
  	*)
  	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
@@ -39951,7 +47498,7 @@
  	    ;;
  	  *)
  	    verstring="0.0"
-@@ -2439,9 +3383,30 @@
+@@ -2439,9 +3430,30 @@
        fi
  
        if test "$mode" != relink; then
@@ -39985,20 +47532,24 @@
        fi
  
        # Now set the variables for building old libraries.
-@@ -2454,9 +3419,9 @@
+@@ -2453,11 +3465,11 @@
+       fi
  
        # Eliminate all temporary directories.
-       for path in $notinst_path; do
+-      for path in $notinst_path; do
 -	lib_search_path=`echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
 -	deplibs=`echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
 -	dependency_libs=`echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-+	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
-+	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
-+	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
-       done
+-      done
++      #for path in $notinst_path; do
++      #	lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++      #	deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++      #	dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++      #done
  
        if test -n "$xrpath"; then
-@@ -2469,7 +3434,7 @@
+ 	# If the user specified any rpath flags, then add them.
+@@ -2469,7 +3481,7 @@
  	  *) finalize_rpath="$finalize_rpath $libdir" ;;
  	  esac
  	done
@@ -40007,7 +47558,7 @@
  	  dependency_libs="$temp_xrpath $dependency_libs"
  	fi
        fi
-@@ -2507,12 +3472,18 @@
+@@ -2507,12 +3519,18 @@
  	  *-*-netbsd*)
  	    # Don't link with libc until the a.out ld.so is fixed.
  	    ;;
@@ -40029,7 +47580,7 @@
  	      deplibs="$deplibs -lc"
  	    fi
  	    ;;
-@@ -2539,7 +3510,7 @@
+@@ -2539,7 +3557,7 @@
  	  # This might be a little naive.  We might want to check
  	  # whether the library exists or not.  But this is on
  	  # osf3 & osf4 and I'm not really sure... Just
@@ -40038,14 +47589,13 @@
  	  newdeplibs=$deplibs
  	  ;;
  	test_compile)
-@@ -2552,68 +3523,88 @@
+@@ -2552,68 +3570,85 @@
  	  int main() { return 0; }
  EOF
  	  $rm conftest
 -	  $CC -o conftest conftest.c $deplibs
 -	  if test $? -eq 0 ; then
-+	  $LTCC $LTCFLAGS -o conftest conftest.c $deplibs
-+	  if test "$?" -eq 0 ; then
++	  if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
  	    ldd_output=`ldd conftest`
  	    for i in $deplibs; do
 -	      name="`expr $i : '-l\(.*\)'`"
@@ -40067,7 +47617,7 @@
 -		  echo "*** shared version of the library, which I believe you do not have"
 -		  echo "*** because a test_compile did reveal that the linker did not use it for"
 -		  echo "*** its dynamic dependency list that programs get resolved with at runtime."
-+              if test "$name" != "" && test "$name" -ne "0"; then
++              if test "$name" != "" && test "$name" != "0"; then
 +		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 +		  case " $predeps $postdeps " in
 +		  *" $i "*)
@@ -40111,10 +47661,9 @@
 +              if test "$name" != "" && test "$name" != "0"; then
  		$rm conftest
 -		$CC -o conftest conftest.c $i
-+		$LTCC $LTCFLAGS -o conftest conftest.c $i
- 		# Did it work?
+-		# Did it work?
 -		if test $? -eq 0 ; then
-+		if test "$?" -eq 0 ; then
++		if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
  		  ldd_output=`ldd conftest`
 -		  libname=`eval \\$echo \"$libname_spec\"`
 -		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
@@ -40166,13 +47715,13 @@
 -		  echo "*** functional.  Installing it before continuing would be even better."
 +		  $echo
 +		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-+		  $echo "***  make it link in!  You will probably need to install it or some"
++		  $echo "*** make it link in!  You will probably need to install it or some"
 +		  $echo "*** library that it depends on before this library will be fully"
 +		  $echo "*** functional.  Installing it before continuing would be even better."
  		fi
  	      else
  		newdeplibs="$newdeplibs $i"
-@@ -2625,13 +3616,22 @@
+@@ -2625,13 +3660,22 @@
  	  set dummy $deplibs_check_method
  	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
  	  for a_deplib in $deplibs; do
@@ -40201,7 +47750,7 @@
  		      # Follow soft links.
  		      if ls -lLd "$potent_lib" 2>/dev/null \
  			 | grep " -> " >/dev/null; then
-@@ -2650,35 +3650,29 @@
+@@ -2650,35 +3694,29 @@
  			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
  			esac
  		      done
@@ -40250,7 +47799,7 @@
  		fi
  	      fi
  	    else
-@@ -2691,36 +3685,46 @@
+@@ -2691,36 +3729,46 @@
  	  set dummy $deplibs_check_method
  	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
  	  for a_deplib in $deplibs; do
@@ -40320,7 +47869,7 @@
  		fi
  	      fi
  	    else
-@@ -2731,16 +3735,23 @@
+@@ -2731,16 +3779,23 @@
  	  ;;
  	none | unknown | *)
  	  newdeplibs=""
@@ -40351,7 +47900,7 @@
  	    droppeddeps=yes
  	  fi
  	  ;;
-@@ -2760,17 +3771,17 @@
+@@ -2760,17 +3815,17 @@
  
  	if test "$droppeddeps" = yes; then
  	  if test "$module" = yes; then
@@ -40379,24 +47928,23 @@
  	    fi
  	    if test "$build_old_libs" = no; then
  	      oldlibs="$output_objdir/$libname.$libext"
-@@ -2780,16 +3791,16 @@
+@@ -2780,16 +3835,16 @@
  	      build_libtool_libs=no
  	    fi
  	  else
 -	    echo "*** The inter-library dependencies that have been dropped here will be"
 -	    echo "*** automatically added whenever a program is linked with this library"
 -	    echo "*** or is declared to -dlopen it."
--
++	    $echo "*** The inter-library dependencies that have been dropped here will be"
++	    $echo "*** automatically added whenever a program is linked with this library"
++	    $echo "*** or is declared to -dlopen it."
+ 
 -	    if test $allow_undefined = no; then
 -	      echo
 -	      echo "*** Since this library must not contain undefined symbols,"
 -	      echo "*** because either the platform does not support them or"
 -	      echo "*** it was explicitly requested with -no-undefined,"
 -	      echo "*** libtool will only create a static version of it."
-+	    $echo "*** The inter-library dependencies that have been dropped here will be"
-+	    $echo "*** automatically added whenever a program is linked with this library"
-+	    $echo "*** or is declared to -dlopen it."
-+
 +	    if test "$allow_undefined" = no; then
 +	      $echo
 +	      $echo "*** Since this library must not contain undefined symbols,"
@@ -40406,7 +47954,7 @@
  	      if test "$build_old_libs" = no; then
  		oldlibs="$output_objdir/$libname.$libext"
  		build_libtool_libs=module
-@@ -2804,6 +3815,35 @@
+@@ -2804,6 +3859,35 @@
  	deplibs=$newdeplibs
        fi
  
@@ -40442,7 +47990,7 @@
        # All the library-specific variables (install_libdir is set above).
        library_names=
        old_library=
-@@ -2811,7 +3851,7 @@
+@@ -2811,7 +3895,7 @@
  
        # Test again, we may have decided not to build it any more
        if test "$build_libtool_libs" = yes; then
@@ -40451,20 +47999,23 @@
  	  # Hardcode the library paths
  	  hardcode_libdirs=
  	  dep_rpath=
-@@ -2847,7 +3887,11 @@
+@@ -2847,7 +3931,14 @@
  	  if test -n "$hardcode_libdir_separator" &&
  	     test -n "$hardcode_libdirs"; then
  	    libdir="$hardcode_libdirs"
 -	    eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 +	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-+	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++	      case $archive_cmds in
++	      *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++	      *)      eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++	      esac
 +	    else
 +	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
 +	    fi
  	  fi
  	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
  	    # We should set the runpath_var.
-@@ -2867,6 +3911,7 @@
+@@ -2867,6 +3958,7 @@
  	fi
  
  	# Get the real and link names of the library.
@@ -40472,7 +48023,7 @@
  	eval library_names=\"$library_names_spec\"
  	set dummy $library_names
  	realname="$2"
-@@ -2877,31 +3922,17 @@
+@@ -2877,31 +3969,17 @@
  	else
  	  soname="$realname"
  	fi
@@ -40508,7 +48059,7 @@
  	# Use standard objects if they are pic
  	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
  
-@@ -2911,17 +3942,29 @@
+@@ -2911,17 +3989,29 @@
  	    $show "generating symbol list for \`$libname.la'"
  	    export_symbols="$output_objdir/$libname.exp"
  	    $run $rm $export_symbols
@@ -40543,7 +48094,7 @@
  	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
  	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
  	    fi
-@@ -2932,46 +3975,30 @@
+@@ -2932,46 +4022,30 @@
  	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
  	fi
  
@@ -40605,7 +48156,7 @@
  	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
  	  eval flag=\"$thread_safe_flag_spec\"
  	  linker_flags="$linker_flags $flag"
-@@ -2983,34 +4010,175 @@
+@@ -2983,34 +4057,175 @@
  	fi
  
  	# Do each of the archive commands.
@@ -40622,7 +48173,13 @@
 -	  eval cmds=\"$archive_expsym_cmds\"
 +	  eval test_cmds=\"$archive_expsym_cmds\"
 +	  cmds=$archive_expsym_cmds
-+	else
+ 	else
+-	  save_deplibs="$deplibs"
+-	  for conv in $convenience; do
+-	    tmp_deplibs=
+-	    for test_deplib in $deplibs; do
+-	      if test "$test_deplib" != "$conv"; then
+-		tmp_deplibs="$tmp_deplibs $test_deplib"
 +	  eval test_cmds=\"$archive_cmds\"
 +	  cmds=$archive_cmds
 +	  fi
@@ -40632,13 +48189,7 @@
 +	   len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
 +	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 +	  :
- 	else
--	  save_deplibs="$deplibs"
--	  for conv in $convenience; do
--	    tmp_deplibs=
--	    for test_deplib in $deplibs; do
--	      if test "$test_deplib" != "$conv"; then
--		tmp_deplibs="$tmp_deplibs $test_deplib"
++	else
 +	  # The command line is too long to link in one step, link piecewise.
 +	  $echo "creating reloadable object files..."
 +
@@ -40692,7 +48243,9 @@
 +	      objlist=$obj
 +	      len=1
 +	    fi
-+	  done
+ 	  done
+-	  eval cmds=\"$archive_cmds\"
+-	  deplibs="$save_deplibs"
 +	  # Handle the remaining objects by creating one last
 +	  # reloadable object file.  All subsequent reloadable object
 +	  # files will link in the last one created.
@@ -40725,9 +48278,7 @@
 +	    IFS="$save_ifs"
 +	    $show "$cmd"
 +	    $run eval "$cmd" || exit $?
- 	  done
--	  eval cmds=\"$archive_cmds\"
--	  deplibs="$save_deplibs"
++	  done
 +	  IFS="$save_ifs"
 +
 +	  libobjs=$output
@@ -40794,7 +48345,7 @@
  	fi
  
  	# Create links to the real library.
-@@ -3058,7 +4226,7 @@
+@@ -3058,7 +4273,7 @@
        *.lo)
  	if test -n "$objs$old_deplibs"; then
  	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
@@ -40803,8 +48354,20 @@
  	fi
  	libobj="$output"
  	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -3087,38 +4255,10 @@
- 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+@@ -3079,46 +4294,20 @@
+       reload_conv_objs=
+       gentop=
+       # reload_cmds runs $LD directly, so let us get rid of
+-      # -Wl from whole_archive_flag_spec
++      # -Wl from whole_archive_flag_spec and hope we can get by with
++      # turning comma into space..
+       wl=
+ 
+       if test -n "$convenience"; then
+ 	if test -n "$whole_archive_flag_spec"; then
+-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++	  reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
  	else
  	  gentop="$output_objdir/${obj}x"
 -	  $show "${rm}r $gentop"
@@ -40844,7 +48407,7 @@
  	fi
        fi
  
-@@ -3126,10 +4266,11 @@
+@@ -3126,10 +4315,11 @@
        reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
  
        output="$obj"
@@ -40857,7 +48420,7 @@
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
        done
-@@ -3142,7 +4283,7 @@
+@@ -3142,7 +4332,7 @@
  	  $run ${rm}r $gentop
  	fi
  
@@ -40866,7 +48429,7 @@
        fi
  
        if test "$build_libtool_libs" != yes; then
-@@ -3153,37 +4294,24 @@
+@@ -3153,37 +4343,24 @@
  
  	# Create an invalid libtool object if no PIC, so that we don't
  	# accidentally link it into a program.
@@ -40909,7 +48472,7 @@
        fi
  
        if test -n "$gentop"; then
-@@ -3191,12 +4319,12 @@
+@@ -3191,12 +4368,12 @@
  	$run ${rm}r $gentop
        fi
  
@@ -40924,7 +48487,7 @@
        esac
        if test -n "$vinfo"; then
  	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-@@ -3218,16 +4346,48 @@
+@@ -3218,16 +4395,48 @@
  	# On Rhapsody replace the C library is the System framework
  	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
  	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
@@ -40980,7 +48543,7 @@
        compile_command="$compile_command $compile_deplibs"
        finalize_command="$finalize_command $finalize_deplibs"
  
-@@ -3272,10 +4432,15 @@
+@@ -3272,10 +4481,15 @@
  	fi
  	case $host in
  	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
@@ -40996,7 +48559,7 @@
  	  ;;
  	esac
        done
-@@ -3378,31 +4543,43 @@
+@@ -3378,31 +4592,43 @@
  	    done
  
  	    if test -n "$exclude_expsyms"; then
@@ -41048,7 +48611,7 @@
  	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
  	  done
  
-@@ -3411,7 +4588,7 @@
+@@ -3411,7 +4637,7 @@
  	    test -f "$nlist" || : > "$nlist"
  
  	    if test -n "$exclude_expsyms"; then
@@ -41057,7 +48620,7 @@
  	      $mv "$nlist"T "$nlist"
  	    fi
  
-@@ -3431,7 +4608,7 @@
+@@ -3431,7 +4657,7 @@
  	    if test -f "$nlist"S; then
  	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
  	    else
@@ -41066,7 +48629,7 @@
  	    fi
  
  	    $echo >> "$output_objdir/$dlsyms" "\
-@@ -3446,7 +4623,26 @@
+@@ -3446,7 +4672,26 @@
  #endif
  
  /* The mapping between symbol names and symbols. */
@@ -41093,7 +48656,7 @@
    const char *name;
    lt_ptr address;
  }
-@@ -3483,30 +4679,43 @@
+@@ -3483,30 +4728,43 @@
  	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
  	    case "$compile_command " in
  	    *" -static "*) ;;
@@ -41124,16 +48687,16 @@
 +          case $host in
 +          *cygwin* | *mingw* )
 +            if test -f "$output_objdir/${outputname}.def" ; then
-+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
-+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
++              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
 +            else
-+              compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+              finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++              compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++              finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
 +             fi
 +            ;;
 +          * )
-+            compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-+            finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++            compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++            finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
 +            ;;
 +          esac
  	  ;;
@@ -41144,16 +48707,23 @@
  	  ;;
  	esac
        else
-@@ -3519,7 +4728,7 @@
- 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+@@ -3515,19 +4773,19 @@
+ 	# really was required.
+ 
+ 	# Nullify the symbol file.
+-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
        fi
  
 -      if test $need_relink = no || test "$build_libtool_libs" != yes; then
 +      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
  	# Replace the output file specification.
- 	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
  	link_command="$compile_command$compile_rpath"
-@@ -3527,7 +4736,7 @@
+ 
  	# We have no uninstalled library dependencies, so finalize right now.
  	$show "$link_command"
  	$run eval "$link_command"
@@ -41162,7 +48732,7 @@
  
  	# Delete the generated files.
  	if test -n "$dlsyms"; then
-@@ -3535,7 +4744,7 @@
+@@ -3535,7 +4793,7 @@
  	  $run $rm "$output_objdir/${outputname}S.${objext}"
  	fi
  
@@ -41171,7 +48741,7 @@
        fi
  
        if test -n "$shlibpath_var"; then
-@@ -3594,7 +4803,7 @@
+@@ -3594,7 +4852,7 @@
  	# Link the executable and exit
  	$show "$link_command"
  	$run eval "$link_command" || exit $?
@@ -41180,7 +48750,21 @@
        fi
  
        if test "$hardcode_action" = relink; then
-@@ -3649,10 +4858,10 @@
+@@ -3608,7 +4866,7 @@
+ 	if test "$fast_install" != no; then
+ 	  link_command="$finalize_var$compile_command$finalize_rpath"
+ 	  if test "$fast_install" = yes; then
+-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ 	  else
+ 	    # fast_install is set to needless
+ 	    relink_command=
+@@ -3645,14 +4903,14 @@
+ 	  fi
+ 	done
+ 	relink_command="(cd `pwd`; $relink_command)"
+-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++	relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
        fi
  
        # Quote $echo for shipping.
@@ -41195,7 +48779,7 @@
  	esac
  	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
        else
-@@ -3664,15 +4873,376 @@
+@@ -3664,15 +4922,376 @@
  	# win32 will think the script is a binary if it has
  	# a .exe suffix, so we strip it off here.
  	case $output in
@@ -41576,7 +49160,7 @@
  
  	$echo > $output "\
  #! $SHELL
-@@ -3688,12 +5258,12 @@
+@@ -3688,12 +5307,26 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -41584,6 +49168,20 @@
 +Xsed='${SED} -e 1s/^X//'
  sed_quote_subst='$sed_quote_subst'
  
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++  emulate sh
++  NULLCMD=:
++  # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++  # is contrary to our usage.  Disable this feature.
++  alias -g '\${1+\"\$@\"}'='\"\$@\"'
++  setopt NO_GLOB_SUBST
++else
++  case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
++fi
++BIN_SH=xpg4; export BIN_SH # for Tru64
++DUALCASE=1; export DUALCASE # for MKS sh
++
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
 -if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
@@ -41591,7 +49189,7 @@
  
  relink_command=\"$relink_command\"
  
-@@ -3748,7 +5318,7 @@
+@@ -3748,7 +5381,7 @@
  "
  
  	if test "$fast_install" = yes; then
@@ -41600,7 +49198,7 @@
    program=lt-'$outputname'$exeext
    progdir=\"\$thisdir/$objdir\"
  
-@@ -3764,7 +5334,7 @@
+@@ -3764,7 +5397,7 @@
        $rm \"\$progdir/\$file\"
      fi"
  
@@ -41609,7 +49207,7 @@
  
      # relink executable if necessary
      if test -n \"\$relink_command\"; then
-@@ -3772,7 +5342,7 @@
+@@ -3772,7 +5405,7 @@
        else
  	$echo \"\$relink_command_output\" >&2
  	$rm \"\$progdir/\$file\"
@@ -41618,7 +49216,7 @@
        fi
      fi
  
-@@ -3782,13 +5352,13 @@
+@@ -3782,13 +5415,13 @@
      $rm \"\$progdir/\$file\"
    fi"
  	else
@@ -41634,7 +49232,7 @@
  
    if test -f \"\$progdir/\$program\"; then"
  
-@@ -3799,7 +5369,7 @@
+@@ -3799,7 +5432,7 @@
      $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
  
      # Some systems cannot cope with colon-terminated $shlibpath_var
@@ -41643,7 +49241,7 @@
      $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
  
      export $shlibpath_var
-@@ -3819,47 +5389,35 @@
+@@ -3819,47 +5452,35 @@
        # Run the actual program with our arguments.
  "
  	case $host in
@@ -41675,8 +49273,9 @@
  	  ;;
  	esac
  	$echo >> $output "\
-       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
 -      exit 1
++      \$echo \"\$0: cannot exec \$program \$*\"
 +      exit $EXIT_FAILURE
      fi
    else
@@ -41698,7 +49297,7 @@
        ;;
      esac
  
-@@ -3875,74 +5433,130 @@
+@@ -3875,74 +5496,130 @@
  	  oldobjs="$libobjs_save"
  	  build_libtool_libs=no
  	else
@@ -41877,13 +49476,14 @@
  	IFS="$save_ifs"
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
-@@ -3974,8 +5588,12 @@
+@@ -3974,8 +5651,12 @@
  	fi
        done
        # Quote the link command for shipping.
 -      relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
 +      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-       relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
 +      if test "$hardcode_automatic" = yes ; then
 +	relink_command=
 +      fi
@@ -41891,7 +49491,7 @@
  
        # Only create the output if not a dry run.
        if test -z "$run"; then
-@@ -3994,7 +5612,7 @@
+@@ -3994,7 +5675,7 @@
  		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
  		if test -z "$libdir"; then
  		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
@@ -41900,7 +49500,7 @@
  		fi
  		newdependency_libs="$newdependency_libs $libdir/$name"
  		;;
-@@ -4008,7 +5626,7 @@
+@@ -4008,7 +5689,7 @@
  	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  	      if test -z "$libdir"; then
  		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -41909,7 +49509,7 @@
  	      fi
  	      newdlfiles="$newdlfiles $libdir/$name"
  	    done
-@@ -4019,17 +5637,36 @@
+@@ -4019,17 +5700,36 @@
  	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
  	      if test -z "$libdir"; then
  		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
@@ -41948,7 +49548,7 @@
  	  esac
  	  $echo > $output "\
  # $outputname - a libtool library file
-@@ -4058,13 +5695,16 @@
+@@ -4058,13 +5758,16 @@
  # Is this an already installed library?
  installed=$installed
  
@@ -41966,7 +49566,7 @@
  	    $echo >> $output "\
  relink_command=\"$relink_command\""
  	  fi
-@@ -4077,7 +5717,7 @@
+@@ -4077,7 +5780,7 @@
        $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
        ;;
      esac
@@ -41975,7 +49575,7 @@
      ;;
  
    # libtool install mode
-@@ -4088,11 +5728,11 @@
+@@ -4088,11 +5791,11 @@
      # install_prog (especially on Windows NT).
      if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
         # Allow the use of GNU shtool's install command.
@@ -41989,7 +49589,7 @@
  	arg="\"$arg\""
  	;;
        esac
-@@ -4101,14 +5741,14 @@
+@@ -4101,14 +5804,14 @@
        shift
      else
        install_prog=
@@ -42006,7 +49606,7 @@
        arg="\"$arg\""
        ;;
      esac
-@@ -4126,28 +5766,31 @@
+@@ -4126,28 +5829,31 @@
      do
        if test -n "$dest"; then
  	files="$files $dest"
@@ -42046,7 +49646,7 @@
  	  continue
  	fi
  	;;
-@@ -4156,7 +5799,7 @@
+@@ -4156,7 +5862,7 @@
        # Aesthetically quote the argument.
        arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
        case $arg in
@@ -42055,7 +49655,7 @@
  	arg="\"$arg\""
  	;;
        esac
-@@ -4166,13 +5809,13 @@
+@@ -4166,13 +5872,13 @@
      if test -z "$install_prog"; then
        $echo "$modename: you must specify an install program" 1>&2
        $echo "$help" 1>&2
@@ -42071,7 +49671,7 @@
      fi
  
      if test -z "$files"; then
-@@ -4182,7 +5825,7 @@
+@@ -4182,7 +5888,7 @@
  	$echo "$modename: you must specify a destination" 1>&2
        fi
        $echo "$help" 1>&2
@@ -42080,7 +49680,7 @@
      fi
  
      # Strip any trailing slash from the destination.
-@@ -4200,10 +5843,10 @@
+@@ -4200,10 +5906,10 @@
  
        # Not a directory, so check to see that there is only one file specified.
        set dummy $files
@@ -42093,7 +49693,7 @@
        fi
      fi
      case $destdir in
-@@ -4215,7 +5858,7 @@
+@@ -4215,7 +5921,7 @@
  	*)
  	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
  	  $echo "$help" 1>&2
@@ -42102,7 +49702,7 @@
  	  ;;
  	esac
        done
-@@ -4240,11 +5883,11 @@
+@@ -4240,11 +5946,11 @@
  
        *.la)
  	# Check to see that this really is a libtool archive.
@@ -42116,7 +49716,7 @@
  	fi
  
  	library_names=
-@@ -4276,21 +5919,24 @@
+@@ -4276,21 +5982,24 @@
  
  	if test -n "$relink_command"; then
  	  # Determine the prefix the user has applied to our future dir.
@@ -42138,14 +49738,14 @@
  	  if test -n "$inst_prefix_dir"; then
  	    # Stick the inst_prefix_dir data into the link command.
 -	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
  	  else
 -	    relink_command=`$echo "$relink_command" | sed "s%@inst_prefix_dir@%%"`
-+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++	    relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
  	  fi
  
  	  $echo "$modename: warning: relinking \`$file'" 1>&2
-@@ -4298,7 +5944,7 @@
+@@ -4298,7 +6007,7 @@
  	  if $run eval "$relink_command"; then :
  	  else
  	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
@@ -42154,7 +49754,7 @@
  	  fi
  	fi
  
-@@ -4320,25 +5966,38 @@
+@@ -4320,25 +6029,38 @@
  	    $run eval "$striplib $destdir/$realname" || exit $?
  	  fi
  
@@ -42198,7 +49798,7 @@
  	  done
  	  IFS="$save_ifs"
  	fi
-@@ -4376,7 +6035,7 @@
+@@ -4376,7 +6098,7 @@
  	*)
  	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
  	  $echo "$help" 1>&2
@@ -42207,7 +49807,7 @@
  	  ;;
  	esac
  
-@@ -4394,7 +6053,7 @@
+@@ -4394,7 +6116,7 @@
  	  $show "$install_prog $staticobj $staticdest"
  	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
  	fi
@@ -42216,7 +49816,7 @@
  	;;
  
        *)
-@@ -4406,29 +6065,47 @@
+@@ -4406,29 +6128,47 @@
  	  destfile="$destdir/$destfile"
  	fi
  
@@ -42270,7 +49870,7 @@
  	  fi
  
  	  finalize=yes
-@@ -4450,28 +6127,22 @@
+@@ -4450,31 +6190,25 @@
  	  done
  
  	  relink_command=
@@ -42308,8 +49908,12 @@
 +	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
  	      outputname="$tmpdir/$file"
  	      # Replace the output file specification.
- 	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-@@ -4489,14 +6160,14 @@
+-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++	      relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+ 
+ 	      $show "$relink_command"
+ 	      if $run eval "$relink_command"; then :
+@@ -4489,14 +6223,14 @@
  	    fi
  	  else
  	    # Install the binary that we compiled earlier.
@@ -42327,7 +49931,7 @@
  	  case $file:$destfile in
  	  *.exe:*.exe)
  	    # this is ok
-@@ -4505,7 +6176,7 @@
+@@ -4505,7 +6239,7 @@
  	    destfile=$destfile.exe
  	    ;;
  	  *:*.exe)
@@ -42336,7 +49940,7 @@
  	    ;;
  	  esac
  	  ;;
-@@ -4526,16 +6197,17 @@
+@@ -4526,16 +6260,17 @@
        $show "$install_prog $file $oldlib"
        $run eval "$install_prog \$file \$oldlib" || exit $?
  
@@ -42356,7 +49960,7 @@
  	$show "$cmd"
  	$run eval "$cmd" || exit $?
        done
-@@ -4549,9 +6221,9 @@
+@@ -4549,9 +6284,9 @@
      if test -n "$current_libdirs"; then
        # Maybe just do a dry run.
        test -n "$run" && current_libdirs=" -n$current_libdirs"
@@ -42368,7 +49972,7 @@
      fi
      ;;
  
-@@ -4570,10 +6242,11 @@
+@@ -4570,10 +6305,11 @@
        for libdir in $libdirs; do
  	if test -n "$finish_cmds"; then
  	  # Do each command in the finish commands.
@@ -42381,7 +49985,7 @@
  	    $show "$cmd"
  	    $run eval "$cmd" || admincmds="$admincmds
         $cmd"
-@@ -4590,43 +6263,43 @@
+@@ -4590,43 +6326,43 @@
      fi
  
      # Exit here if they wanted silent mode.
@@ -42446,7 +50050,7 @@
      ;;
  
    # libtool execute mode
-@@ -4638,7 +6311,7 @@
+@@ -4638,7 +6374,7 @@
      if test -z "$cmd"; then
        $echo "$modename: you must specify a COMMAND" 1>&2
        $echo "$help"
@@ -42455,7 +50059,7 @@
      fi
  
      # Handle -dlopen flags immediately.
-@@ -4646,18 +6319,18 @@
+@@ -4646,18 +6382,18 @@
        if test ! -f "$file"; then
  	$echo "$modename: \`$file' is not a file" 1>&2
  	$echo "$help" 1>&2
@@ -42477,16 +50081,20 @@
  	fi
  
  	# Read the libtool library.
-@@ -4684,7 +6357,7 @@
+@@ -4683,8 +6419,10 @@
+ 	if test -f "$dir/$objdir/$dlname"; then
  	  dir="$dir/$objdir"
  	else
- 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
 -	  exit 1
-+	  exit $EXIT_FAILURE
++	  if test ! -f "$dir/$dlname"; then
++	    $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++	    exit $EXIT_FAILURE
++	  fi
  	fi
  	;;
  
-@@ -4724,7 +6397,7 @@
+@@ -4724,7 +6462,7 @@
        -*) ;;
        *)
  	# Do a test to see if this is really a libtool program.
@@ -42495,16 +50103,28 @@
  	  # If there is no directory component, then add one.
  	  case $file in
  	  */* | *\\*) . $file ;;
-@@ -4747,7 +6420,7 @@
+@@ -4747,13 +6485,13 @@
  	eval "export $shlibpath_var"
        fi
  
 -      # Restore saved enviroment variables
+-      if test "${save_LC_ALL+set}" = set; then
+-	LC_ALL="$save_LC_ALL"; export LC_ALL
+-      fi
+-      if test "${save_LANG+set}" = set; then
+-	LANG="$save_LANG"; export LANG
+-      fi
 +      # Restore saved environment variables
-       if test "${save_LC_ALL+set}" = set; then
- 	LC_ALL="$save_LC_ALL"; export LC_ALL
-       fi
-@@ -4764,7 +6437,7 @@
++      for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++      do
++	eval "if test \"\${save_$lt_var+set}\" = set; then
++		$lt_var=\$save_$lt_var; export $lt_var
++	      fi"
++      done
+ 
+       # Now prepare to actually exec the command.
+       exec_cmd="\$cmd$args"
+@@ -4764,7 +6502,7 @@
  	$echo "export $shlibpath_var"
        fi
        $echo "$cmd$args"
@@ -42513,7 +50133,7 @@
      fi
      ;;
  
-@@ -4792,24 +6465,25 @@
+@@ -4792,24 +6530,25 @@
      if test -z "$rm"; then
        $echo "$modename: you must specify an RM program" 1>&2
        $echo "$help" 1>&2
@@ -42544,7 +50164,7 @@
  	case " $rmdirs " in
  	  *" $objdir "*) ;;
  	  *) rmdirs="$rmdirs $objdir" ;;
-@@ -4833,7 +6507,7 @@
+@@ -4833,7 +6572,7 @@
        case $name in
        *.la)
  	# Possibly a libtool archive, so verify it.
@@ -42553,7 +50173,7 @@
  	  . $dir/$name
  
  	  # Delete the libtool libraries and symlinks.
-@@ -4841,18 +6515,27 @@
+@@ -4841,18 +6580,27 @@
  	    rmfiles="$rmfiles $objdir/$n"
  	  done
  	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
@@ -42585,7 +50205,7 @@
  		  exit_status=1
  		fi
  	      done
-@@ -4861,40 +6544,72 @@
+@@ -4861,40 +6609,72 @@
  
  	    if test -n "$old_library"; then
  	      # Do each command in the old_postuninstall commands.
@@ -42672,7 +50292,7 @@
  	  fi
  	fi
  	;;
-@@ -4902,6 +6617,7 @@
+@@ -4902,6 +6682,7 @@
        $show "$rm $rmfiles"
        $run $rm $rmfiles || exit_status=1
      done
@@ -42680,7 +50300,7 @@
  
      # Try to remove the ${objdir}s in the directories where we deleted files
      for dir in $rmdirs; do
-@@ -4917,20 +6633,20 @@
+@@ -4917,20 +6698,20 @@
    "")
      $echo "$modename: you must specify a MODE" 1>&2
      $echo "$generic_help" 1>&2
@@ -42704,7 +50324,7 @@
  fi
  
  # We need to display help for each of the modes.
-@@ -4949,6 +6665,7 @@
+@@ -4949,6 +6730,7 @@
      --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
      --quiet           same as \`--silent'
      --silent          don't print informational messages
@@ -42712,7 +50332,7 @@
      --version         print version information
  
  MODE must be one of the following:
-@@ -4962,8 +6679,10 @@
+@@ -4962,8 +6744,10 @@
        uninstall       remove libraries from an installed directory
  
  MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
@@ -42725,7 +50345,19 @@
    ;;
  
  clean)
-@@ -5074,6 +6793,9 @@
+@@ -5064,9 +6848,9 @@
+   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
+   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+   -export-symbols SYMFILE
+-		    try to export only the symbols listed in SYMFILE
++                    try to export only the symbols listed in SYMFILE
+   -export-symbols-regex REGEX
+-		    try to export only the symbols matching REGEX
++                    try to export only the symbols matching REGEX
+   -LLIBDIR          search LIBDIR for required installed libraries
+   -lNAME            OUTPUT-FILE requires the installed library libNAME
+   -module           build a library that can dlopened
+@@ -5074,12 +6858,17 @@
    -no-install       link a not-installable executable
    -no-undefined     declare that a library does not refer to external symbols
    -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
@@ -42735,7 +50367,17 @@
    -release RELEASE  specify package release information
    -rpath LIBDIR     the created library will eventually be installed in LIBDIR
    -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-@@ -5115,14 +6837,33 @@
+-  -static           do not do any dynamic linking of libtool libraries
++  -static           do not do any dynamic linking of uninstalled libtool libraries
++  -static-libtool-libs
++                    do not do any dynamic linking of libtool libraries
+   -version-info CURRENT[:REVISION[:AGE]]
+-		    specify library version info [each variable defaults to 0]
++                    specify library version info [each variable defaults to 0]
+ 
+ All other options (arguments beginning with \`-') are ignored.
+ 
+@@ -5115,14 +6904,33 @@
  *)
    $echo "$modename: invalid operation mode \`$mode'" 1>&2
    $echo "$help" 1>&2
@@ -42772,10 +50414,1018 @@
  
  # Local Variables:
  # mode:shell-script
-Index: libparagui1.0-1.0.4/missing
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/Makefile.in libparagui1.0-1.0.4/Makefile.in
+--- libparagui1.0-1.0.4.orig/Makefile.in	2003-07-07 11:05:59.000000000 +0200
++++ libparagui1.0-1.0.4/Makefile.in	2007-12-21 23:58:30.000000000 +0100
+@@ -1,6 +1,8 @@
+-# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
++# Makefile.in generated by automake 1.9.6 from Makefile.am.
++# @configure_input@
+ 
+-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004, 2005  Free Software Foundation, Inc.
+ # This Makefile.in is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -10,83 +12,148 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
++ at SET_MAKE@
+ 
+-SHELL = @SHELL@
+ 
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
+-
+-bindir = @bindir@
+-sbindir = @sbindir@
+-libexecdir = @libexecdir@
+-datadir = @datadir@
+-sysconfdir = @sysconfdir@
+-sharedstatedir = @sharedstatedir@
+-localstatedir = @localstatedir@
+-libdir = @libdir@
+-infodir = @infodir@
+-mandir = @mandir@
+-includedir = @includedir@
+-oldincludedir = /usr/include
+-
+-DESTDIR =
+-
+ pkgdatadir = $(datadir)/@PACKAGE@
+ pkglibdir = $(libdir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+-
+ top_builddir = .
+-
+-ACLOCAL = @ACLOCAL@
+-AUTOCONF = @AUTOCONF@
+-AUTOMAKE = @AUTOMAKE@
+-AUTOHEADER = @AUTOHEADER@
+-
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+-INSTALL_DATA = @INSTALL_DATA@
+-INSTALL_SCRIPT = @INSTALL_SCRIPT@
+-transform = @program_transform_name@
+-
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
+ NORMAL_INSTALL = :
+ PRE_INSTALL = :
+ POST_INSTALL = :
+ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+-host_alias = @host_alias@
++build_triplet = @build@
+ host_triplet = @host@
++target_triplet = @target@
++DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
++	$(srcdir)/Makefile.in $(srcdir)/paragui-config.in \
++	$(srcdir)/paragui.pc.in $(srcdir)/paragui.spec.in \
++	$(top_srcdir)/configure AUTHORS COPYING INSTALL TODO \
++	config.guess config.sub depcomp install-sh ltmain.sh missing
++subdir = .
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++	$(ACLOCAL_M4)
++am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
++ configure.lineno configure.status.lineno
++mkinstalldirs = $(install_sh) -d
++CONFIG_HEADER = $(top_builddir)/include/paraconfig_gnu.h
++CONFIG_CLEAN_FILES = paragui.spec paragui-config paragui.pc
++am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)" \
++	"$(DESTDIR)$(pkgconfigdir)"
++binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
++SCRIPTS = $(bin_SCRIPTS)
++SOURCES =
++DIST_SOURCES =
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++m4dataDATA_INSTALL = $(INSTALL_DATA)
++pkgconfigDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(m4data_DATA) $(pkgconfig_DATA)
++ETAGS = etags
++CTAGS = ctags
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++distdir = $(PACKAGE)-$(VERSION)
++top_distdir = $(distdir)
++am__remove_distdir = \
++  { test ! -d $(distdir) \
++    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
++         && rm -fr $(distdir); }; }
++DIST_ARCHIVES = $(distdir).tar.gz
++GZIP_ENV = --best
++distuninstallcheck_listfiles = find . -type f -print
++distcleancheck_listfiles = find . -type f -print
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AR = @AR@
+ AS = @AS@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
+ BINDINGS = @BINDINGS@
+ CC = @CC@
++CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
++CPPFLAGS = @CPPFLAGS@
+ CXX = @CXX@
++CXXCPP = @CXXCPP@
++CXXDEPMODE = @CXXDEPMODE@
+ CXXFLAGS = @CXXFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
+ DLLTOOL = @DLLTOOL@
+ ECHO = @ECHO@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EGREP = @EGREP@
+ EXEEXT = @EXEEXT@
+ EXPAT_INCLUDE = @EXPAT_INCLUDE@
+ EXPAT_LIB = @EXPAT_LIB@
+ EXPAT_SUBDIR = @EXPAT_SUBDIR@
++F77 = @F77@
++FFLAGS = @FFLAGS@
++GREP = @GREP@
+ IMAGE_INCLUDE = @IMAGE_INCLUDE@
+ IMAGE_LIBS = @IMAGE_LIBS@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++LDFLAGS = @LDFLAGS@
+ LIBEXPAT = @LIBEXPAT@
++LIBOBJS = @LIBOBJS@
+ LIBPHYSFS = @LIBPHYSFS@
++LIBS = @LIBS@
+ LIBSTDCPP = @LIBSTDCPP@
+ LIBTOOL = @LIBTOOL@
+ LN_S = @LN_S@
++LTLIBOBJS = @LTLIBOBJS@
+ LT_AGE = @LT_AGE@
+ LT_CURRENT = @LT_CURRENT@
+ LT_RELEASE = @LT_RELEASE@
+ LT_REVISION = @LT_REVISION@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+ MAKEINFO = @MAKEINFO@
+ OBJDUMP = @OBJDUMP@
+ OBJEXT = @OBJEXT@
+ PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
+ PARAGUI_BINARY_AGE = @PARAGUI_BINARY_AGE@
+ PARAGUI_CFLAGS = @PARAGUI_CFLAGS@
+ PARAGUI_INTERFACE_AGE = @PARAGUI_INTERFACE_AGE@
+@@ -95,6 +162,7 @@
+ PARAGUI_MICRO_VERSION = @PARAGUI_MICRO_VERSION@
+ PARAGUI_MINOR_VERSION = @PARAGUI_MINOR_VERSION@
+ PARAGUI_VERSION = @PARAGUI_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
+ PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
+ PHYSFS_LIB = @PHYSFS_LIB@
+ PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
+@@ -110,153 +178,193 @@
+ SDL_CONFIG = @SDL_CONFIG@
+ SDL_LIBS = @SDL_LIBS@
+ SDL_PREFIX = @SDL_PREFIX@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
+ STRIP = @STRIP@
+ SWIG = @SWIG@
+ SYSTEM_LIBS = @SYSTEM_LIBS@
+ TOP_BUILDDIR = @TOP_BUILDDIR@
+ VERSION = @VERSION@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_CXX = @ac_ct_CXX@
++ac_ct_F77 = @ac_ct_F77@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
++am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++am__tar = @am__tar@
++am__untar = @am__untar@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++datarootdir = @datarootdir@
++docdir = @docdir@
++dvidir = @dvidir@
++exec_prefix = @exec_prefix@
+ freetype_config = @freetype_config@
+-
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++htmldir = @htmldir@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localedir = @localedir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++pdfdir = @pdfdir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++psdir = @psdir@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++subdirs = @subdirs@
++sysconfdir = @sysconfdir@
++target = @target@
++target_alias = @target_alias@
++target_cpu = @target_cpu@
++target_os = @target_os@
++target_vendor = @target_vendor@
+ DISTCHECK_CONFIGURE_FLAGS = --enable-internalexpat --enable-internalphysfs
+-
+ SUBDIRS = include src data bindings test
+-
+ DIST_SUBDIRS = $(SUBDIRS) sdk doc
+-
+ bin_SCRIPTS = paragui-config
+-
+-EXTRA_DIST =  	paragui.m4 	paragui.spec.in 	paragui.pc.in 	paragui.dev 	README 	README-ParaGUI.txt 	COPYING 	INSTALL 	TODO 	VisualC.zip 	mkdist-beos.sh 	CWparagui.txt 	CWProject.zip
+-
++EXTRA_DIST = \
++	paragui.m4 \
++	paragui.spec.in \
++	paragui.pc.in \
++	paragui.dev \
++	README \
++	README-ParaGUI.txt \
++	COPYING \
++	INSTALL \
++	TODO \
++	VisualC.zip \
++	mkdist-beos.sh \
++	CWparagui.txt \
++	CWProject.zip
+ 
+ m4datadir = $(datadir)/aclocal
+ m4data_DATA = paragui.m4
+-
+ pkgconfigdir = $(prefix)/lib/pkgconfig
+ pkgconfig_DATA = paragui.pc
+-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+-CONFIG_HEADER = ./include/paraconfig_gnu.h
+-CONFIG_CLEAN_FILES =  paragui.spec paragui-config paragui.pc
+-SCRIPTS =  $(bin_SCRIPTS)
+-
+-DATA =  $(m4data_DATA) $(pkgconfig_DATA)
+-
+-DIST_COMMON =  README AUTHORS COPYING INSTALL Makefile.am Makefile.in \
+-TODO aclocal.m4 config.guess config.sub configure configure.in \
+-include/paraconfig_gnu.h.in include/stamp-h.in install-sh ltmain.sh \
+-missing mkinstalldirs paragui-config.in paragui.pc.in paragui.spec.in
+-
+-
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
++all: all-recursive
+ 
+-TAR = gtar
+-GZIP_ENV = --best
+-all: all-redirect
+ .SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps Makefile
+-
+-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-
+-$(ACLOCAL_M4):  configure.in 
+-	cd $(srcdir) && $(ACLOCAL)
++am--refresh:
++	@:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
++	@for dep in $?; do \
++	  case '$(am__configure_deps)' in \
++	    *$$dep*) \
++	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
++	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
++		&& exit 0; \
++	      exit 1;; \
++	  esac; \
++	done; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
++	cd $(top_srcdir) && \
++	  $(AUTOMAKE) --foreign  Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++	@case '$?' in \
++	  *config.status*) \
++	    echo ' $(SHELL) ./config.status'; \
++	    $(SHELL) ./config.status;; \
++	  *) \
++	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
++	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
++	esac;
+ 
+-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+ 	$(SHELL) ./config.status --recheck
+-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+-	cd $(srcdir) && $(AUTOCONF)
+-
+-include/paraconfig_gnu.h: include/stamp-h
+-	@if test ! -f $@; then \
+-		rm -f include/stamp-h; \
+-		$(MAKE) include/stamp-h; \
+-	else :; fi
+-include/stamp-h: $(srcdir)/include/paraconfig_gnu.h.in $(top_builddir)/config.status
+-	cd $(top_builddir) \
+-	  && CONFIG_FILES= CONFIG_HEADERS=include/paraconfig_gnu.h:include/paraconfig_gnu.h.in \
+-	     $(SHELL) ./config.status
+-	@echo timestamp > include/stamp-h 2> /dev/null
+-$(srcdir)/include/paraconfig_gnu.h.in: $(srcdir)/include/stamp-h.in
+-	@if test ! -f $@; then \
+-		rm -f $(srcdir)/include/stamp-h.in; \
+-		$(MAKE) $(srcdir)/include/stamp-h.in; \
+-	else :; fi
+-$(srcdir)/include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOHEADER)
+-	@echo timestamp > $(srcdir)/include/stamp-h.in 2> /dev/null
+-
+-mostlyclean-hdr:
+-
+-clean-hdr:
+-
+-distclean-hdr:
+-	-rm -f include/paraconfig_gnu.h
+-
+-maintainer-clean-hdr:
+-paragui.spec: $(top_builddir)/config.status paragui.spec.in
+-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-paragui-config: $(top_builddir)/config.status paragui-config.in
+-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+-paragui.pc: $(top_builddir)/config.status paragui.pc.in
+-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ 
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++	cd $(srcdir) && $(AUTOCONF)
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
++paragui.spec: $(top_builddir)/config.status $(srcdir)/paragui.spec.in
++	cd $(top_builddir) && $(SHELL) ./config.status $@
++paragui-config: $(top_builddir)/config.status $(srcdir)/paragui-config.in
++	cd $(top_builddir) && $(SHELL) ./config.status $@
++paragui.pc: $(top_builddir)/config.status $(srcdir)/paragui.pc.in
++	cd $(top_builddir) && $(SHELL) ./config.status $@
+ install-binSCRIPTS: $(bin_SCRIPTS)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(bindir)
++	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+ 	@list='$(bin_SCRIPTS)'; for p in $$list; do \
+-	  if test -f $$p; then \
+-	    echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+-	    $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+-	  else if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \
+-	    $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
+-	  else :; fi; fi; \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  if test -f $$d$$p; then \
++	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
++	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
++	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
++	  else :; fi; \
+ 	done
+ 
+ uninstall-binSCRIPTS:
+ 	@$(NORMAL_UNINSTALL)
+-	list='$(bin_SCRIPTS)'; for p in $$list; do \
+-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \
++	@list='$(bin_SCRIPTS)'; for p in $$list; do \
++	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
++	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
+ 	done
+ 
++mostlyclean-libtool:
++	-rm -f *.lo
++
++clean-libtool:
++	-rm -rf .libs _libs
++
++distclean-libtool:
++	-rm -f libtool
++uninstall-info-am:
+ install-m4dataDATA: $(m4data_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(m4datadir)
++	test -z "$(m4datadir)" || $(mkdir_p) "$(DESTDIR)$(m4datadir)"
+ 	@list='$(m4data_DATA)'; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(m4datadir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(m4datadir)/$$p; \
+-	  fi; fi; \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f=$(am__strip_dir) \
++	  echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \
++	  $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \
+ 	done
+ 
+ uninstall-m4dataDATA:
+ 	@$(NORMAL_UNINSTALL)
+-	list='$(m4data_DATA)'; for p in $$list; do \
+-	  rm -f $(DESTDIR)$(m4datadir)/$$p; \
++	@list='$(m4data_DATA)'; for p in $$list; do \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(m4datadir)/$$f"; \
+ 	done
+-
+ install-pkgconfigDATA: $(pkgconfig_DATA)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
++	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+ 	@list='$(pkgconfig_DATA)'; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkgconfigdir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(pkgconfigdir)/$$p; \
+-	  fi; fi; \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  f=$(am__strip_dir) \
++	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
++	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ 	done
+ 
+ uninstall-pkgconfigDATA:
+ 	@$(NORMAL_UNINSTALL)
+-	list='$(pkgconfig_DATA)'; for p in $$list; do \
+-	  rm -f $(DESTDIR)$(pkgconfigdir)/$$p; \
++	@list='$(pkgconfig_DATA)'; for p in $$list; do \
++	  f=$(am__strip_dir) \
++	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
++	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
+ 	done
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+@@ -265,13 +373,14 @@
+ # (1) if the variable is set in `config.status', edit `config.status'
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
+-
+- at SET_MAKE@
+-
+-all-recursive install-data-recursive install-exec-recursive \
+-installdirs-recursive install-recursive uninstall-recursive  \
+-check-recursive installcheck-recursive info-recursive dvi-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++$(RECURSIVE_TARGETS):
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -283,7 +392,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -291,13 +400,24 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  test "$$subdir" != "." || dot_seen=yes; \
++	case "$@" in \
++	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++	  *) list='$(SUBDIRS)' ;; \
++	esac; \
++	rev=''; for subdir in $$list; do \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+@@ -307,181 +427,325 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ 	done
++ctags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++	done
+ 
+-tags: TAGS
+-
+-ID: $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
++	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	here=`pwd` && cd $(srcdir) \
+-	  && mkid -f$$here/ID $$unique $(LISP)
++	mkid -fID $$unique
++tags: TAGS
+ 
+-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
++	  include_option=--etags-include; \
++	  empty_fix=.; \
++	else \
++	  include_option=--include; \
++	  empty_fix=; \
++	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+-   if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+-   fi; \
++	  if test "$$subdir" = .; then :; else \
++	    test ! -f $$subdir/TAGS || \
++	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++	  fi; \
+ 	done; \
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+-
+-mostlyclean-tags:
++	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
++	  test -n "$$unique" || unique=$$empty_fix; \
++	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
++	    $$tags $$unique; \
++	fi
++ctags: CTAGS
++CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
++	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
++	unique=`for i in $$list; do \
++	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
++	  done | \
++	  $(AWK) '    { files[$$0] = 1; } \
++	       END { for (i in files) print i; }'`; \
++	test -z "$(CTAGS_ARGS)$$tags$$unique" \
++	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
++	     $$tags $$unique
+ 
+-clean-tags:
++GTAGS:
++	here=`$(am__cd) $(top_builddir) && pwd` \
++	  && cd $(top_srcdir) \
++	  && gtags -i $(GTAGS_ARGS) $$here
+ 
+ distclean-tags:
+-	-rm -f TAGS ID
+-
+-maintainer-clean-tags:
+-
+-distdir = $(PACKAGE)-$(VERSION)
+-top_distdir = $(distdir)
++	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+ 
+-# This target untars the dist file and tries a VPATH configuration.  Then
+-# it guarantees that the distribution is self-contained by making another
+-# tarfile.
+-distcheck: dist
+-	-rm -rf $(distdir)
+-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
+-	mkdir $(distdir)/=build
+-	mkdir $(distdir)/=inst
+-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+-	cd $(distdir)/=build \
+-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+-	  && $(MAKE) $(AM_MAKEFLAGS) \
+-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+-	  && $(MAKE) $(AM_MAKEFLAGS) check \
+-	  && $(MAKE) $(AM_MAKEFLAGS) install \
+-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+-	  && $(MAKE) $(AM_MAKEFLAGS) dist
+-	-rm -rf $(distdir)
+-	@banner="$(distdir).tar.gz is ready for distribution"; \
+-	dashes=`echo "$$banner" | sed s/./=/g`; \
+-	echo "$$dashes"; \
+-	echo "$$banner"; \
+-	echo "$$dashes"
+-dist: distdir
+-	-chmod -R a+r $(distdir)
+-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+-	-rm -rf $(distdir)
+-dist-all: distdir
+-	-chmod -R a+r $(distdir)
+-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
+-	-rm -rf $(distdir)
+ distdir: $(DISTFILES)
+-	-rm -rf $(distdir)
++	$(am__remove_distdir)
+ 	mkdir $(distdir)
+-	-chmod 777 $(distdir)
+-	@for file in $(DISTFILES); do \
+-	  d=$(srcdir); \
++	$(mkdir_p) $(distdir)/.
++	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++	list='$(DISTFILES)'; for file in $$list; do \
++	  case $$file in \
++	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++	  esac; \
++	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++	    dir="/$$dir"; \
++	    $(mkdir_p) "$(distdir)$$dir"; \
++	  else \
++	    dir=''; \
++	  fi; \
+ 	  if test -d $$d/$$file; then \
+-	    cp -pr $$d/$$file $(distdir)/$$file; \
++	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++	    fi; \
++	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+ 	  else \
+ 	    test -f $(distdir)/$$file \
+-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
++	    || cp -p $$d/$$file $(distdir)/$$file \
++	    || exit 1; \
+ 	  fi; \
+ 	done
+-	for subdir in $(DIST_SUBDIRS); do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+-	    chmod 777 $(distdir)/$$subdir; \
+-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
++	    (cd $$subdir && \
++	      $(MAKE) $(AM_MAKEFLAGS) \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
++	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
+-	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
+-info-am:
+-info: info-recursive
+-dvi-am:
+-dvi: dvi-recursive
++	$(MAKE) $(AM_MAKEFLAGS) \
++	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
++	  dist-hook
++	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
++	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
++	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
++	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
++	|| chmod -R a+r $(distdir)
++dist-gzip: distdir
++	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	$(am__remove_distdir)
++
++dist-bzip2: distdir
++	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
++	$(am__remove_distdir)
++
++dist-tarZ: distdir
++	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
++	$(am__remove_distdir)
++
++dist-shar: distdir
++	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
++	$(am__remove_distdir)
++
++dist-zip: distdir
++	-rm -f $(distdir).zip
++	zip -rq $(distdir).zip $(distdir)
++	$(am__remove_distdir)
++
++dist dist-all: distdir
++	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
++	$(am__remove_distdir)
++
++# This target untars the dist file and tries a VPATH configuration.  Then
++# it guarantees that the distribution is self-contained by making another
++# tarfile.
++distcheck: dist
++	case '$(DIST_ARCHIVES)' in \
++	*.tar.gz*) \
++	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
++	*.tar.bz2*) \
++	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
++	*.tar.Z*) \
++	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
++	*.shar.gz*) \
++	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
++	*.zip*) \
++	  unzip $(distdir).zip ;;\
++	esac
++	chmod -R a-w $(distdir); chmod a+w $(distdir)
++	mkdir $(distdir)/_build
++	mkdir $(distdir)/_inst
++	chmod a-w $(distdir)
++	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
++	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
++	  && cd $(distdir)/_build \
++	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
++	    $(DISTCHECK_CONFIGURE_FLAGS) \
++	  && $(MAKE) $(AM_MAKEFLAGS) \
++	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
++	  && $(MAKE) $(AM_MAKEFLAGS) check \
++	  && $(MAKE) $(AM_MAKEFLAGS) install \
++	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
++	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
++	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
++	        distuninstallcheck \
++	  && chmod -R a-w "$$dc_install_base" \
++	  && ({ \
++	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
++	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
++	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
++	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
++	  && rm -rf "$$dc_destdir" \
++	  && $(MAKE) $(AM_MAKEFLAGS) dist \
++	  && rm -rf $(DIST_ARCHIVES) \
++	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
++	$(am__remove_distdir)
++	@(echo "$(distdir) archives ready for distribution: "; \
++	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
++	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
++distuninstallcheck:
++	@cd $(distuninstallcheck_dir) \
++	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
++	   || { echo "ERROR: files left after uninstall:" ; \
++	        if test -n "$(DESTDIR)"; then \
++	          echo "  (check DESTDIR support)"; \
++	        fi ; \
++	        $(distuninstallcheck_listfiles) ; \
++	        exit 1; } >&2
++distcleancheck: distclean
++	@if test '$(srcdir)' = . ; then \
++	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
++	  exit 1 ; \
++	fi
++	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
++	  || { echo "ERROR: files left in build directory after distclean:" ; \
++	       $(distcleancheck_listfiles) ; \
++	       exit 1; } >&2
+ check-am: all-am
+ check: check-recursive
+-installcheck-am:
+-installcheck: installcheck-recursive
+-install-exec-am: install-binSCRIPTS
++all-am: Makefile $(SCRIPTS) $(DATA)
++installdirs: installdirs-recursive
++installdirs-am:
++	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
++install: install-recursive
+ install-exec: install-exec-recursive
+-
+-install-data-am: install-m4dataDATA install-pkgconfigDATA
+ install-data: install-data-recursive
++uninstall: uninstall-recursive
+ 
+ install-am: all-am
+ 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+-install: install-recursive
+-uninstall-am: uninstall-binSCRIPTS uninstall-m4dataDATA \
+-		uninstall-pkgconfigDATA
+-uninstall: uninstall-recursive
+-all-am: Makefile $(SCRIPTS) $(DATA)
+-all-redirect: all-recursive
+-install-strip:
+-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+-installdirs: installdirs-recursive
+-installdirs-am:
+-	$(mkinstalldirs)  $(DESTDIR)$(bindir) $(DESTDIR)$(m4datadir) \
+-		$(DESTDIR)$(pkgconfigdir)
+-
+ 
++installcheck: installcheck-recursive
++install-strip:
++	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++	  `test -z '$(STRIP)' || \
++	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+ mostlyclean-generic:
+ 
+ clean-generic:
+ 
+ distclean-generic:
+-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
++	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+ 
+ maintainer-clean-generic:
+-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
++	@echo "This command is intended for maintainers to use"
++	@echo "it deletes files that may require special tools to rebuild."
++clean: clean-recursive
+ 
+-mostlyclean: mostlyclean-recursive
++clean-am: clean-generic clean-libtool mostlyclean-am
+ 
+-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
++distclean: distclean-recursive
++	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
++	-rm -f Makefile
++distclean-am: clean-am distclean-generic distclean-libtool \
++	distclean-local distclean-tags
+ 
+-clean: clean-recursive
++dvi: dvi-recursive
+ 
+-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am
+-	-rm -f libtool
++dvi-am:
+ 
+-distclean: distclean-recursive
+-	-rm -f config.status
++html: html-recursive
+ 
+-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
+-		maintainer-clean-generic distclean-am
+-	@echo "This command is intended for maintainers to use;"
+-	@echo "it deletes files that may require special tools to rebuild."
++info: info-recursive
++
++info-am:
++
++install-data-am: install-m4dataDATA install-pkgconfigDATA
++
++install-exec-am: install-binSCRIPTS
++
++install-info: install-info-recursive
++
++install-man:
++
++installcheck-am:
+ 
+ maintainer-clean: maintainer-clean-recursive
+-	-rm -f config.status
++	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
++	-rm -rf $(top_srcdir)/autom4te.cache
++	-rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
+ 
+-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+-uninstall-binSCRIPTS install-binSCRIPTS uninstall-m4dataDATA \
+-install-m4dataDATA uninstall-pkgconfigDATA install-pkgconfigDATA \
+-install-data-recursive uninstall-data-recursive install-exec-recursive \
+-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+-all-recursive check-recursive installcheck-recursive info-recursive \
+-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
+-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
+-install-exec install-data-am install-data install-am install \
+-uninstall-am uninstall all-redirect all-am all installdirs-am \
+-installdirs mostlyclean-generic distclean-generic clean-generic \
+-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-recursive
++
++mostlyclean-am: mostlyclean-generic mostlyclean-libtool
++
++pdf: pdf-recursive
++
++pdf-am:
++
++ps: ps-recursive
++
++ps-am:
++
++uninstall-am: uninstall-binSCRIPTS uninstall-info-am \
++	uninstall-m4dataDATA uninstall-pkgconfigDATA
++
++uninstall-info: uninstall-info-recursive
++
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
++	check-am clean clean-generic clean-libtool clean-recursive \
++	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
++	dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
++	distclean-generic distclean-libtool distclean-local \
++	distclean-recursive distclean-tags distcleancheck distdir \
++	distuninstallcheck dvi dvi-am html html-am info info-am \
++	install install-am install-binSCRIPTS install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-m4dataDATA install-man \
++	install-pkgconfigDATA install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-generic mostlyclean-libtool \
++	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
++	uninstall uninstall-am uninstall-binSCRIPTS uninstall-info-am \
++	uninstall-m4dataDATA uninstall-pkgconfigDATA
+ 
+ 
+ $(PACKAGE)-$(VERSION).tar.gz: dist
+diff -Nurd libparagui1.0-1.0.4.orig/missing libparagui1.0-1.0.4/missing
 --- libparagui1.0-1.0.4.orig/missing	2003-04-16 11:01:50.000000000 +0200
-+++ libparagui1.0-1.0.4/missing	2006-06-15 22:26:28.000000000 +0200
++++ libparagui1.0-1.0.4/missing	2007-12-21 23:58:30.000000000 +0100
 @@ -1,7 +1,11 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -43107,10 +51757,9 @@
 +# time-stamp-format: "%:y-%02m-%02d.%02H"
 +# time-stamp-end: "$"
 +# End:
-Index: libparagui1.0-1.0.4/mkinstalldirs
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/mkinstalldirs libparagui1.0-1.0.4/mkinstalldirs
 --- libparagui1.0-1.0.4.orig/mkinstalldirs	2003-04-16 11:01:50.000000000 +0200
-+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ libparagui1.0-1.0.4/mkinstalldirs	1970-01-01 01:00:00.000000000 +0100
 @@ -1,40 +0,0 @@
 -#! /bin/sh
 -# mkinstalldirs --- make directory hierarchy
@@ -43152,10 +51801,9 @@
 -exit $errstatus
 -
 -# mkinstalldirs ends here
-Index: libparagui1.0-1.0.4/sdk/Makefile.in
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/sdk/Makefile.in libparagui1.0-1.0.4/sdk/Makefile.in
 --- libparagui1.0-1.0.4.orig/sdk/Makefile.in	2003-07-07 11:06:25.000000000 +0200
-+++ libparagui1.0-1.0.4/sdk/Makefile.in	2006-06-15 22:26:29.000000000 +0200
++++ libparagui1.0-1.0.4/sdk/Makefile.in	2007-12-21 23:59:16.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -43319,10 +51967,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,120 +139,235 @@
+@@ -110,120 +139,236 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -43388,22 +52037,13 @@
 +	sampleapp.tar.gz
  
 -EXTRA_DIST =  	README.sampleapp 	sampleapp.tar.gz
--
++all: all-am
+ 
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 -CONFIG_HEADER = ../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
 -DIST_COMMON =  Makefile.am Makefile.in
--
--
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+all: all-am
- 
--TAR = gtar
--GZIP_ENV = --best
--all: all-redirect
- .SUFFIXES:
--$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps sdk/Makefile
++.SUFFIXES:
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -43413,9 +52053,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  sdk/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  sdk/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  sdk/Makefile
++	  $(AUTOMAKE) --gnu  sdk/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -43425,15 +52065,22 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-TAR = gtar
+-GZIP_ENV = --best
+-all: all-redirect
+-.SUFFIXES:
+-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps sdk/Makefile
 +mostlyclean-libtool:
 +	-rm -f *.lo
  
@@ -43577,8 +52224,6 @@
  maintainer-clean: maintainer-clean-am
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
  
 -.PHONY: tags distdir info-am info dvi-am dvi check check-am \
 -installcheck-am installcheck install-exec-am install-exec \
@@ -43586,6 +52231,8 @@
 -all-redirect all-am all installdirs mostlyclean-generic \
 -distclean-generic clean-generic maintainer-clean-generic clean \
 -mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-am
++
 +mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 +
 +pdf: pdf-am
@@ -43617,10 +52264,9 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/src/Makefile.in
-===================================================================
---- libparagui1.0-1.0.4.orig/src/Makefile.in	2003-07-07 11:06:02.000000000 +0200
-+++ libparagui1.0-1.0.4/src/Makefile.in	2006-06-15 22:26:29.000000000 +0200
+diff -Nurd libparagui1.0-1.0.4.orig/src/core/Makefile.in libparagui1.0-1.0.4/src/core/Makefile.in
+--- libparagui1.0-1.0.4.orig/src/core/Makefile.in	2003-07-07 11:06:06.000000000 +0200
++++ libparagui1.0-1.0.4/src/core/Makefile.in	2007-12-21 23:59:16.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -43632,7 +52278,7 @@
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -10,83 +12,146 @@
+@@ -10,83 +12,131 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -43665,7 +52311,7 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
 -
- top_builddir = ..
+ top_builddir = ../..
 -
 -ACLOCAL = @ACLOCAL@
 -AUTOCONF = @AUTOCONF@
@@ -43694,7 +52340,7 @@
 +build_triplet = @build@
  host_triplet = @host@
 +target_triplet = @target@
-+subdir = src
++subdir = src/core
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -43703,23 +52349,14 @@
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/include/paraconfig_gnu.h
 +CONFIG_CLEAN_FILES =
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-+am__installdirs = "$(DESTDIR)$(libdir)"
-+libLTLIBRARIES_INSTALL = $(INSTALL)
-+LTLIBRARIES = $(lib_LTLIBRARIES)
-+am__DEPENDENCIES_1 =
-+libparagui_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) ./draw/libpgdraw.la ./font/libpgfont.la \
-+	./core/libpgcore.la ./widgets/libpgwidgets.la \
-+	./themes/libtheme.la $(am__DEPENDENCIES_1)
-+am_libparagui_la_OBJECTS = paragui.lo
-+libparagui_la_OBJECTS = $(am_libparagui_la_OBJECTS)
++LTLIBRARIES = $(noinst_LTLIBRARIES)
++libpgcore_la_DEPENDENCIES =
++am_libpgcore_la_OBJECTS = physfsrwops.lo missing.lo pgdatacontainer.lo \
++	pgapplication.lo pgcolors.lo pgeventobject.lo pgfilearchive.lo \
++	pgfile.lo pglog.lo pgmain.lo pgmessageobject.lo pgmsgmap.lo \
++	pgnavigator.lo pgrectlist.lo pgsurfacecache.lo \
++	pgtimerobject.lo
++libpgcore_la_OBJECTS = $(am_libpgcore_la_OBJECTS)
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
@@ -43731,14 +52368,8 @@
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libparagui_la_SOURCES)
-+DIST_SOURCES = $(libparagui_la_SOURCES)
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
++SOURCES = $(libpgcore_la_SOURCES)
++DIST_SOURCES = $(libpgcore_la_SOURCES)
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -43812,7 +52443,7 @@
  PARAGUI_BINARY_AGE = @PARAGUI_BINARY_AGE@
  PARAGUI_CFLAGS = @PARAGUI_CFLAGS@
  PARAGUI_INTERFACE_AGE = @PARAGUI_INTERFACE_AGE@
-@@ -95,6 +160,7 @@
+@@ -95,6 +145,7 @@
  PARAGUI_MICRO_VERSION = @PARAGUI_MICRO_VERSION@
  PARAGUI_MINOR_VERSION = @PARAGUI_MINOR_VERSION@
  PARAGUI_VERSION = @PARAGUI_VERSION@
@@ -43820,10 +52451,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,126 +176,183 @@
+@@ -110,108 +161,184 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -43885,38 +52517,54 @@
 +target_cpu = @target_cpu@
 +target_os = @target_os@
 +target_vendor = @target_vendor@
- SUBDIRS = $(PHYSFS_SUBDIR) $(EXPAT_SUBDIR) draw font themes core widgets
+ noinst_LTLIBRARIES = libpgcore.la
 -
- DIST_SUBDIRS = draw font themes core widgets expat physfs
+-libpgcore_la_SOURCES =  	physfsrwops.cpp 	missing.cpp 	pgdatacontainer.cpp 	pgapplication.cpp 	pgcolors.cpp 	pgeventobject.cpp 	pgfilearchive.cpp 	pgfile.cpp 	pglog.cpp 	pgmain.cpp 	pgmessageobject.cpp 	pgmsgmap.cpp 	pgnavigator.cpp 	pgrectlist.cpp 	pgsurfacecache.cpp 	pgtimerobject.cpp
 -
- lib_LTLIBRARIES = libparagui.la
-+libparagui_la_SOURCES = \
-+	paragui.cpp
++libpgcore_la_SOURCES = \
++	physfsrwops.cpp \
++	missing.cpp \
++	pgdatacontainer.cpp \
++	pgapplication.cpp \
++	pgcolors.cpp \
++	pgeventobject.cpp \
++	pgfilearchive.cpp \
++	pgfile.cpp \
++	pglog.cpp \
++	pgmain.cpp \
++	pgmessageobject.cpp \
++	pgmsgmap.cpp \
++	pgnavigator.cpp \
++	pgrectlist.cpp \
++	pgsurfacecache.cpp \
++	pgtimerobject.cpp
  
--libparagui_la_SOURCES =  	paragui.cpp
+ libpgcore_la_LIBADD = 
++EXTRA_DIST = \
++	physfsrwops.h \
++	pgmsgmap.h
+ 
+-EXTRA_DIST =  	physfsrwops.h 	pgmsgmap.h
 -
 -
--libparagui_la_LDFLAGS =  	-release $(LT_RELEASE) 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-INCLUDES =  	$(SDL_CFLAGS) 	$(PHYSFS_INCLUDE) 	-I$(top_srcdir)/include
 -
--
--libparagui_la_LIBADD =  	$(SDL_LIBS) 	$(IMAGE_LIBS) 	$(EXPAT_LIB) 	$(PHYSFS_LIB) 	./draw/libpgdraw.la 	./font/libpgfont.la 	./core/libpgcore.la 	./widgets/libpgwidgets.la 	./themes/libtheme.la 	$(LIBSTDCPP)
--
--
--INCLUDES =  	$(SDL_CFLAGS) 	-I$(top_srcdir)/include
--
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = ../include/paraconfig_gnu.h
+-CONFIG_HEADER = ../../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(lib_LTLIBRARIES)
+-LTLIBRARIES =  $(noinst_LTLIBRARIES)
 -
 -
--DEFS = @DEFS@ -I. -I$(srcdir) -I../include
+-DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
 -CPPFLAGS = @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
--libparagui_la_DEPENDENCIES =  ./draw/libpgdraw.la ./font/libpgfont.la \
--./core/libpgcore.la ./widgets/libpgwidgets.la ./themes/libtheme.la
--libparagui_la_OBJECTS =  paragui.lo
+-libpgcore_la_LDFLAGS = 
+-libpgcore_la_DEPENDENCIES = 
+-libpgcore_la_OBJECTS =  physfsrwops.lo missing.lo pgdatacontainer.lo \
+-pgapplication.lo pgcolors.lo pgeventobject.lo pgfilearchive.lo \
+-pgfile.lo pglog.lo pgmain.lo pgmessageobject.lo pgmsgmap.lo \
+-pgnavigator.lo pgrectlist.lo pgsurfacecache.lo pgtimerobject.lo
 -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -CXXLD = $(CXX)
@@ -43925,52 +52573,26 @@
 -
 -
 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+libparagui_la_LDFLAGS = \
-+	-release $(LT_RELEASE) \
-+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+
-+libparagui_la_LIBADD = \
-+	$(SDL_LIBS) \
-+	$(IMAGE_LIBS) \
-+	$(EXPAT_LIB) \
-+	$(PHYSFS_LIB) \
-+	./draw/libpgdraw.la \
-+	./font/libpgfont.la \
-+	./core/libpgcore.la \
-+	./widgets/libpgwidgets.la \
-+	./themes/libtheme.la \
-+	$(LIBSTDCPP)
-+
 +INCLUDES = \
 +	$(SDL_CFLAGS) \
++	$(PHYSFS_INCLUDE) \
 +	-I$(top_srcdir)/include
  
 -TAR = gtar
 -GZIP_ENV = --best
--SOURCES = $(libparagui_la_SOURCES)
--OBJECTS = $(libparagui_la_OBJECTS)
-+all: all-recursive
+-SOURCES = $(libpgcore_la_SOURCES)
+-OBJECTS = $(libpgcore_la_OBJECTS)
++all: all-am
  
 -all: all-redirect
  .SUFFIXES:
 -.SUFFIXES: .S .c .cpp .lo .o .obj .s
 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/Makefile
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/core/Makefile
 -
 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-libLTLIBRARIES:
--
--clean-libLTLIBRARIES:
--	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
--
--distclean-libLTLIBRARIES:
--
--maintainer-clean-libLTLIBRARIES:
--
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
@@ -43981,9 +52603,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/core/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  src/Makefile
++	  $(AUTOMAKE) --gnu  src/core/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -43993,38 +52615,23 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-mostlyclean-noinstLTLIBRARIES:
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- install-libLTLIBRARIES: $(lib_LTLIBRARIES)
- 	@$(NORMAL_INSTALL)
--	$(mkinstalldirs) $(DESTDIR)$(libdir)
-+	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
- 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
- 	  if test -f $$p; then \
--	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
--	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
-+	    f=$(am__strip_dir) \
-+	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-+	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
- 	  else :; fi; \
- 	done
  
- uninstall-libLTLIBRARIES:
- 	@$(NORMAL_UNINSTALL)
--	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
--	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-+	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-+	  p=$(am__strip_dir) \
-+	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-+	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
- 	done
- 
+ clean-noinstLTLIBRARIES:
+ 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+-
+-distclean-noinstLTLIBRARIES:
+-
+-maintainer-clean-noinstLTLIBRARIES:
+-
 -.c.o:
 -	$(COMPILE) -c $<
 -
@@ -44038,16 +52645,14 @@
 -
 -.S.o:
 -	$(COMPILE) -c $<
-+clean-libLTLIBRARIES:
-+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-+	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
 +	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +	  test "$$dir" != "$$p" || dir=.; \
 +	  echo "rm -f \"$${dir}/so_locations\""; \
 +	  rm -f "$${dir}/so_locations"; \
 +	done
-+libparagui.la: $(libparagui_la_OBJECTS) $(libparagui_la_DEPENDENCIES) 
-+	$(CXXLINK) -rpath $(libdir) $(libparagui_la_LDFLAGS) $(libparagui_la_OBJECTS) $(libparagui_la_LIBADD) $(LIBS)
++libpgcore.la: $(libpgcore_la_OBJECTS) $(libpgcore_la_DEPENDENCIES) 
++	$(CXXLINK)  $(libpgcore_la_LDFLAGS) $(libpgcore_la_OBJECTS) $(libpgcore_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
 -	-rm -f *.o core *.core
@@ -44059,7 +52664,22 @@
  	-rm -f *.tab.c
  
 -maintainer-clean-compile:
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/paragui.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/missing.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgapplication.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgcolors.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgdatacontainer.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgeventobject.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgfile.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgfilearchive.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pglog.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgmain.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgmessageobject.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgmsgmap.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgnavigator.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgrectlist.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgsurfacecache.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgtimerobject.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/physfsrwops.Plo at am__quote@
  
 -.c.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
@@ -44090,177 +52710,80 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -238,17 +361,8 @@
+@@ -220,234 +347,174 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
--
++	-rm -f libtool
++uninstall-info-am:
+ 
 -maintainer-clean-libtool:
 -
--libparagui.la: $(libparagui_la_OBJECTS) $(libparagui_la_DEPENDENCIES)
--	$(CXXLINK) -rpath $(libdir) $(libparagui_la_LDFLAGS) $(libparagui_la_OBJECTS) $(libparagui_la_LIBADD) $(LIBS)
+-libpgcore.la: $(libpgcore_la_OBJECTS) $(libpgcore_la_DEPENDENCIES)
+-	$(CXXLINK)  $(libpgcore_la_LDFLAGS) $(libpgcore_la_OBJECTS) $(libpgcore_la_LIBADD) $(LIBS)
 -.cpp.o:
 -	$(CXXCOMPILE) -c $<
 -.cpp.obj:
 -	$(CXXCOMPILE) -c `cygpath -w $<`
 -.cpp.lo:
 -	$(LTCXXCOMPILE) -c $<
-+	-rm -f libtool
-+uninstall-info-am:
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -256,13 +370,14 @@
- # (1) if the variable is set in `config.status', edit `config.status'
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
 -
-- at SET_MAKE@
--
--all-recursive install-data-recursive install-exec-recursive \
--installdirs-recursive install-recursive uninstall-recursive  \
--check-recursive installcheck-recursive info-recursive dvi-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+$(RECURSIVE_TARGETS):
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -274,7 +389,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -282,13 +397,24 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
--	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
--	  rev="$$subdir $$rev"; \
--	  test "$$subdir" != "." || dot_seen=yes; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
- 	done; \
--	test "$$dot_seen" = "no" && rev=". $$rev"; \
-+	rev="$$rev ."; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	for subdir in $$rev; do \
- 	  echo "Making $$target in $$subdir"; \
-@@ -298,158 +424,219 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- 	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
- 
--tags: TAGS
--
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
++	       END { for (i in files) print i; }'`; \
 +	mkid -fID $$unique
-+tags: TAGS
+ tags: TAGS
  
--TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--   if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
--   fi; \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
- 	done; \
+-ID: $(HEADERS) $(SOURCES) $(LISP)
 -	list='$(SOURCES) $(HEADERS)'; \
 -	unique=`for i in $$list; do echo $$i; done | \
 -	  awk '    { files[$$0] = 1; } \
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+-	here=`pwd` && cd $(srcdir) \
+-	  && mkid -f$$here/ID $$unique $(LISP)
 -
--mostlyclean-tags:
--
--clean-tags:
+-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 +	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  test -n "$$unique" || unique=$$empty_fix; \
 +	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	    $$tags $$unique; \
 +	fi
 +ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
+ 	tags=; \
+ 	here=`pwd`; \
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+-
+-mostlyclean-tags:
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -44273,7 +52796,7 @@
 -
 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 -
--subdir = src
+-subdir = src/core
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
@@ -44308,68 +52831,136 @@
 +	    || exit 1; \
  	  fi; \
  	done
--	for subdir in $(DIST_SUBDIRS); do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
--	    chmod 777 $(distdir)/$$subdir; \
--	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
-+	        distdir) \
- 	      || exit 1; \
- 	  fi; \
- 	done
--paragui.lo paragui.o : paragui.cpp ../include/pginfo.h \
--	../include/paragui.h ../include/paraconfig.h \
--	../include/paraconfig_gnu.h ../include/paragui_types.h \
--	../include/pgrect.h ../include/pglog.h
+-missing.lo missing.o : missing.cpp ../../include/paragui.h \
+-	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
+-	../../include/paragui_types.h ../../include/pgrect.h
+-pgapplication.lo pgapplication.o : pgapplication.cpp \
+-	../../include/pgapplication.h ../../include/pgmessageobject.h \
+-	../../include/paragui.h ../../include/paraconfig.h \
+-	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
+-	../../include/pgrect.h ../../include/pgfilearchive.h \
+-	../../include/pgfile.h ../../include/pgsurfacecache.h \
+-	../../include/pgdatacontainer.h ../../include/pgfont.h \
+-	../../include/pgtheme.h ../../include/pgwidget.h \
+-	../../include/pgrectlist.h ../../include/pglayout.h \
+-	../../include/pglog.h ../../include/pgdraw.h
+-pgcolors.lo pgcolors.o : pgcolors.cpp ../../include/pgcolors.h \
+-	../../include/paragui.h ../../include/paraconfig.h \
+-	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
+-	../../include/pgrect.h
+-pgdatacontainer.lo pgdatacontainer.o : pgdatacontainer.cpp \
+-	../../include/pgdatacontainer.h ../../include/paragui.h \
+-	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
+-	../../include/paragui_types.h ../../include/pgrect.h
+-pgeventobject.lo pgeventobject.o : pgeventobject.cpp \
+-	../../include/pgeventobject.h ../../include/paragui.h \
+-	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
+-	../../include/paragui_types.h ../../include/pgrect.h pgmsgmap.h \
+-	../../include/pgmessageobject.h
+-pgfile.lo pgfile.o : pgfile.cpp ../../include/pgfile.h \
+-	../../include/paragui.h ../../include/paraconfig.h \
+-	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
+-	../../include/pgrect.h ../physfs/physfs.h
+-pgfilearchive.lo pgfilearchive.o : pgfilearchive.cpp ../physfs/physfs.h \
+-	../../include/pgfilearchive.h ../../include/paragui.h \
+-	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
+-	../../include/paragui_types.h ../../include/pgrect.h \
+-	../../include/pgfile.h ../../include/pgsurfacecache.h \
+-	../../include/pgdatacontainer.h ../../include/pgapplication.h \
+-	../../include/pgmessageobject.h ../../include/pgfont.h \
+-	../../include/pgtheme.h ../../include/pglog.h physfsrwops.h
+-pglog.lo pglog.o : pglog.cpp ../../include/pgapplication.h \
+-	../../include/pgmessageobject.h ../../include/paragui.h \
+-	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
+-	../../include/paragui_types.h ../../include/pgrect.h \
+-	../../include/pgfilearchive.h ../../include/pgfile.h \
+-	../../include/pgsurfacecache.h ../../include/pgdatacontainer.h \
+-	../../include/pgfont.h ../../include/pgtheme.h \
+-	../../include/pgwindow.h ../../include/pgthemewidget.h \
+-	../../include/pgwidget.h ../../include/pgrectlist.h \
+-	../../include/pgbutton.h ../../include/pglabel.h \
+-	../../include/pgrichedit.h ../../include/pgwidgetlistex.h \
+-	../../include/pgwidgetlist.h ../../include/pgscrollbar.h \
+-	../../include/pglog.h
+-pgmain.lo pgmain.o : pgmain.cpp ../../include/pgapplication.h \
+-	../../include/pgmessageobject.h ../../include/paragui.h \
+-	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
+-	../../include/paragui_types.h ../../include/pgrect.h \
+-	../../include/pgfilearchive.h ../../include/pgfile.h \
+-	../../include/pgsurfacecache.h ../../include/pgdatacontainer.h \
+-	../../include/pgfont.h ../../include/pgtheme.h \
+-	../../include/pglog.h
+-pgmessageobject.lo pgmessageobject.o : pgmessageobject.cpp \
+-	../../include/pgmessageobject.h ../../include/paragui.h \
+-	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
+-	../../include/paragui_types.h ../../include/pgrect.h \
+-	../../include/pgwidget.h ../../include/pgrectlist.h \
+-	../../include/pgfont.h ../../include/pgdatacontainer.h \
+-	pgmsgmap.h ../../include/pgeventobject.h ../../include/pglog.h
+-pgmsgmap.lo pgmsgmap.o : pgmsgmap.cpp pgmsgmap.h ../../include/paragui.h \
+-	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
+-	../../include/paragui_types.h ../../include/pgrect.h \
+-	../../include/pgmessageobject.h ../../include/pgeventobject.h \
+-	../../include/pglog.h
+-pgnavigator.lo pgnavigator.o : pgnavigator.cpp \
+-	../../include/pgnavigator.h ../../include/pgwidget.h \
+-	../../include/pgmessageobject.h ../../include/paragui.h \
+-	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
+-	../../include/paragui_types.h ../../include/pgrect.h \
+-	../../include/pgrectlist.h ../../include/pgfont.h \
+-	../../include/pgdatacontainer.h
+-pgrectlist.lo pgrectlist.o : pgrectlist.cpp ../../include/pgrectlist.h \
+-	../../include/paragui.h ../../include/paraconfig.h \
+-	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
+-	../../include/pgrect.h ../../include/pgwidget.h \
+-	../../include/pgmessageobject.h ../../include/pgfont.h \
+-	../../include/pgdatacontainer.h ../../include/pgapplication.h \
+-	../../include/pgfilearchive.h ../../include/pgfile.h \
+-	../../include/pgsurfacecache.h ../../include/pgtheme.h \
+-	../../include/pglog.h
+-pgsurfacecache.lo pgsurfacecache.o : pgsurfacecache.cpp \
+-	../../include/paragui.h ../../include/paraconfig.h \
+-	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
+-	../../include/pgrect.h ../../include/pgsurfacecache.h \
+-	../../include/pglog.h
+-pgtimerobject.lo pgtimerobject.o : pgtimerobject.cpp \
+-	../../include/pgtimerobject.h ../../include/paragui.h \
+-	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
+-	../../include/paragui_types.h ../../include/pgrect.h
+-physfsrwops.lo physfsrwops.o : physfsrwops.cpp physfsrwops.h \
+-	../physfs/physfs.h
 -
 -info-am:
--info: info-recursive
+-info: info-am
 -dvi-am:
--dvi: dvi-recursive
+-dvi: dvi-am
  check-am: all-am
- check: check-recursive
+ check: check-am
 -installcheck-am:
--installcheck: installcheck-recursive
--install-exec-am: install-libLTLIBRARIES
+-installcheck: installcheck-am
+-install-exec-am:
 +all-am: Makefile $(LTLIBRARIES)
-+installdirs: installdirs-recursive
-+installdirs-am:
-+	for dir in "$(DESTDIR)$(libdir)"; do \
-+	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-+	done
-+install: install-recursive
- install-exec: install-exec-recursive
++installdirs:
++install: install-am
+ install-exec: install-exec-am
 -
 -install-data-am:
- install-data: install-data-recursive
-+uninstall: uninstall-recursive
+ install-data: install-data-am
++uninstall: uninstall-am
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-recursive
--uninstall-am: uninstall-libLTLIBRARIES
--uninstall: uninstall-recursive
+-install: install-am
+-uninstall-am:
+-uninstall: uninstall-am
 -all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-recursive
+-all-redirect: all-am
 -install-strip:
 -	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs: installdirs-recursive
--installdirs-am:
--	$(mkinstalldirs)  $(DESTDIR)$(libdir)
+-installdirs:
 -
  
-+installcheck: installcheck-recursive
++installcheck: installcheck-am
 +install-strip:
 +	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -44385,114 +52976,103 @@
 +	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
+-mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
 -		mostlyclean-libtool mostlyclean-tags \
 -		mostlyclean-generic
 +	@echo "This command is intended for maintainers to use"
 +	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
++clean: clean-am
  
--mostlyclean: mostlyclean-recursive
-+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
+-mostlyclean: mostlyclean-am
++clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
 +	mostlyclean-am
  
--clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
--		clean-generic mostlyclean-am
-+distclean: distclean-recursive
+-clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
+-		clean-tags clean-generic mostlyclean-am
++distclean: distclean-am
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +	distclean-libtool distclean-tags
  
--clean: clean-recursive
-+dvi: dvi-recursive
+-clean: clean-am
++dvi: dvi-am
  
--distclean-am:  distclean-libLTLIBRARIES distclean-compile \
+-distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
 -		distclean-libtool distclean-tags distclean-generic \
 -		clean-am
 -	-rm -f libtool
 +dvi-am:
  
--distclean: distclean-recursive
-+html: html-recursive
+-distclean: distclean-am
++html: html-am
  
--maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
+-maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
 -		maintainer-clean-compile maintainer-clean-libtool \
 -		maintainer-clean-tags maintainer-clean-generic \
 -		distclean-am
 -	@echo "This command is intended for maintainers to use;"
 -	@echo "it deletes files that may require special tools to rebuild."
-+info: info-recursive
++info: info-am
 +
 +info-am:
 +
 +install-data-am:
 +
-+install-exec-am: install-libLTLIBRARIES
++install-exec-am:
 +
-+install-info: install-info-recursive
++install-info: install-info-am
 +
 +install-man:
 +
 +installcheck-am:
  
- maintainer-clean: maintainer-clean-recursive
+ maintainer-clean: maintainer-clean-am
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
  
--.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
--clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
--uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
--distclean-compile clean-compile maintainer-clean-compile \
--mostlyclean-libtool distclean-libtool clean-libtool \
--maintainer-clean-libtool install-data-recursive \
--uninstall-data-recursive install-exec-recursive \
--uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
--all-recursive check-recursive installcheck-recursive info-recursive \
--dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
--maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+-.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
+-clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
+-mostlyclean-compile distclean-compile clean-compile \
+-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
+-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
 -install-exec install-data-am install-data install-am install \
--uninstall-am uninstall all-redirect all-am all installdirs-am \
--installdirs mostlyclean-generic distclean-generic clean-generic \
+-uninstall-am uninstall all-redirect all-am all installdirs \
+-mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-am
++
 +mostlyclean-am: mostlyclean-compile mostlyclean-generic \
 +	mostlyclean-libtool
 +
-+pdf: pdf-recursive
++pdf: pdf-am
 +
 +pdf-am:
 +
-+ps: ps-recursive
++ps: ps-am
 +
 +ps-am:
 +
-+uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
++uninstall-am: uninstall-info-am
 +
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libLTLIBRARIES clean-libtool \
-+	clean-recursive ctags ctags-recursive distclean \
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
++	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
 +	distclean-compile distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-libLTLIBRARIES install-man \
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am install-man \
 +	install-strip installcheck installcheck-am installdirs \
-+	installdirs-am maintainer-clean maintainer-clean-generic \
-+	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-+	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
-+	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
-+	uninstall-info-am uninstall-libLTLIBRARIES
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-info-am
  
  
  style_cvs:
-@@ -457,7 +644,6 @@
+@@ -455,7 +522,6 @@
  
  style_personal:
  	astyle *.cpp
@@ -44500,10 +53080,9 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/src/core/Makefile.in
-===================================================================
---- libparagui1.0-1.0.4.orig/src/core/Makefile.in	2003-07-07 11:06:06.000000000 +0200
-+++ libparagui1.0-1.0.4/src/core/Makefile.in	2006-06-15 22:26:29.000000000 +0200
+diff -Nurd libparagui1.0-1.0.4.orig/src/draw/Makefile.in libparagui1.0-1.0.4/src/draw/Makefile.in
+--- libparagui1.0-1.0.4.orig/src/draw/Makefile.in	2003-07-07 11:06:03.000000000 +0200
++++ libparagui1.0-1.0.4/src/draw/Makefile.in	2007-12-21 23:59:17.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -44515,7 +53094,7 @@
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -10,83 +12,131 @@
+@@ -10,83 +12,128 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -44577,7 +53156,7 @@
 +build_triplet = @build@
  host_triplet = @host@
 +target_triplet = @target@
-+subdir = src/core
++subdir = src/draw
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -44587,13 +53166,10 @@
 +CONFIG_HEADER = $(top_builddir)/include/paraconfig_gnu.h
 +CONFIG_CLEAN_FILES =
 +LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libpgcore_la_DEPENDENCIES =
-+am_libpgcore_la_OBJECTS = physfsrwops.lo missing.lo pgdatacontainer.lo \
-+	pgapplication.lo pgcolors.lo pgeventobject.lo pgfilearchive.lo \
-+	pgfile.lo pglog.lo pgmain.lo pgmessageobject.lo pgmsgmap.lo \
-+	pgnavigator.lo pgrectlist.lo pgsurfacecache.lo \
-+	pgtimerobject.lo
-+libpgcore_la_OBJECTS = $(am_libpgcore_la_OBJECTS)
++libpgdraw_la_LIBADD =
++am_libpgdraw_la_OBJECTS = surface.lo rotozoom.lo drawline.lo \
++	setpixel.lo stretch.lo pgrect.lo drawtile.lo gradient.lo
++libpgdraw_la_OBJECTS = $(am_libpgdraw_la_OBJECTS)
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
@@ -44605,8 +53181,8 @@
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libpgcore_la_SOURCES)
-+DIST_SOURCES = $(libpgcore_la_SOURCES)
++SOURCES = $(libpgdraw_la_SOURCES)
++DIST_SOURCES = $(libpgdraw_la_SOURCES)
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -44680,7 +53256,7 @@
  PARAGUI_BINARY_AGE = @PARAGUI_BINARY_AGE@
  PARAGUI_CFLAGS = @PARAGUI_CFLAGS@
  PARAGUI_INTERFACE_AGE = @PARAGUI_INTERFACE_AGE@
-@@ -95,6 +145,7 @@
+@@ -95,6 +142,7 @@
  PARAGUI_MICRO_VERSION = @PARAGUI_MICRO_VERSION@
  PARAGUI_MINOR_VERSION = @PARAGUI_MINOR_VERSION@
  PARAGUI_VERSION = @PARAGUI_VERSION@
@@ -44688,10 +53264,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,108 +161,183 @@
+@@ -110,103 +158,163 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -44753,44 +53330,27 @@
 +target_cpu = @target_cpu@
 +target_os = @target_os@
 +target_vendor = @target_vendor@
- noinst_LTLIBRARIES = libpgcore.la
+ noinst_LTLIBRARIES = libpgdraw.la
 -
--libpgcore_la_SOURCES =  	physfsrwops.cpp 	missing.cpp 	pgdatacontainer.cpp 	pgapplication.cpp 	pgcolors.cpp 	pgeventobject.cpp 	pgfilearchive.cpp 	pgfile.cpp 	pglog.cpp 	pgmain.cpp 	pgmessageobject.cpp 	pgmsgmap.cpp 	pgnavigator.cpp 	pgrectlist.cpp 	pgsurfacecache.cpp 	pgtimerobject.cpp
+-libpgdraw_la_SOURCES =  	surface.cpp 	rotozoom.cpp 	drawline.cpp 	setpixel.cpp 	stretch.cpp 	pgrect.cpp 	drawtile.cpp         gradient.cpp
 -
-+libpgcore_la_SOURCES = \
-+	physfsrwops.cpp \
-+	missing.cpp \
-+	pgdatacontainer.cpp \
-+	pgapplication.cpp \
-+	pgcolors.cpp \
-+	pgeventobject.cpp \
-+	pgfilearchive.cpp \
-+	pgfile.cpp \
-+	pglog.cpp \
-+	pgmain.cpp \
-+	pgmessageobject.cpp \
-+	pgmsgmap.cpp \
-+	pgnavigator.cpp \
-+	pgrectlist.cpp \
-+	pgsurfacecache.cpp \
-+	pgtimerobject.cpp
++libpgdraw_la_SOURCES = \
++	surface.cpp \
++	rotozoom.cpp \
++	drawline.cpp \
++	setpixel.cpp \
++	stretch.cpp \
++	pgrect.cpp \
++	drawtile.cpp \
++        gradient.cpp
  
- libpgcore_la_LIBADD = 
-+EXTRA_DIST = \
-+	physfsrwops.h \
-+	pgmsgmap.h
-+
+ EXTRA_DIST = 
 +INCLUDES = \
 +	$(SDL_CFLAGS) \
-+	$(PHYSFS_INCLUDE) \
 +	-I$(top_srcdir)/include
  
--EXTRA_DIST =  	physfsrwops.h 	pgmsgmap.h
-+all: all-am
- 
+-INCLUDES =  	$(SDL_CFLAGS) 	-I$(top_srcdir)/include
 -
--INCLUDES =  	$(SDL_CFLAGS) 	$(PHYSFS_INCLUDE) 	-I$(top_srcdir)/include
--
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 -CONFIG_HEADER = ../../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
@@ -44801,12 +53361,10 @@
 -CPPFLAGS = @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
--libpgcore_la_LDFLAGS = 
--libpgcore_la_DEPENDENCIES = 
--libpgcore_la_OBJECTS =  physfsrwops.lo missing.lo pgdatacontainer.lo \
--pgapplication.lo pgcolors.lo pgeventobject.lo pgfilearchive.lo \
--pgfile.lo pglog.lo pgmain.lo pgmessageobject.lo pgmsgmap.lo \
--pgnavigator.lo pgrectlist.lo pgsurfacecache.lo pgtimerobject.lo
+-libpgdraw_la_LDFLAGS = 
+-libpgdraw_la_LIBADD = 
+-libpgdraw_la_OBJECTS =  surface.lo rotozoom.lo drawline.lo setpixel.lo \
+-stretch.lo pgrect.lo drawtile.lo gradient.lo
 -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -CXXLD = $(CXX)
@@ -44818,21 +53376,19 @@
 -
 -TAR = gtar
 -GZIP_ENV = --best
--SOURCES = $(libpgcore_la_SOURCES)
--OBJECTS = $(libpgcore_la_OBJECTS)
--
+-SOURCES = $(libpgdraw_la_SOURCES)
+-OBJECTS = $(libpgdraw_la_OBJECTS)
++all: all-am
+ 
 -all: all-redirect
  .SUFFIXES:
 -.SUFFIXES: .S .c .cpp .lo .o .obj .s
 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/core/Makefile
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/draw/Makefile
 -
 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-noinstLTLIBRARIES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
@@ -44843,9 +53399,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/core/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/draw/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  src/core/Makefile
++	  $(AUTOMAKE) --gnu  src/draw/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -44855,10 +53411,11 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-mostlyclean-noinstLTLIBRARIES:
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -44890,8 +53447,8 @@
 +	  echo "rm -f \"$${dir}/so_locations\""; \
 +	  rm -f "$${dir}/so_locations"; \
 +	done
-+libpgcore.la: $(libpgcore_la_OBJECTS) $(libpgcore_la_DEPENDENCIES) 
-+	$(CXXLINK)  $(libpgcore_la_LDFLAGS) $(libpgcore_la_OBJECTS) $(libpgcore_la_LIBADD) $(LIBS)
++libpgdraw.la: $(libpgdraw_la_OBJECTS) $(libpgdraw_la_DEPENDENCIES) 
++	$(CXXLINK)  $(libpgdraw_la_LDFLAGS) $(libpgdraw_la_OBJECTS) $(libpgdraw_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
 -	-rm -f *.o core *.core
@@ -44903,22 +53460,14 @@
  	-rm -f *.tab.c
  
 -maintainer-clean-compile:
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/missing.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgapplication.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgcolors.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgdatacontainer.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgeventobject.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgfile.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgfilearchive.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pglog.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgmain.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgmessageobject.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgmsgmap.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgnavigator.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgrectlist.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgsurfacecache.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgtimerobject.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/physfsrwops.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/drawline.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/drawtile.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gradient.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgrect.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rotozoom.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/setpixel.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stretch.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/surface.Plo at am__quote@
  
 -.c.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
@@ -44949,7 +53498,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -220,234 +346,174 @@
+@@ -215,167 +323,174 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
@@ -44958,8 +53507,8 @@
  
 -maintainer-clean-libtool:
 -
--libpgcore.la: $(libpgcore_la_OBJECTS) $(libpgcore_la_DEPENDENCIES)
--	$(CXXLINK)  $(libpgcore_la_LDFLAGS) $(libpgcore_la_OBJECTS) $(libpgcore_la_LIBADD) $(LIBS)
+-libpgdraw.la: $(libpgdraw_la_OBJECTS) $(libpgdraw_la_DEPENDENCIES)
+-	$(CXXLINK)  $(libpgdraw_la_LDFLAGS) $(libpgdraw_la_OBJECTS) $(libpgdraw_la_LIBADD) $(LIBS)
 -.cpp.o:
 -	$(CXXCOMPILE) -c $<
 -.cpp.obj:
@@ -45018,12 +53567,11 @@
 -	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 -
 -mostlyclean-tags:
--
--clean-tags:
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -45036,7 +53584,7 @@
 -
 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 -
--subdir = src/core
+-subdir = src/draw
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
@@ -45071,104 +53619,37 @@
 +	    || exit 1; \
  	  fi; \
  	done
--missing.lo missing.o : missing.cpp ../../include/paragui.h \
+-drawline.lo drawline.o : drawline.cpp ../../include/pgdraw.h \
+-	../../include/pgrect.h ../../include/paragui.h \
 -	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pgrect.h
--pgapplication.lo pgapplication.o : pgapplication.cpp \
--	../../include/pgapplication.h ../../include/pgmessageobject.h \
--	../../include/paragui.h ../../include/paraconfig.h \
--	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
--	../../include/pgrect.h ../../include/pgfilearchive.h \
--	../../include/pgfile.h ../../include/pgsurfacecache.h \
--	../../include/pgdatacontainer.h ../../include/pgfont.h \
--	../../include/pgtheme.h ../../include/pgwidget.h \
--	../../include/pgrectlist.h ../../include/pglayout.h \
--	../../include/pglog.h ../../include/pgdraw.h
--pgcolors.lo pgcolors.o : pgcolors.cpp ../../include/pgcolors.h \
--	../../include/paragui.h ../../include/paraconfig.h \
--	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
--	../../include/pgrect.h
--pgdatacontainer.lo pgdatacontainer.o : pgdatacontainer.cpp \
--	../../include/pgdatacontainer.h ../../include/paragui.h \
+-	../../include/paragui_types.h
+-drawtile.lo drawtile.o : drawtile.cpp ../../include/pgdraw.h \
+-	../../include/pgrect.h ../../include/paragui.h \
 -	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pgrect.h
--pgeventobject.lo pgeventobject.o : pgeventobject.cpp \
--	../../include/pgeventobject.h ../../include/paragui.h \
+-	../../include/paragui_types.h
+-gradient.lo gradient.o : gradient.cpp ../../include/pgdraw.h \
+-	../../include/pgrect.h ../../include/paragui.h \
 -	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pgrect.h pgmsgmap.h \
--	../../include/pgmessageobject.h
--pgfile.lo pgfile.o : pgfile.cpp ../../include/pgfile.h \
+-	../../include/paragui_types.h ../../include/pglog.h
+-pgrect.lo pgrect.o : pgrect.cpp ../../include/pgrect.h \
 -	../../include/paragui.h ../../include/paraconfig.h \
--	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
--	../../include/pgrect.h ../physfs/physfs.h
--pgfilearchive.lo pgfilearchive.o : pgfilearchive.cpp ../physfs/physfs.h \
--	../../include/pgfilearchive.h ../../include/paragui.h \
+-	../../include/paraconfig_gnu.h ../../include/paragui_types.h
+-rotozoom.lo rotozoom.o : rotozoom.cpp ../../include/paragui.h \
 -	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
 -	../../include/paragui_types.h ../../include/pgrect.h \
--	../../include/pgfile.h ../../include/pgsurfacecache.h \
--	../../include/pgdatacontainer.h ../../include/pgapplication.h \
--	../../include/pgmessageobject.h ../../include/pgfont.h \
--	../../include/pgtheme.h ../../include/pglog.h physfsrwops.h
--pglog.lo pglog.o : pglog.cpp ../../include/pgapplication.h \
--	../../include/pgmessageobject.h ../../include/paragui.h \
+-	../../include/pgdraw.h
+-setpixel.lo setpixel.o : setpixel.cpp ../../include/pgdraw.h \
+-	../../include/pgrect.h ../../include/paragui.h \
 -	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pgrect.h \
--	../../include/pgfilearchive.h ../../include/pgfile.h \
--	../../include/pgsurfacecache.h ../../include/pgdatacontainer.h \
--	../../include/pgfont.h ../../include/pgtheme.h \
--	../../include/pgwindow.h ../../include/pgthemewidget.h \
--	../../include/pgwidget.h ../../include/pgrectlist.h \
--	../../include/pgbutton.h ../../include/pglabel.h \
--	../../include/pgrichedit.h ../../include/pgwidgetlistex.h \
--	../../include/pgwidgetlist.h ../../include/pgscrollbar.h \
--	../../include/pglog.h
--pgmain.lo pgmain.o : pgmain.cpp ../../include/pgapplication.h \
--	../../include/pgmessageobject.h ../../include/paragui.h \
+-	../../include/paragui_types.h
+-stretch.lo stretch.o : stretch.cpp ../../include/pgdraw.h \
+-	../../include/pgrect.h ../../include/paragui.h \
 -	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pgrect.h \
--	../../include/pgfilearchive.h ../../include/pgfile.h \
--	../../include/pgsurfacecache.h ../../include/pgdatacontainer.h \
--	../../include/pgfont.h ../../include/pgtheme.h \
--	../../include/pglog.h
--pgmessageobject.lo pgmessageobject.o : pgmessageobject.cpp \
--	../../include/pgmessageobject.h ../../include/paragui.h \
+-	../../include/paragui_types.h
+-surface.lo surface.o : surface.cpp ../../include/pgdraw.h \
+-	../../include/pgrect.h ../../include/paragui.h \
 -	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pgrect.h \
--	../../include/pgwidget.h ../../include/pgrectlist.h \
--	../../include/pgfont.h ../../include/pgdatacontainer.h \
--	pgmsgmap.h ../../include/pgeventobject.h ../../include/pglog.h
--pgmsgmap.lo pgmsgmap.o : pgmsgmap.cpp pgmsgmap.h ../../include/paragui.h \
--	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pgrect.h \
--	../../include/pgmessageobject.h ../../include/pgeventobject.h \
--	../../include/pglog.h
--pgnavigator.lo pgnavigator.o : pgnavigator.cpp \
--	../../include/pgnavigator.h ../../include/pgwidget.h \
--	../../include/pgmessageobject.h ../../include/paragui.h \
--	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pgrect.h \
--	../../include/pgrectlist.h ../../include/pgfont.h \
--	../../include/pgdatacontainer.h
--pgrectlist.lo pgrectlist.o : pgrectlist.cpp ../../include/pgrectlist.h \
--	../../include/paragui.h ../../include/paraconfig.h \
--	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
--	../../include/pgrect.h ../../include/pgwidget.h \
--	../../include/pgmessageobject.h ../../include/pgfont.h \
--	../../include/pgdatacontainer.h ../../include/pgapplication.h \
--	../../include/pgfilearchive.h ../../include/pgfile.h \
--	../../include/pgsurfacecache.h ../../include/pgtheme.h \
--	../../include/pglog.h
--pgsurfacecache.lo pgsurfacecache.o : pgsurfacecache.cpp \
--	../../include/paragui.h ../../include/paraconfig.h \
--	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
--	../../include/pgrect.h ../../include/pgsurfacecache.h \
--	../../include/pglog.h
--pgtimerobject.lo pgtimerobject.o : pgtimerobject.cpp \
--	../../include/pgtimerobject.h ../../include/paragui.h \
--	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pgrect.h
--physfsrwops.lo physfsrwops.o : physfsrwops.cpp physfsrwops.h \
--	../physfs/physfs.h
+-	../../include/paragui_types.h
 -
 -info-am:
 -info: info-am
@@ -45271,11 +53752,6 @@
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
  
 -.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
 -clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
@@ -45288,6 +53764,11 @@
 -uninstall-am uninstall all-redirect all-am all installdirs \
 -mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
 +pdf: pdf-am
 +
 +pdf-am:
@@ -45312,7 +53793,7 @@
  
  
  style_cvs:
-@@ -455,7 +521,6 @@
+@@ -383,7 +498,6 @@
  
  style_personal:
  	astyle *.cpp
@@ -45320,10 +53801,9 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/src/draw/Makefile.in
-===================================================================
---- libparagui1.0-1.0.4.orig/src/draw/Makefile.in	2003-07-07 11:06:03.000000000 +0200
-+++ libparagui1.0-1.0.4/src/draw/Makefile.in	2006-06-15 22:26:30.000000000 +0200
+diff -Nurd libparagui1.0-1.0.4.orig/src/expat/Makefile.in libparagui1.0-1.0.4/src/expat/Makefile.in
+--- libparagui1.0-1.0.4.orig/src/expat/Makefile.in	2003-07-07 11:06:09.000000000 +0200
++++ libparagui1.0-1.0.4/src/expat/Makefile.in	2007-12-21 23:59:17.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -45335,7 +53815,7 @@
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -10,83 +12,128 @@
+@@ -10,83 +12,127 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -45397,7 +53877,7 @@
 +build_triplet = @build@
  host_triplet = @host@
 +target_triplet = @target@
-+subdir = src/draw
++subdir = src/expat
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -45407,23 +53887,22 @@
 +CONFIG_HEADER = $(top_builddir)/include/paraconfig_gnu.h
 +CONFIG_CLEAN_FILES =
 +LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libpgdraw_la_LIBADD =
-+am_libpgdraw_la_OBJECTS = surface.lo rotozoom.lo drawline.lo \
-+	setpixel.lo stretch.lo pgrect.lo drawtile.lo gradient.lo
-+libpgdraw_la_OBJECTS = $(am_libpgdraw_la_OBJECTS)
++libexpat_la_LIBADD =
++am_libexpat_la_OBJECTS = xmltok.lo xmlrole.lo xmlparse.lo
++libexpat_la_OBJECTS = $(am_libexpat_la_OBJECTS)
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
++COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
++	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
++LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
-+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libpgdraw_la_SOURCES)
-+DIST_SOURCES = $(libpgdraw_la_SOURCES)
++	$(AM_CFLAGS) $(CFLAGS)
++CCLD = $(CC)
++LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++	$(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(libexpat_la_SOURCES)
++DIST_SOURCES = $(libexpat_la_SOURCES)
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -45497,7 +53976,7 @@
  PARAGUI_BINARY_AGE = @PARAGUI_BINARY_AGE@
  PARAGUI_CFLAGS = @PARAGUI_CFLAGS@
  PARAGUI_INTERFACE_AGE = @PARAGUI_INTERFACE_AGE@
-@@ -95,6 +142,7 @@
+@@ -95,6 +141,7 @@
  PARAGUI_MICRO_VERSION = @PARAGUI_MICRO_VERSION@
  PARAGUI_MINOR_VERSION = @PARAGUI_MINOR_VERSION@
  PARAGUI_VERSION = @PARAGUI_VERSION@
@@ -45505,10 +53984,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,103 +158,162 @@
+@@ -110,103 +157,168 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -45570,26 +54050,35 @@
 +target_cpu = @target_cpu@
 +target_os = @target_os@
 +target_vendor = @target_vendor@
- noinst_LTLIBRARIES = libpgdraw.la
+ noinst_LTLIBRARIES = libexpat.la
 -
--libpgdraw_la_SOURCES =  	surface.cpp 	rotozoom.cpp 	drawline.cpp 	setpixel.cpp 	stretch.cpp 	pgrect.cpp 	drawtile.cpp         gradient.cpp
--
-+libpgdraw_la_SOURCES = \
-+	surface.cpp \
-+	rotozoom.cpp \
-+	drawline.cpp \
-+	setpixel.cpp \
-+	stretch.cpp \
-+	pgrect.cpp \
-+	drawtile.cpp \
-+        gradient.cpp
+-libexpat_la_SOURCES =  	xmltok.c 	xmlrole.c 	xmlparse.c
++libexpat_la_SOURCES = \
++	xmltok.c \
++	xmlrole.c \
++	xmlparse.c
  
- EXTRA_DIST = 
-+INCLUDES = \
-+	$(SDL_CFLAGS) \
-+	-I$(top_srcdir)/include
  
--INCLUDES =  	$(SDL_CFLAGS) 	-I$(top_srcdir)/include
+ #INCLUDES = -DXML_NS -DXML_DTD -DXML_MIN_SIZE
+ INCLUDES = -DXML_MIN_SIZE
++EXTRA_DIST = \
++	expat.h \
++	ascii.h \
++	iasciitab.h \
++	nametab.h \
++	xmldef.h \
++	xmlrole.h \
++	xmltok.h \
++	asciitab.h \
++	latin1tab.h \
++	utf8tab.h \
++	xmlparse.h \
++	xmltchar.h \
++	xmltok_impl.h \
++	xmltok_impl.c \
++	xmltok_ns.c
+ 
+-EXTRA_DIST =  	expat.h 	ascii.h 	iasciitab.h 	nametab.h 	xmldef.h 	xmlrole.h 	xmltok.h 	asciitab.h 	latin1tab.h 	utf8tab.h 	xmlparse.h 	xmltchar.h 	xmltok_impl.h 	xmltok_impl.c 	xmltok_ns.c
 -
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 -CONFIG_HEADER = ../../include/paraconfig_gnu.h
@@ -45601,38 +54090,34 @@
 -CPPFLAGS = @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
--libpgdraw_la_LDFLAGS = 
--libpgdraw_la_LIBADD = 
--libpgdraw_la_OBJECTS =  surface.lo rotozoom.lo drawline.lo setpixel.lo \
--stretch.lo pgrect.lo drawtile.lo gradient.lo
--CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
--CXXLD = $(CXX)
--CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+-libexpat_la_LDFLAGS = 
+-libexpat_la_LIBADD = 
+-libexpat_la_OBJECTS =  xmltok.lo xmlrole.lo xmlparse.lo
+-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 -DIST_COMMON =  Makefile.am Makefile.in
 -
 -
 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+all: all-am
- 
+-
 -TAR = gtar
 -GZIP_ENV = --best
--SOURCES = $(libpgdraw_la_SOURCES)
--OBJECTS = $(libpgdraw_la_OBJECTS)
--
+-SOURCES = $(libexpat_la_SOURCES)
+-OBJECTS = $(libexpat_la_OBJECTS)
++all: all-am
+ 
 -all: all-redirect
  .SUFFIXES:
--.SUFFIXES: .S .c .cpp .lo .o .obj .s
+-.SUFFIXES: .S .c .lo .o .obj .s
 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/draw/Makefile
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/expat/Makefile
 -
 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-noinstLTLIBRARIES:
-+.SUFFIXES: .cpp .lo .o .obj
++.SUFFIXES: .c .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -45642,9 +54127,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/draw/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/expat/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  src/draw/Makefile
++	  $(AUTOMAKE) --gnu  src/expat/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -45654,10 +54139,11 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-mostlyclean-noinstLTLIBRARIES:
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -45689,8 +54175,8 @@
 +	  echo "rm -f \"$${dir}/so_locations\""; \
 +	  rm -f "$${dir}/so_locations"; \
 +	done
-+libpgdraw.la: $(libpgdraw_la_OBJECTS) $(libpgdraw_la_DEPENDENCIES) 
-+	$(CXXLINK)  $(libpgdraw_la_LDFLAGS) $(libpgdraw_la_OBJECTS) $(libpgdraw_la_LIBADD) $(LIBS)
++libexpat.la: $(libexpat_la_OBJECTS) $(libexpat_la_DEPENDENCIES) 
++	$(LINK)  $(libexpat_la_LDFLAGS) $(libexpat_la_OBJECTS) $(libexpat_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
 -	-rm -f *.o core *.core
@@ -45702,45 +54188,40 @@
  	-rm -f *.tab.c
  
 -maintainer-clean-compile:
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/drawline.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/drawtile.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gradient.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgrect.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rotozoom.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/setpixel.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stretch.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/surface.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlparse.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlrole.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmltok.Plo at am__quote@
  
 -.c.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.cpp.o:
-+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
++.c.o:
++ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
  
 -.s.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.cpp.obj:
-+ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++.c.obj:
++ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
  
 -.S.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.cpp.lo:
-+ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
++.c.lo:
++ at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -215,167 +322,174 @@
+@@ -215,130 +327,174 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
@@ -45749,14 +54230,8 @@
  
 -maintainer-clean-libtool:
 -
--libpgdraw.la: $(libpgdraw_la_OBJECTS) $(libpgdraw_la_DEPENDENCIES)
--	$(CXXLINK)  $(libpgdraw_la_LDFLAGS) $(libpgdraw_la_OBJECTS) $(libpgdraw_la_LIBADD) $(LIBS)
--.cpp.o:
--	$(CXXCOMPILE) -c $<
--.cpp.obj:
--	$(CXXCOMPILE) -c `cygpath -w $<`
--.cpp.lo:
--	$(LTCXXCOMPILE) -c $<
+-libexpat.la: $(libexpat_la_OBJECTS) $(libexpat_la_DEPENDENCIES)
+-	$(LINK)  $(libexpat_la_LDFLAGS) $(libexpat_la_OBJECTS) $(libexpat_la_LIBADD) $(LIBS)
 -
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -45809,12 +54284,11 @@
 -	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 -
 -mostlyclean-tags:
--
--clean-tags:
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -45827,7 +54301,7 @@
 -
 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 -
--subdir = src/draw
+-subdir = src/expat
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
@@ -45862,37 +54336,6 @@
 +	    || exit 1; \
  	  fi; \
  	done
--drawline.lo drawline.o : drawline.cpp ../../include/pgdraw.h \
--	../../include/pgrect.h ../../include/paragui.h \
--	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h
--drawtile.lo drawtile.o : drawtile.cpp ../../include/pgdraw.h \
--	../../include/pgrect.h ../../include/paragui.h \
--	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h
--gradient.lo gradient.o : gradient.cpp ../../include/pgdraw.h \
--	../../include/pgrect.h ../../include/paragui.h \
--	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pglog.h
--pgrect.lo pgrect.o : pgrect.cpp ../../include/pgrect.h \
--	../../include/paragui.h ../../include/paraconfig.h \
--	../../include/paraconfig_gnu.h ../../include/paragui_types.h
--rotozoom.lo rotozoom.o : rotozoom.cpp ../../include/paragui.h \
--	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pgrect.h \
--	../../include/pgdraw.h
--setpixel.lo setpixel.o : setpixel.cpp ../../include/pgdraw.h \
--	../../include/pgrect.h ../../include/paragui.h \
--	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h
--stretch.lo stretch.o : stretch.cpp ../../include/pgdraw.h \
--	../../include/pgrect.h ../../include/paragui.h \
--	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h
--surface.lo surface.o : surface.cpp ../../include/pgdraw.h \
--	../../include/pgrect.h ../../include/paragui.h \
--	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h
 -
 -info-am:
 -info: info-am
@@ -45995,11 +54438,6 @@
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
  
 -.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
 -clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
@@ -46012,6 +54450,11 @@
 -uninstall-am uninstall all-redirect all-am all installdirs \
 -mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
 +pdf: pdf-am
 +
 +pdf-am:
@@ -46035,19 +54478,18 @@
 +	uninstall-info-am
  
  
- style_cvs:
-@@ -383,7 +497,6 @@
- 
- style_personal:
- 	astyle *.cpp
+ # If you know what your system's byte order is, define XML_BYTE_ORDER:
+@@ -347,7 +503,6 @@
+ # -DXML_NS adds support for checking of lexical aspects of XML namespaces spec
+ # -DXML_MIN_SIZE makes a smaller but slower parser
+ # -DXML_DTD adds full support for parsing DTDs
 -
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/src/expat/Makefile.in
-===================================================================
---- libparagui1.0-1.0.4.orig/src/expat/Makefile.in	2003-07-07 11:06:09.000000000 +0200
-+++ libparagui1.0-1.0.4/src/expat/Makefile.in	2006-06-15 22:26:30.000000000 +0200
+diff -Nurd libparagui1.0-1.0.4.orig/src/font/Makefile.in libparagui1.0-1.0.4/src/font/Makefile.in
+--- libparagui1.0-1.0.4.orig/src/font/Makefile.in	2003-07-07 11:05:53.000000000 +0200
++++ libparagui1.0-1.0.4/src/font/Makefile.in	2007-12-21 23:59:17.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -46121,7 +54563,7 @@
 +build_triplet = @build@
  host_triplet = @host@
 +target_triplet = @target@
-+subdir = src/expat
++subdir = src/font
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -46131,22 +54573,22 @@
 +CONFIG_HEADER = $(top_builddir)/include/paraconfig_gnu.h
 +CONFIG_CLEAN_FILES =
 +LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libexpat_la_LIBADD =
-+am_libexpat_la_OBJECTS = xmltok.lo xmlrole.lo xmlparse.lo
-+libexpat_la_OBJECTS = $(am_libexpat_la_OBJECTS)
++libpgfont_la_LIBADD =
++am_libpgfont_la_OBJECTS = pgfont_impl.lo pgfont.lo
++libpgfont_la_OBJECTS = $(am_libpgfont_la_OBJECTS)
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
 +	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-+	$(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libexpat_la_SOURCES)
-+DIST_SOURCES = $(libexpat_la_SOURCES)
++	$(AM_CXXFLAGS) $(CXXFLAGS)
++CXXLD = $(CXX)
++CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
++	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
++SOURCES = $(libpgfont_la_SOURCES)
++DIST_SOURCES = $(libpgfont_la_SOURCES)
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -46228,10 +54670,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,103 +157,167 @@
+@@ -110,103 +157,156 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -46293,37 +54736,19 @@
 +target_cpu = @target_cpu@
 +target_os = @target_os@
 +target_vendor = @target_vendor@
- noinst_LTLIBRARIES = libexpat.la
--
--libexpat_la_SOURCES =  	xmltok.c 	xmlrole.c 	xmlparse.c
-+libexpat_la_SOURCES = \
-+	xmltok.c \
-+	xmlrole.c \
-+	xmlparse.c
+ noinst_LTLIBRARIES = libpgfont.la
++libpgfont_la_SOURCES = \
++	pgfont_impl.cpp \
++	pgfont.cpp
  
- 
- #INCLUDES = -DXML_NS -DXML_DTD -DXML_MIN_SIZE
- INCLUDES = -DXML_MIN_SIZE
-+EXTRA_DIST = \
-+	expat.h \
-+	ascii.h \
-+	iasciitab.h \
-+	nametab.h \
-+	xmldef.h \
-+	xmlrole.h \
-+	xmltok.h \
-+	asciitab.h \
-+	latin1tab.h \
-+	utf8tab.h \
-+	xmlparse.h \
-+	xmltchar.h \
-+	xmltok_impl.h \
-+	xmltok_impl.c \
-+	xmltok_ns.c
- 
--EXTRA_DIST =  	expat.h 	ascii.h 	iasciitab.h 	nametab.h 	xmldef.h 	xmlrole.h 	xmltok.h 	asciitab.h 	latin1tab.h 	utf8tab.h 	xmlparse.h 	xmltchar.h 	xmltok_impl.h 	xmltok_impl.c 	xmltok_ns.c
-+all: all-am
- 
+-libpgfont_la_SOURCES =  	pgfont_impl.cpp 	pgfont.cpp
+-
+-
+-EXTRA_DIST =  	facecache.h
+-
+-
+-INCLUDES =  	$(SDL_CFLAGS) 	-I$(top_srcdir)/include
+-
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 -CONFIG_HEADER = ../../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
@@ -46334,36 +54759,41 @@
 -CPPFLAGS = @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
--libexpat_la_LDFLAGS = 
--libexpat_la_LIBADD = 
--libexpat_la_OBJECTS =  xmltok.lo xmlrole.lo xmlparse.lo
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
--CCLD = $(CC)
--LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+-libpgfont_la_LDFLAGS = 
+-libpgfont_la_LIBADD = 
+-libpgfont_la_OBJECTS =  pgfont_impl.lo pgfont.lo
+-CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+-CXXLD = $(CXX)
+-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 -DIST_COMMON =  Makefile.am Makefile.in
--
--
++libpgfont_la_LDFLAGS = \
++	-lfreetype
+ 
++EXTRA_DIST = \
++	facecache.h
+ 
 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
++INCLUDES = \
++	$(SDL_CFLAGS) \
++	-I$(top_srcdir)/include
+ 
 -TAR = gtar
 -GZIP_ENV = --best
--SOURCES = $(libexpat_la_SOURCES)
--OBJECTS = $(libexpat_la_OBJECTS)
--
+-SOURCES = $(libpgfont_la_SOURCES)
+-OBJECTS = $(libpgfont_la_OBJECTS)
++all: all-am
+ 
 -all: all-redirect
  .SUFFIXES:
--.SUFFIXES: .S .c .lo .o .obj .s
+-.SUFFIXES: .S .c .cpp .lo .o .obj .s
 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/expat/Makefile
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/font/Makefile
 -
 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-noinstLTLIBRARIES:
-+.SUFFIXES: .c .lo .o .obj
++.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -46373,9 +54803,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/expat/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/font/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  src/expat/Makefile
++	  $(AUTOMAKE) --gnu  src/font/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -46385,10 +54815,11 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-mostlyclean-noinstLTLIBRARIES:
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -46420,8 +54851,8 @@
 +	  echo "rm -f \"$${dir}/so_locations\""; \
 +	  rm -f "$${dir}/so_locations"; \
 +	done
-+libexpat.la: $(libexpat_la_OBJECTS) $(libexpat_la_DEPENDENCIES) 
-+	$(LINK)  $(libexpat_la_LDFLAGS) $(libexpat_la_OBJECTS) $(libexpat_la_LIBADD) $(LIBS)
++libpgfont.la: $(libpgfont_la_OBJECTS) $(libpgfont_la_DEPENDENCIES) 
++	$(CXXLINK)  $(libpgfont_la_LDFLAGS) $(libpgfont_la_OBJECTS) $(libpgfont_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
 -	-rm -f *.o core *.core
@@ -46433,40 +54864,39 @@
  	-rm -f *.tab.c
  
 -maintainer-clean-compile:
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlparse.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlrole.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmltok.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgfont.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgfont_impl.Plo at am__quote@
  
 -.c.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.o:
-+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
++.cpp.o:
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
  
 -.s.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.obj:
-+ at am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
++.cpp.obj:
++ at am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
  
 -.S.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+.c.lo:
-+ at am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-+ at am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
++.cpp.lo:
++ at am__fastdepCXX_TRUE@	if $(LTCXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
++ at am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
++ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
++ at am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -215,130 +326,174 @@
+@@ -215,148 +315,174 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
@@ -46475,8 +54905,14 @@
  
 -maintainer-clean-libtool:
 -
--libexpat.la: $(libexpat_la_OBJECTS) $(libexpat_la_DEPENDENCIES)
--	$(LINK)  $(libexpat_la_LDFLAGS) $(libexpat_la_OBJECTS) $(libexpat_la_LIBADD) $(LIBS)
+-libpgfont.la: $(libpgfont_la_OBJECTS) $(libpgfont_la_DEPENDENCIES)
+-	$(CXXLINK)  $(libpgfont_la_LDFLAGS) $(libpgfont_la_OBJECTS) $(libpgfont_la_LIBADD) $(LIBS)
+-.cpp.o:
+-	$(CXXCOMPILE) -c $<
+-.cpp.obj:
+-	$(CXXCOMPILE) -c `cygpath -w $<`
+-.cpp.lo:
+-	$(LTCXXCOMPILE) -c $<
 -
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -46529,12 +54965,11 @@
 -	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 -
 -mostlyclean-tags:
--
--clean-tags:
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -46547,7 +54982,7 @@
 -
 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 -
--subdir = src/expat
+-subdir = src/font
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
@@ -46582,6 +55017,18 @@
 +	    || exit 1; \
  	  fi; \
  	done
+-pgfont.lo pgfont.o : pgfont.cpp ../../include/pgfont.h \
+-	../../include/paragui.h ../../include/paraconfig.h \
+-	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
+-	../../include/pgrect.h ../../include/pgdatacontainer.h \
+-	../../include/pglog.h ../../include/pgfilearchive.h \
+-	../../include/pgfile.h ../../include/pgsurfacecache.h \
+-	facecache.h
+-pgfont_impl.lo pgfont_impl.o : pgfont_impl.cpp ../../include/pglog.h \
+-	../../include/paragui.h ../../include/paraconfig.h \
+-	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
+-	../../include/pgrect.h facecache.h \
+-	../../include/pgdatacontainer.h ../../include/pgfont.h
 -
 -info-am:
 -info: info-am
@@ -46684,11 +55131,6 @@
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
  
 -.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
 -clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
@@ -46701,6 +55143,11 @@
 -uninstall-am uninstall all-redirect all-am all installdirs \
 -mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
 +pdf: pdf-am
 +
 +pdf-am:
@@ -46724,19 +55171,18 @@
 +	uninstall-info-am
  
  
- # If you know what your system's byte order is, define XML_BYTE_ORDER:
-@@ -347,7 +502,6 @@
- # -DXML_NS adds support for checking of lexical aspects of XML namespaces spec
- # -DXML_MIN_SIZE makes a smaller but slower parser
- # -DXML_DTD adds full support for parsing DTDs
+ style_cvs:
+@@ -364,7 +490,6 @@
+ 
+ style_personal:
+ 	astyle *.cpp
 -
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/src/font/Makefile.in
-===================================================================
---- libparagui1.0-1.0.4.orig/src/font/Makefile.in	2003-07-07 11:05:53.000000000 +0200
-+++ libparagui1.0-1.0.4/src/font/Makefile.in	2006-06-15 22:26:30.000000000 +0200
+diff -Nurd libparagui1.0-1.0.4.orig/src/Makefile.in libparagui1.0-1.0.4/src/Makefile.in
+--- libparagui1.0-1.0.4.orig/src/Makefile.in	2003-07-07 11:06:02.000000000 +0200
++++ libparagui1.0-1.0.4/src/Makefile.in	2007-12-21 23:59:16.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -46748,7 +55194,7 @@
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -10,83 +12,127 @@
+@@ -10,83 +12,146 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -46781,7 +55227,7 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
 -
- top_builddir = ../..
+ top_builddir = ..
 -
 -ACLOCAL = @ACLOCAL@
 -AUTOCONF = @AUTOCONF@
@@ -46810,7 +55256,7 @@
 +build_triplet = @build@
  host_triplet = @host@
 +target_triplet = @target@
-+subdir = src/font
++subdir = src
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -46819,10 +55265,23 @@
 +mkinstalldirs = $(install_sh) -d
 +CONFIG_HEADER = $(top_builddir)/include/paraconfig_gnu.h
 +CONFIG_CLEAN_FILES =
-+LTLIBRARIES = $(noinst_LTLIBRARIES)
-+libpgfont_la_LIBADD =
-+am_libpgfont_la_OBJECTS = pgfont_impl.lo pgfont.lo
-+libpgfont_la_OBJECTS = $(am_libpgfont_la_OBJECTS)
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj = case $$p in \
++    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++    *) f=$$p;; \
++  esac;
++am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
++am__installdirs = "$(DESTDIR)$(libdir)"
++libLTLIBRARIES_INSTALL = $(INSTALL)
++LTLIBRARIES = $(lib_LTLIBRARIES)
++am__DEPENDENCIES_1 =
++libparagui_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
++	$(am__DEPENDENCIES_1) ./draw/libpgdraw.la ./font/libpgfont.la \
++	./core/libpgcore.la ./widgets/libpgwidgets.la \
++	./themes/libtheme.la $(am__DEPENDENCIES_1)
++am_libparagui_la_OBJECTS = paragui.lo
++libparagui_la_OBJECTS = $(am_libparagui_la_OBJECTS)
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
@@ -46834,8 +55293,14 @@
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libpgfont_la_SOURCES)
-+DIST_SOURCES = $(libpgfont_la_SOURCES)
++SOURCES = $(libparagui_la_SOURCES)
++DIST_SOURCES = $(libparagui_la_SOURCES)
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -46909,7 +55374,7 @@
  PARAGUI_BINARY_AGE = @PARAGUI_BINARY_AGE@
  PARAGUI_CFLAGS = @PARAGUI_CFLAGS@
  PARAGUI_INTERFACE_AGE = @PARAGUI_INTERFACE_AGE@
-@@ -95,6 +141,7 @@
+@@ -95,6 +160,7 @@
  PARAGUI_MICRO_VERSION = @PARAGUI_MICRO_VERSION@
  PARAGUI_MINOR_VERSION = @PARAGUI_MINOR_VERSION@
  PARAGUI_VERSION = @PARAGUI_VERSION@
@@ -46917,10 +55382,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,103 +157,155 @@
+@@ -110,126 +176,184 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -46982,66 +55448,88 @@
 +target_cpu = @target_cpu@
 +target_os = @target_os@
 +target_vendor = @target_vendor@
- noinst_LTLIBRARIES = libpgfont.la
-+libpgfont_la_SOURCES = \
-+	pgfont_impl.cpp \
-+	pgfont.cpp
- 
--libpgfont_la_SOURCES =  	pgfont_impl.cpp 	pgfont.cpp
+ SUBDIRS = $(PHYSFS_SUBDIR) $(EXPAT_SUBDIR) draw font themes core widgets
 -
+-DIST_SUBDIRS = draw font themes core widgets expat physfs
 -
--EXTRA_DIST =  	facecache.h
-+libpgfont_la_LDFLAGS = \
-+	-lfreetype
++DIST_SUBDIRS = draw font themes core widgets expat
+ lib_LTLIBRARIES = libparagui.la
++libparagui_la_SOURCES = \
++	paragui.cpp
  
-+EXTRA_DIST = \
-+	facecache.h
- 
+-libparagui_la_SOURCES =  	paragui.cpp
+-
+-
+-libparagui_la_LDFLAGS =  	-release $(LT_RELEASE) 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-
+-
+-libparagui_la_LIBADD =  	$(SDL_LIBS) 	$(IMAGE_LIBS) 	$(EXPAT_LIB) 	$(PHYSFS_LIB) 	./draw/libpgdraw.la 	./font/libpgfont.la 	./core/libpgcore.la 	./widgets/libpgwidgets.la 	./themes/libtheme.la 	$(LIBSTDCPP)
+-
+-
 -INCLUDES =  	$(SDL_CFLAGS) 	-I$(top_srcdir)/include
 -
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = ../../include/paraconfig_gnu.h
+-CONFIG_HEADER = ../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
--LTLIBRARIES =  $(noinst_LTLIBRARIES)
+-LTLIBRARIES =  $(lib_LTLIBRARIES)
 -
 -
--DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
+-DEFS = @DEFS@ -I. -I$(srcdir) -I../include
 -CPPFLAGS = @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
--libpgfont_la_LDFLAGS = 
--libpgfont_la_LIBADD = 
--libpgfont_la_OBJECTS =  pgfont_impl.lo pgfont.lo
+-libparagui_la_DEPENDENCIES =  ./draw/libpgdraw.la ./font/libpgfont.la \
+-./core/libpgcore.la ./widgets/libpgwidgets.la ./themes/libtheme.la
+-libparagui_la_OBJECTS =  paragui.lo
 -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -CXXLD = $(CXX)
 -CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 -DIST_COMMON =  Makefile.am Makefile.in
--
++libparagui_la_LDFLAGS = \
++	-release $(LT_RELEASE) \
++	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ 
++libparagui_la_LIBADD = \
++	$(SDL_LIBS) \
++	$(IMAGE_LIBS) \
++	$(EXPAT_LIB) \
++	$(PHYSFS_LIB) \
++	./draw/libpgdraw.la \
++	./font/libpgfont.la \
++	./core/libpgcore.la \
++	./widgets/libpgwidgets.la \
++	./themes/libtheme.la \
++	$(LIBSTDCPP)
+ 
+-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 +INCLUDES = \
 +	$(SDL_CFLAGS) \
 +	-I$(top_srcdir)/include
  
--DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+all: all-am
- 
 -TAR = gtar
 -GZIP_ENV = --best
--SOURCES = $(libpgfont_la_SOURCES)
--OBJECTS = $(libpgfont_la_OBJECTS)
--
+-SOURCES = $(libparagui_la_SOURCES)
+-OBJECTS = $(libparagui_la_OBJECTS)
++all: all-recursive
+ 
 -all: all-redirect
  .SUFFIXES:
 -.SUFFIXES: .S .c .cpp .lo .o .obj .s
 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/font/Makefile
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps src/Makefile
 -
 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 -
 -
--mostlyclean-noinstLTLIBRARIES:
+-mostlyclean-libLTLIBRARIES:
+-
+-clean-libLTLIBRARIES:
+-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+-
+-distclean-libLTLIBRARIES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
@@ -47052,9 +55540,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/font/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  src/font/Makefile
++	  $(AUTOMAKE) --gnu  src/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -47064,22 +55552,39 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
+-maintainer-clean-libLTLIBRARIES:
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+ install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(libdir)
++	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
+ 	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
+-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
++	    f=$(am__strip_dir) \
++	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
++	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+ 	  else :; fi; \
+ 	done
  
- clean-noinstLTLIBRARIES:
- 	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
--
--distclean-noinstLTLIBRARIES:
--
--maintainer-clean-noinstLTLIBRARIES:
--
+ uninstall-libLTLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+-	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
++	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
++	  p=$(am__strip_dir) \
++	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
++	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+ 	done
+ 
 -.c.o:
 -	$(COMPILE) -c $<
 -
@@ -47093,14 +55598,16 @@
 -
 -.S.o:
 -	$(COMPILE) -c $<
-+	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
++clean-libLTLIBRARIES:
++	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
++	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
 +	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
 +	  test "$$dir" != "$$p" || dir=.; \
 +	  echo "rm -f \"$${dir}/so_locations\""; \
 +	  rm -f "$${dir}/so_locations"; \
 +	done
-+libpgfont.la: $(libpgfont_la_OBJECTS) $(libpgfont_la_DEPENDENCIES) 
-+	$(CXXLINK)  $(libpgfont_la_LDFLAGS) $(libpgfont_la_OBJECTS) $(libpgfont_la_LIBADD) $(LIBS)
++libparagui.la: $(libparagui_la_OBJECTS) $(libparagui_la_DEPENDENCIES) 
++	$(CXXLINK) -rpath $(libdir) $(libparagui_la_LDFLAGS) $(libparagui_la_OBJECTS) $(libparagui_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
 -	-rm -f *.o core *.core
@@ -47112,8 +55619,7 @@
  	-rm -f *.tab.c
  
 -maintainer-clean-compile:
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgfont.Plo at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgfont_impl.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/paragui.Plo at am__quote@
  
 -.c.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
@@ -47144,81 +55650,176 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -215,148 +314,174 @@
+@@ -238,17 +362,8 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
+-
 -maintainer-clean-libtool:
 -
--libpgfont.la: $(libpgfont_la_OBJECTS) $(libpgfont_la_DEPENDENCIES)
--	$(CXXLINK)  $(libpgfont_la_LDFLAGS) $(libpgfont_la_OBJECTS) $(libpgfont_la_LIBADD) $(LIBS)
+-libparagui.la: $(libparagui_la_OBJECTS) $(libparagui_la_DEPENDENCIES)
+-	$(CXXLINK) -rpath $(libdir) $(libparagui_la_LDFLAGS) $(libparagui_la_OBJECTS) $(libparagui_la_LIBADD) $(LIBS)
 -.cpp.o:
 -	$(CXXCOMPILE) -c $<
 -.cpp.obj:
 -	$(CXXCOMPILE) -c `cygpath -w $<`
 -.cpp.lo:
 -	$(LTCXXCOMPILE) -c $<
++	-rm -f libtool
++uninstall-info-am:
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -256,13 +371,14 @@
+ # (1) if the variable is set in `config.status', edit `config.status'
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
 -
+- at SET_MAKE@
+-
+-all-recursive install-data-recursive install-exec-recursive \
+-installdirs-recursive install-recursive uninstall-recursive  \
+-check-recursive installcheck-recursive info-recursive dvi-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++$(RECURSIVE_TARGETS):
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -274,7 +390,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -282,13 +398,24 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  test "$$subdir" != "." || dot_seen=yes; \
++	case "$@" in \
++	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++	  *) list='$(SUBDIRS)' ;; \
++	esac; \
++	rev=''; for subdir in $$list; do \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+@@ -298,158 +425,219 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ 	done
++ctags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++	done
+ 
+-tags: TAGS
+-
+-ID: $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
+ 	       END { for (i in files) print i; }'`; \
+-	here=`pwd` && cd $(srcdir) \
+-	  && mkid -f$$here/ID $$unique $(LISP)
 +	mkid -fID $$unique
- tags: TAGS
++tags: TAGS
  
--ID: $(HEADERS) $(SOURCES) $(LISP)
+-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
++	  include_option=--etags-include; \
++	  empty_fix=.; \
++	else \
++	  include_option=--include; \
++	  empty_fix=; \
++	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+-   if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+-   fi; \
++	  if test "$$subdir" = .; then :; else \
++	    test ! -f $$subdir/TAGS || \
++	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++	  fi; \
+ 	done; \
 -	list='$(SOURCES) $(HEADERS)'; \
 -	unique=`for i in $$list; do echo $$i; done | \
 -	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
+-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 -
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+-mostlyclean-tags:
 +	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  test -n "$$unique" || unique=$$empty_fix; \
 +	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	    $$tags $$unique; \
 +	fi
 +ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
++	tags=; \
++	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
--
--mostlyclean-tags:
--
--clean-tags:
++	       END { for (i in files) print i; }'`; \
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -47231,7 +55832,7 @@
 -
 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 -
--subdir = src/font
+-subdir = src
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
@@ -47266,50 +55867,68 @@
 +	    || exit 1; \
  	  fi; \
  	done
--pgfont.lo pgfont.o : pgfont.cpp ../../include/pgfont.h \
--	../../include/paragui.h ../../include/paraconfig.h \
--	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
--	../../include/pgrect.h ../../include/pgdatacontainer.h \
--	../../include/pglog.h ../../include/pgfilearchive.h \
--	../../include/pgfile.h ../../include/pgsurfacecache.h \
--	facecache.h
--pgfont_impl.lo pgfont_impl.o : pgfont_impl.cpp ../../include/pglog.h \
--	../../include/paragui.h ../../include/paraconfig.h \
--	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
--	../../include/pgrect.h facecache.h \
--	../../include/pgdatacontainer.h ../../include/pgfont.h
+-	for subdir in $(DIST_SUBDIRS); do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+-	    chmod 777 $(distdir)/$$subdir; \
+-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
++	    (cd $$subdir && \
++	      $(MAKE) $(AM_MAKEFLAGS) \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
++	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
+-paragui.lo paragui.o : paragui.cpp ../include/pginfo.h \
+-	../include/paragui.h ../include/paraconfig.h \
+-	../include/paraconfig_gnu.h ../include/paragui_types.h \
+-	../include/pgrect.h ../include/pglog.h
 -
 -info-am:
--info: info-am
+-info: info-recursive
 -dvi-am:
--dvi: dvi-am
+-dvi: dvi-recursive
  check-am: all-am
- check: check-am
+ check: check-recursive
 -installcheck-am:
--installcheck: installcheck-am
--install-exec-am:
+-installcheck: installcheck-recursive
+-install-exec-am: install-libLTLIBRARIES
 +all-am: Makefile $(LTLIBRARIES)
-+installdirs:
-+install: install-am
- install-exec: install-exec-am
++installdirs: installdirs-recursive
++installdirs-am:
++	for dir in "$(DESTDIR)$(libdir)"; do \
++	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
++	done
++install: install-recursive
+ install-exec: install-exec-recursive
 -
 -install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
+ install-data: install-data-recursive
++uninstall: uninstall-recursive
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
--uninstall-am:
--uninstall: uninstall-am
+-install: install-recursive
+-uninstall-am: uninstall-libLTLIBRARIES
+-uninstall: uninstall-recursive
 -all-am: Makefile $(LTLIBRARIES)
--all-redirect: all-am
+-all-redirect: all-recursive
 -install-strip:
 -	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
+-installdirs: installdirs-recursive
+-installdirs-am:
+-	$(mkinstalldirs)  $(DESTDIR)$(libdir)
 -
  
-+installcheck: installcheck-am
++installcheck: installcheck-recursive
 +install-strip:
 +	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -47325,103 +55944,114 @@
 +	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
  
  maintainer-clean-generic:
--mostlyclean-am:  mostlyclean-noinstLTLIBRARIES mostlyclean-compile \
+-mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
 -		mostlyclean-libtool mostlyclean-tags \
 -		mostlyclean-generic
 +	@echo "This command is intended for maintainers to use"
 +	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
++clean: clean-recursive
  
--mostlyclean: mostlyclean-am
-+clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+-mostlyclean: mostlyclean-recursive
++clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 +	mostlyclean-am
  
--clean-am:  clean-noinstLTLIBRARIES clean-compile clean-libtool \
--		clean-tags clean-generic mostlyclean-am
-+distclean: distclean-am
+-clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++distclean: distclean-recursive
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +	distclean-libtool distclean-tags
  
--clean: clean-am
-+dvi: dvi-am
+-clean: clean-recursive
++dvi: dvi-recursive
  
--distclean-am:  distclean-noinstLTLIBRARIES distclean-compile \
+-distclean-am:  distclean-libLTLIBRARIES distclean-compile \
 -		distclean-libtool distclean-tags distclean-generic \
 -		clean-am
 -	-rm -f libtool
 +dvi-am:
  
--distclean: distclean-am
-+html: html-am
+-distclean: distclean-recursive
++html: html-recursive
  
--maintainer-clean-am:  maintainer-clean-noinstLTLIBRARIES \
+-maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
 -		maintainer-clean-compile maintainer-clean-libtool \
 -		maintainer-clean-tags maintainer-clean-generic \
 -		distclean-am
 -	@echo "This command is intended for maintainers to use;"
 -	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
++info: info-recursive
 +
 +info-am:
 +
 +install-data-am:
 +
-+install-exec-am:
++install-exec-am: install-libLTLIBRARIES
 +
-+install-info: install-info-am
++install-info: install-info-recursive
 +
 +install-man:
 +
 +installcheck-am:
  
- maintainer-clean: maintainer-clean-am
+ maintainer-clean: maintainer-clean-recursive
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
  
--.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
--clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
--mostlyclean-compile distclean-compile clean-compile \
--maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+-.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \
+-clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \
+-uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \
+-distclean-compile clean-compile maintainer-clean-compile \
+-mostlyclean-libtool distclean-libtool clean-libtool \
+-maintainer-clean-libtool install-data-recursive \
+-uninstall-data-recursive install-exec-recursive \
+-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+-all-recursive check-recursive installcheck-recursive info-recursive \
+-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
 -install-exec install-data-am install-data install-am install \
--uninstall-am uninstall all-redirect all-am all installdirs \
--mostlyclean-generic distclean-generic clean-generic \
+-uninstall-am uninstall all-redirect all-am all installdirs-am \
+-installdirs mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+pdf: pdf-am
++mostlyclean: mostlyclean-recursive
 +
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
++pdf: pdf-recursive
++
 +pdf-am:
 +
-+ps: ps-am
++ps: ps-recursive
 +
 +ps-am:
 +
-+uninstall-am: uninstall-info-am
++uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
 +
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
++uninstall-info: uninstall-info-recursive
++
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libLTLIBRARIES clean-libtool \
++	clean-recursive ctags ctags-recursive distclean \
 +	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-libLTLIBRARIES install-man \
 +	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-info-am
++	installdirs-am maintainer-clean maintainer-clean-generic \
++	maintainer-clean-recursive mostlyclean mostlyclean-compile \
++	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
++	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++	uninstall-info-am uninstall-libLTLIBRARIES
  
  
  style_cvs:
-@@ -364,7 +489,6 @@
+@@ -457,7 +645,6 @@
  
  style_personal:
  	astyle *.cpp
@@ -47429,10 +56059,9 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/src/themes/Makefile.in
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/src/themes/Makefile.in libparagui1.0-1.0.4/src/themes/Makefile.in
 --- libparagui1.0-1.0.4.orig/src/themes/Makefile.in	2003-07-07 11:06:05.000000000 +0200
-+++ libparagui1.0-1.0.4/src/themes/Makefile.in	2006-06-15 22:26:30.000000000 +0200
++++ libparagui1.0-1.0.4/src/themes/Makefile.in	2007-12-21 23:59:17.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -47613,10 +56242,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,103 +157,153 @@
+@@ -110,103 +157,154 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -47682,21 +56312,13 @@
 +libtheme_la_SOURCES = \
 +	themeloader.cpp \
 +	theme_priv.cpp
-+
-+INCLUDES = \
-+	$(EXPAT_INCLUDE) \
-+	$(SDL_CFLAGS) \
-+	-I$(top_srcdir)/include
  
 -libtheme_la_SOURCES =  	themeloader.cpp 	theme_priv.cpp
 -
 -
 -INCLUDES =  	$(EXPAT_INCLUDE) 	$(SDL_CFLAGS) 	-I$(top_srcdir)/include
-+EXTRA_DIST = \
-+	theme_priv.h
- 
-+all: all-am
- 
+-
+-
 -EXTRA_DIST =  	theme_priv.h
 -
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -47718,14 +56340,21 @@
 -CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
 -DIST_COMMON =  Makefile.am Makefile.in
 -
--
++INCLUDES = \
++	$(EXPAT_INCLUDE) \
++	$(SDL_CFLAGS) \
++	-I$(top_srcdir)/include
+ 
 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
++EXTRA_DIST = \
++	theme_priv.h
+ 
 -TAR = gtar
 -GZIP_ENV = --best
 -SOURCES = $(libtheme_la_SOURCES)
 -OBJECTS = $(libtheme_la_OBJECTS)
--
++all: all-am
+ 
 -all: all-redirect
  .SUFFIXES:
 -.SUFFIXES: .S .c .cpp .lo .o .obj .s
@@ -47735,9 +56364,6 @@
 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-noinstLTLIBRARIES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
@@ -47748,9 +56374,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/themes/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/themes/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  src/themes/Makefile
++	  $(AUTOMAKE) --gnu  src/themes/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -47760,10 +56386,11 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-mostlyclean-noinstLTLIBRARIES:
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -47840,7 +56467,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -215,150 +312,174 @@
+@@ -215,150 +313,174 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
@@ -47909,12 +56536,11 @@
 -	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 -
 -mostlyclean-tags:
--
--clean-tags:
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -48078,11 +56704,6 @@
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
  
 -.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
 -clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
@@ -48095,6 +56716,11 @@
 -uninstall-am uninstall all-redirect all-am all installdirs \
 -mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
 +pdf: pdf-am
 +
 +pdf-am:
@@ -48119,7 +56745,7 @@
  
  
  style_cvs:
-@@ -368,7 +489,6 @@
+@@ -368,7 +490,6 @@
  style_personal:
  	astyle *.cpp
  	astyle *.h
@@ -48127,10 +56753,9 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/src/widgets/Makefile.in
-===================================================================
+diff -Nurd libparagui1.0-1.0.4.orig/src/widgets/Makefile.in libparagui1.0-1.0.4/src/widgets/Makefile.in
 --- libparagui1.0-1.0.4.orig/src/widgets/Makefile.in	2003-07-07 11:06:08.000000000 +0200
-+++ libparagui1.0-1.0.4/src/widgets/Makefile.in	2006-06-15 22:26:31.000000000 +0200
++++ libparagui1.0-1.0.4/src/widgets/Makefile.in	2007-12-21 23:59:17.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -48318,10 +56943,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,108 +164,201 @@
+@@ -110,108 +164,202 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -48451,13 +57077,13 @@
 -
 -
 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+all: all-am
- 
+-
 -TAR = gtar
 -GZIP_ENV = --best
 -SOURCES = $(libpgwidgets_la_SOURCES)
 -OBJECTS = $(libpgwidgets_la_OBJECTS)
--
++all: all-am
+ 
 -all: all-redirect
  .SUFFIXES:
 -.SUFFIXES: .S .c .cpp .lo .o .obj .s
@@ -48467,9 +57093,6 @@
 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-noinstLTLIBRARIES:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
@@ -48480,9 +57103,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/widgets/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/widgets/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  src/widgets/Makefile
++	  $(AUTOMAKE) --gnu  src/widgets/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -48492,10 +57115,11 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-mostlyclean-noinstLTLIBRARIES:
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -48597,7 +57221,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -220,427 +367,174 @@
+@@ -220,427 +368,174 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
@@ -48666,12 +57290,11 @@
 -	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 -
 -mostlyclean-tags:
--
--clean-tags:
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -49112,11 +57735,6 @@
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
  
 -.PHONY: mostlyclean-noinstLTLIBRARIES distclean-noinstLTLIBRARIES \
 -clean-noinstLTLIBRARIES maintainer-clean-noinstLTLIBRARIES \
@@ -49129,6 +57747,11 @@
 -uninstall-am uninstall all-redirect all-am all installdirs \
 -mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
 +pdf: pdf-am
 +
 +pdf-am:
@@ -49153,7 +57776,7 @@
  
  
  style_cvs:
-@@ -648,7 +542,6 @@
+@@ -648,7 +543,6 @@
  
  style_personal:
  	astyle *.cpp
@@ -49161,10 +57784,9 @@
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
-Index: libparagui1.0-1.0.4/test/Makefile.in
-===================================================================
---- libparagui1.0-1.0.4.orig/test/Makefile.in	2003-07-07 11:06:21.000000000 +0200
-+++ libparagui1.0-1.0.4/test/Makefile.in	2006-06-15 22:26:31.000000000 +0200
+diff -Nurd libparagui1.0-1.0.4.orig/test/colorselector/Makefile.in libparagui1.0-1.0.4/test/colorselector/Makefile.in
+--- libparagui1.0-1.0.4.orig/test/colorselector/Makefile.in	2003-07-07 11:06:24.000000000 +0200
++++ libparagui1.0-1.0.4/test/colorselector/Makefile.in	2007-12-21 23:59:18.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -49176,7 +57798,7 @@
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -10,83 +12,193 @@
+@@ -10,83 +12,129 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -49209,7 +57831,7 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
 -
- top_builddir = ..
+ top_builddir = ../..
 -
 -ACLOCAL = @ACLOCAL@
 -AUTOCONF = @AUTOCONF@
@@ -49238,14 +57860,9 @@
 +build_triplet = @build@
  host_triplet = @host@
 +target_triplet = @target@
-+noinst_PROGRAMS = widgetlistbug$(EXEEXT) eventbug$(EXEEXT) \
-+	array$(EXEEXT) writefile$(EXEEXT) stress1$(EXEEXT) \
-+	stress2$(EXEEXT) listbox$(EXEEXT) animation$(EXEEXT) \
-+	dropdown$(EXEEXT) paratest$(EXEEXT) dblbuffer$(EXEEXT) \
-+	navtest$(EXEEXT) windowtest$(EXEEXT) layouttest$(EXEEXT) \
-+	windowresize$(EXEEXT)
-+subdir = test
-+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++noinst_PROGRAMS = colorselector$(EXEEXT)
++subdir = test/colorselector
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/configure.in
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -49254,52 +57871,10 @@
 +CONFIG_HEADER = $(top_builddir)/include/paraconfig_gnu.h
 +CONFIG_CLEAN_FILES =
 +PROGRAMS = $(noinst_PROGRAMS)
-+am_animation_OBJECTS = animation.$(OBJEXT)
-+animation_OBJECTS = $(am_animation_OBJECTS)
++am_colorselector_OBJECTS = pgcolorselector.$(OBJEXT) main.$(OBJEXT)
++colorselector_OBJECTS = $(am_colorselector_OBJECTS)
 +am__DEPENDENCIES_1 =
-+animation_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_array_OBJECTS = array.$(OBJEXT)
-+array_OBJECTS = $(am_array_OBJECTS)
-+array_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_dblbuffer_OBJECTS = dblbuffer.$(OBJEXT)
-+dblbuffer_OBJECTS = $(am_dblbuffer_OBJECTS)
-+dblbuffer_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_dropdown_OBJECTS = dropdown.$(OBJEXT)
-+dropdown_OBJECTS = $(am_dropdown_OBJECTS)
-+dropdown_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_eventbug_OBJECTS = event_bug.$(OBJEXT)
-+eventbug_OBJECTS = $(am_eventbug_OBJECTS)
-+eventbug_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_layouttest_OBJECTS = layouttest.$(OBJEXT)
-+layouttest_OBJECTS = $(am_layouttest_OBJECTS)
-+layouttest_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_listbox_OBJECTS = listbox.$(OBJEXT)
-+listbox_OBJECTS = $(am_listbox_OBJECTS)
-+listbox_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_navtest_OBJECTS = navtest.$(OBJEXT)
-+navtest_OBJECTS = $(am_navtest_OBJECTS)
-+navtest_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_paratest_OBJECTS = paratest.$(OBJEXT)
-+paratest_OBJECTS = $(am_paratest_OBJECTS)
-+paratest_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_stress1_OBJECTS = stress1.$(OBJEXT)
-+stress1_OBJECTS = $(am_stress1_OBJECTS)
-+stress1_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_stress2_OBJECTS = stress2.$(OBJEXT)
-+stress2_OBJECTS = $(am_stress2_OBJECTS)
-+stress2_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_widgetlistbug_OBJECTS = widgetlistbug.$(OBJEXT)
-+widgetlistbug_OBJECTS = $(am_widgetlistbug_OBJECTS)
-+widgetlistbug_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_windowresize_OBJECTS = windowresize.$(OBJEXT)
-+windowresize_OBJECTS = $(am_windowresize_OBJECTS)
-+windowresize_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_windowtest_OBJECTS = windowtest.$(OBJEXT)
-+windowtest_OBJECTS = $(am_windowtest_OBJECTS)
-+windowtest_DEPENDENCIES = $(am__DEPENDENCIES_1)
-+am_writefile_OBJECTS = writefile.$(OBJEXT)
-+writefile_OBJECTS = $(am_writefile_OBJECTS)
-+writefile_DEPENDENCIES = $(am__DEPENDENCIES_1)
++colorselector_DEPENDENCIES = $(am__DEPENDENCIES_1)
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
@@ -49311,27 +57886,10 @@
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(animation_SOURCES) $(array_SOURCES) $(dblbuffer_SOURCES) \
-+	$(dropdown_SOURCES) $(eventbug_SOURCES) $(layouttest_SOURCES) \
-+	$(listbox_SOURCES) $(navtest_SOURCES) $(paratest_SOURCES) \
-+	$(stress1_SOURCES) $(stress2_SOURCES) $(widgetlistbug_SOURCES) \
-+	$(windowresize_SOURCES) $(windowtest_SOURCES) \
-+	$(writefile_SOURCES)
-+DIST_SOURCES = $(animation_SOURCES) $(array_SOURCES) \
-+	$(dblbuffer_SOURCES) $(dropdown_SOURCES) $(eventbug_SOURCES) \
-+	$(layouttest_SOURCES) $(listbox_SOURCES) $(navtest_SOURCES) \
-+	$(paratest_SOURCES) $(stress1_SOURCES) $(stress2_SOURCES) \
-+	$(widgetlistbug_SOURCES) $(windowresize_SOURCES) \
-+	$(windowtest_SOURCES) $(writefile_SOURCES)
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive
++SOURCES = $(colorselector_SOURCES)
++DIST_SOURCES = $(colorselector_SOURCES)
 +ETAGS = etags
 +CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMDEP_FALSE = @AMDEP_FALSE@
@@ -49403,7 +57961,7 @@
  PARAGUI_BINARY_AGE = @PARAGUI_BINARY_AGE@
  PARAGUI_CFLAGS = @PARAGUI_CFLAGS@
  PARAGUI_INTERFACE_AGE = @PARAGUI_INTERFACE_AGE@
-@@ -95,6 +207,7 @@
+@@ -95,6 +143,7 @@
  PARAGUI_MICRO_VERSION = @PARAGUI_MICRO_VERSION@
  PARAGUI_MINOR_VERSION = @PARAGUI_MINOR_VERSION@
  PARAGUI_VERSION = @PARAGUI_VERSION@
@@ -49411,10 +57969,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,197 +223,237 @@
+@@ -110,106 +159,152 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -49447,6 +58006,10 @@
 +exec_prefix = @exec_prefix@
  freetype_config = @freetype_config@
 -
+-noinst_PROGRAMS = colorselector
+-
+-colorselector_SOURCES =  	pgcolorselector.cpp 	main.cpp
+-
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
@@ -49476,159 +58039,60 @@
 +target_cpu = @target_cpu@
 +target_os = @target_os@
 +target_vendor = @target_vendor@
- AUTOMAKE_OPTIONS = foreign
--
--SUBDIRS =  	keyboard 	fireworks 	colorselector
--
--
--noinst_PROGRAMS =  	widgetlistbug 	eventbug 	array 	writefile 	stress1 	stress2 	listbox 	animation 	dropdown 	paratest 	dblbuffer 	navtest 	windowtest 	layouttest 	windowresize
--
-+SUBDIRS = \
-+	keyboard \
-+	fireworks \
-+	colorselector
++colorselector_SOURCES = \
++	pgcolorselector.cpp \
++	main.cpp
  
- widgetlistbug_SOURCES = widgetlistbug.cpp
- widgetlistbug_LDADD = -L../src $(PARAGUI_LIBS)
--
- eventbug_SOURCES = event_bug.cpp
- eventbug_LDADD = -L../src $(PARAGUI_LIBS)
--
- array_SOURCES = array.cpp
- array_LDADD = -L../src $(PARAGUI_LIBS)
--
- writefile_SOURCES = writefile.cpp
- writefile_LDADD = -L../src $(PARAGUI_LIBS)
--
- stress1_SOURCES = stress1.cpp
- stress1_LDADD = -L../src $(PARAGUI_LIBS)
--
- stress2_SOURCES = stress2.cpp
- stress2_LDADD = -L../src $(PARAGUI_LIBS)
--
- listbox_SOURCES = listbox.cpp
- listbox_LDADD = -L../src $(PARAGUI_LIBS)
--
- windowresize_SOURCES = windowresize.cpp
- windowresize_LDADD = -L../src $(PARAGUI_LIBS)
--
- dropdown_SOURCES = dropdown.cpp
- dropdown_LDADD = -L../src $(PARAGUI_LIBS)
--
- animation_SOURCES = animation.cpp
- animation_LDADD = -L../src $(PARAGUI_LIBS)
--
- dblbuffer_SOURCES = dblbuffer.cpp
- dblbuffer_LDADD = -L../src $(PARAGUI_LIBS)
--
- paratest_SOURCES = paratest.cpp
- paratest_LDADD = -L../src $(PARAGUI_LIBS)
--
- navtest_SOURCES = navtest.cpp
- navtest_LDADD = -L../src $(PARAGUI_LIBS)
--
- windowtest_SOURCES = windowtest.cpp
- windowtest_LDADD = -L../src $(PARAGUI_LIBS)
--
- layouttest_SOURCES = layouttest.cpp
- layouttest_LDADD = -L../src $(PARAGUI_LIBS)
--
- INCLUDES = $(PARAGUI_CFLAGS) -I$(top_srcdir)/include
+ colorselector_LDADD = -L../../src $(PARAGUI_LIBS)
 +EXTRA_DIST = \
-+	dblbuffer.xml \
-+	pokus.xml \
-+	icon.bmp \
-+	paratest.dev
++	pgcolorselector.h
  
--EXTRA_DIST =  	dblbuffer.xml 	pokus.xml 	icon.bmp 	paratest.dev
+-EXTRA_DIST =  	pgcolorselector.h
 -
+-
+-INCLUDES =  	-I$(top_srcdir)/include 	$(PARAGUI_CFLAGS)
+-
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = ../include/paraconfig_gnu.h
+-CONFIG_HEADER = ../../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
--noinst_PROGRAMS =  widgetlistbug$(EXEEXT) eventbug$(EXEEXT) \
--array$(EXEEXT) writefile$(EXEEXT) stress1$(EXEEXT) stress2$(EXEEXT) \
--listbox$(EXEEXT) animation$(EXEEXT) dropdown$(EXEEXT) paratest$(EXEEXT) \
--dblbuffer$(EXEEXT) navtest$(EXEEXT) windowtest$(EXEEXT) \
--layouttest$(EXEEXT) windowresize$(EXEEXT)
+-noinst_PROGRAMS =  colorselector$(EXEEXT)
 -PROGRAMS =  $(noinst_PROGRAMS)
 -
 -
--DEFS = @DEFS@ -I. -I$(srcdir) -I../include
+-DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
 -CPPFLAGS = @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
--widgetlistbug_OBJECTS =  widgetlistbug.$(OBJEXT)
--widgetlistbug_DEPENDENCIES = 
--widgetlistbug_LDFLAGS = 
--eventbug_OBJECTS =  event_bug.$(OBJEXT)
--eventbug_DEPENDENCIES = 
--eventbug_LDFLAGS = 
--array_OBJECTS =  array.$(OBJEXT)
--array_DEPENDENCIES = 
--array_LDFLAGS = 
--writefile_OBJECTS =  writefile.$(OBJEXT)
--writefile_DEPENDENCIES = 
--writefile_LDFLAGS = 
--stress1_OBJECTS =  stress1.$(OBJEXT)
--stress1_DEPENDENCIES = 
--stress1_LDFLAGS = 
--stress2_OBJECTS =  stress2.$(OBJEXT)
--stress2_DEPENDENCIES = 
--stress2_LDFLAGS = 
--listbox_OBJECTS =  listbox.$(OBJEXT)
--listbox_DEPENDENCIES = 
--listbox_LDFLAGS = 
--animation_OBJECTS =  animation.$(OBJEXT)
--animation_DEPENDENCIES = 
--animation_LDFLAGS = 
--dropdown_OBJECTS =  dropdown.$(OBJEXT)
--dropdown_DEPENDENCIES = 
--dropdown_LDFLAGS = 
--paratest_OBJECTS =  paratest.$(OBJEXT)
--paratest_DEPENDENCIES = 
--paratest_LDFLAGS = 
--dblbuffer_OBJECTS =  dblbuffer.$(OBJEXT)
--dblbuffer_DEPENDENCIES = 
--dblbuffer_LDFLAGS = 
--navtest_OBJECTS =  navtest.$(OBJEXT)
--navtest_DEPENDENCIES = 
--navtest_LDFLAGS = 
--windowtest_OBJECTS =  windowtest.$(OBJEXT)
--windowtest_DEPENDENCIES = 
--windowtest_LDFLAGS = 
--layouttest_OBJECTS =  layouttest.$(OBJEXT)
--layouttest_DEPENDENCIES = 
--layouttest_LDFLAGS = 
--windowresize_OBJECTS =  windowresize.$(OBJEXT)
--windowresize_DEPENDENCIES = 
--windowresize_LDFLAGS = 
+-colorselector_OBJECTS =  pgcolorselector.$(OBJEXT) main.$(OBJEXT)
+-colorselector_DEPENDENCIES = 
+-colorselector_LDFLAGS = 
 -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -CXXLD = $(CXX)
 -CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  README Makefile.am Makefile.in
+-DIST_COMMON =  Makefile.am Makefile.in
 -
 -
 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-+all: all-recursive
++INCLUDES = \
++	-I$(top_srcdir)/include \
++	$(PARAGUI_CFLAGS)
  
 -TAR = gtar
 -GZIP_ENV = --best
--SOURCES = $(widgetlistbug_SOURCES) $(eventbug_SOURCES) $(array_SOURCES) $(writefile_SOURCES) $(stress1_SOURCES) $(stress2_SOURCES) $(listbox_SOURCES) $(animation_SOURCES) $(dropdown_SOURCES) $(paratest_SOURCES) $(dblbuffer_SOURCES) $(navtest_SOURCES) $(windowtest_SOURCES) $(layouttest_SOURCES) $(windowresize_SOURCES)
--OBJECTS = $(widgetlistbug_OBJECTS) $(eventbug_OBJECTS) $(array_OBJECTS) $(writefile_OBJECTS) $(stress1_OBJECTS) $(stress2_OBJECTS) $(listbox_OBJECTS) $(animation_OBJECTS) $(dropdown_OBJECTS) $(paratest_OBJECTS) $(dblbuffer_OBJECTS) $(navtest_OBJECTS) $(windowtest_OBJECTS) $(layouttest_OBJECTS) $(windowresize_OBJECTS)
--
+-SOURCES = $(colorselector_SOURCES)
+-OBJECTS = $(colorselector_OBJECTS)
++all: all-am
+ 
 -all: all-redirect
  .SUFFIXES:
 -.SUFFIXES: .S .c .cpp .lo .o .obj .s
 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps test/Makefile
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps test/colorselector/Makefile
 -
 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-noinstPROGRAMS:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
@@ -49639,9 +58103,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  test/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/colorselector/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  test/Makefile
++	  $(AUTOMAKE) --gnu  test/colorselector/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -49651,10 +58115,11 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-mostlyclean-noinstPROGRAMS:
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -49685,51 +58150,9 @@
 +	  echo " rm -f $$p $$f"; \
 +	  rm -f $$p $$f ; \
 +	done
-+animation$(EXEEXT): $(animation_OBJECTS) $(animation_DEPENDENCIES) 
-+	@rm -f animation$(EXEEXT)
-+	$(CXXLINK) $(animation_LDFLAGS) $(animation_OBJECTS) $(animation_LDADD) $(LIBS)
-+array$(EXEEXT): $(array_OBJECTS) $(array_DEPENDENCIES) 
-+	@rm -f array$(EXEEXT)
-+	$(CXXLINK) $(array_LDFLAGS) $(array_OBJECTS) $(array_LDADD) $(LIBS)
-+dblbuffer$(EXEEXT): $(dblbuffer_OBJECTS) $(dblbuffer_DEPENDENCIES) 
-+	@rm -f dblbuffer$(EXEEXT)
-+	$(CXXLINK) $(dblbuffer_LDFLAGS) $(dblbuffer_OBJECTS) $(dblbuffer_LDADD) $(LIBS)
-+dropdown$(EXEEXT): $(dropdown_OBJECTS) $(dropdown_DEPENDENCIES) 
-+	@rm -f dropdown$(EXEEXT)
-+	$(CXXLINK) $(dropdown_LDFLAGS) $(dropdown_OBJECTS) $(dropdown_LDADD) $(LIBS)
-+eventbug$(EXEEXT): $(eventbug_OBJECTS) $(eventbug_DEPENDENCIES) 
-+	@rm -f eventbug$(EXEEXT)
-+	$(CXXLINK) $(eventbug_LDFLAGS) $(eventbug_OBJECTS) $(eventbug_LDADD) $(LIBS)
-+layouttest$(EXEEXT): $(layouttest_OBJECTS) $(layouttest_DEPENDENCIES) 
-+	@rm -f layouttest$(EXEEXT)
-+	$(CXXLINK) $(layouttest_LDFLAGS) $(layouttest_OBJECTS) $(layouttest_LDADD) $(LIBS)
-+listbox$(EXEEXT): $(listbox_OBJECTS) $(listbox_DEPENDENCIES) 
-+	@rm -f listbox$(EXEEXT)
-+	$(CXXLINK) $(listbox_LDFLAGS) $(listbox_OBJECTS) $(listbox_LDADD) $(LIBS)
-+navtest$(EXEEXT): $(navtest_OBJECTS) $(navtest_DEPENDENCIES) 
-+	@rm -f navtest$(EXEEXT)
-+	$(CXXLINK) $(navtest_LDFLAGS) $(navtest_OBJECTS) $(navtest_LDADD) $(LIBS)
-+paratest$(EXEEXT): $(paratest_OBJECTS) $(paratest_DEPENDENCIES) 
-+	@rm -f paratest$(EXEEXT)
-+	$(CXXLINK) $(paratest_LDFLAGS) $(paratest_OBJECTS) $(paratest_LDADD) $(LIBS)
-+stress1$(EXEEXT): $(stress1_OBJECTS) $(stress1_DEPENDENCIES) 
-+	@rm -f stress1$(EXEEXT)
-+	$(CXXLINK) $(stress1_LDFLAGS) $(stress1_OBJECTS) $(stress1_LDADD) $(LIBS)
-+stress2$(EXEEXT): $(stress2_OBJECTS) $(stress2_DEPENDENCIES) 
-+	@rm -f stress2$(EXEEXT)
-+	$(CXXLINK) $(stress2_LDFLAGS) $(stress2_OBJECTS) $(stress2_LDADD) $(LIBS)
-+widgetlistbug$(EXEEXT): $(widgetlistbug_OBJECTS) $(widgetlistbug_DEPENDENCIES) 
-+	@rm -f widgetlistbug$(EXEEXT)
-+	$(CXXLINK) $(widgetlistbug_LDFLAGS) $(widgetlistbug_OBJECTS) $(widgetlistbug_LDADD) $(LIBS)
-+windowresize$(EXEEXT): $(windowresize_OBJECTS) $(windowresize_DEPENDENCIES) 
-+	@rm -f windowresize$(EXEEXT)
-+	$(CXXLINK) $(windowresize_LDFLAGS) $(windowresize_OBJECTS) $(windowresize_LDADD) $(LIBS)
-+windowtest$(EXEEXT): $(windowtest_OBJECTS) $(windowtest_DEPENDENCIES) 
-+	@rm -f windowtest$(EXEEXT)
-+	$(CXXLINK) $(windowtest_LDFLAGS) $(windowtest_OBJECTS) $(windowtest_LDADD) $(LIBS)
-+writefile$(EXEEXT): $(writefile_OBJECTS) $(writefile_DEPENDENCIES) 
-+	@rm -f writefile$(EXEEXT)
-+	$(CXXLINK) $(writefile_LDFLAGS) $(writefile_OBJECTS) $(writefile_LDADD) $(LIBS)
++colorselector$(EXEEXT): $(colorselector_OBJECTS) $(colorselector_DEPENDENCIES) 
++	@rm -f colorselector$(EXEEXT)
++	$(CXXLINK) $(colorselector_LDFLAGS) $(colorselector_OBJECTS) $(colorselector_LDADD) $(LIBS)
  
  mostlyclean-compile:
 -	-rm -f *.o core *.core
@@ -49741,21 +58164,8 @@
  	-rm -f *.tab.c
  
 -maintainer-clean-compile:
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/animation.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/array.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dblbuffer.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dropdown.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/event_bug.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/layouttest.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/listbox.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/navtest.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/paratest.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stress1.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stress2.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/widgetlistbug.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/windowresize.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/windowtest.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/writefile.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgcolorselector.Po at am__quote@
  
 -.c.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
@@ -49786,234 +58196,81 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -309,74 +462,8 @@
+@@ -218,158 +313,174 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
--
++	-rm -f libtool
++uninstall-info-am:
+ 
 -maintainer-clean-libtool:
 -
--widgetlistbug$(EXEEXT): $(widgetlistbug_OBJECTS) $(widgetlistbug_DEPENDENCIES)
--	@rm -f widgetlistbug$(EXEEXT)
--	$(CXXLINK) $(widgetlistbug_LDFLAGS) $(widgetlistbug_OBJECTS) $(widgetlistbug_LDADD) $(LIBS)
--
--eventbug$(EXEEXT): $(eventbug_OBJECTS) $(eventbug_DEPENDENCIES)
--	@rm -f eventbug$(EXEEXT)
--	$(CXXLINK) $(eventbug_LDFLAGS) $(eventbug_OBJECTS) $(eventbug_LDADD) $(LIBS)
--
--array$(EXEEXT): $(array_OBJECTS) $(array_DEPENDENCIES)
--	@rm -f array$(EXEEXT)
--	$(CXXLINK) $(array_LDFLAGS) $(array_OBJECTS) $(array_LDADD) $(LIBS)
--
--writefile$(EXEEXT): $(writefile_OBJECTS) $(writefile_DEPENDENCIES)
--	@rm -f writefile$(EXEEXT)
--	$(CXXLINK) $(writefile_LDFLAGS) $(writefile_OBJECTS) $(writefile_LDADD) $(LIBS)
--
--stress1$(EXEEXT): $(stress1_OBJECTS) $(stress1_DEPENDENCIES)
--	@rm -f stress1$(EXEEXT)
--	$(CXXLINK) $(stress1_LDFLAGS) $(stress1_OBJECTS) $(stress1_LDADD) $(LIBS)
--
--stress2$(EXEEXT): $(stress2_OBJECTS) $(stress2_DEPENDENCIES)
--	@rm -f stress2$(EXEEXT)
--	$(CXXLINK) $(stress2_LDFLAGS) $(stress2_OBJECTS) $(stress2_LDADD) $(LIBS)
--
--listbox$(EXEEXT): $(listbox_OBJECTS) $(listbox_DEPENDENCIES)
--	@rm -f listbox$(EXEEXT)
--	$(CXXLINK) $(listbox_LDFLAGS) $(listbox_OBJECTS) $(listbox_LDADD) $(LIBS)
--
--animation$(EXEEXT): $(animation_OBJECTS) $(animation_DEPENDENCIES)
--	@rm -f animation$(EXEEXT)
--	$(CXXLINK) $(animation_LDFLAGS) $(animation_OBJECTS) $(animation_LDADD) $(LIBS)
--
--dropdown$(EXEEXT): $(dropdown_OBJECTS) $(dropdown_DEPENDENCIES)
--	@rm -f dropdown$(EXEEXT)
--	$(CXXLINK) $(dropdown_LDFLAGS) $(dropdown_OBJECTS) $(dropdown_LDADD) $(LIBS)
--
--paratest$(EXEEXT): $(paratest_OBJECTS) $(paratest_DEPENDENCIES)
--	@rm -f paratest$(EXEEXT)
--	$(CXXLINK) $(paratest_LDFLAGS) $(paratest_OBJECTS) $(paratest_LDADD) $(LIBS)
--
--dblbuffer$(EXEEXT): $(dblbuffer_OBJECTS) $(dblbuffer_DEPENDENCIES)
--	@rm -f dblbuffer$(EXEEXT)
--	$(CXXLINK) $(dblbuffer_LDFLAGS) $(dblbuffer_OBJECTS) $(dblbuffer_LDADD) $(LIBS)
--
--navtest$(EXEEXT): $(navtest_OBJECTS) $(navtest_DEPENDENCIES)
--	@rm -f navtest$(EXEEXT)
--	$(CXXLINK) $(navtest_LDFLAGS) $(navtest_OBJECTS) $(navtest_LDADD) $(LIBS)
--
--windowtest$(EXEEXT): $(windowtest_OBJECTS) $(windowtest_DEPENDENCIES)
--	@rm -f windowtest$(EXEEXT)
--	$(CXXLINK) $(windowtest_LDFLAGS) $(windowtest_OBJECTS) $(windowtest_LDADD) $(LIBS)
--
--layouttest$(EXEEXT): $(layouttest_OBJECTS) $(layouttest_DEPENDENCIES)
--	@rm -f layouttest$(EXEEXT)
--	$(CXXLINK) $(layouttest_LDFLAGS) $(layouttest_OBJECTS) $(layouttest_LDADD) $(LIBS)
--
--windowresize$(EXEEXT): $(windowresize_OBJECTS) $(windowresize_DEPENDENCIES)
--	@rm -f windowresize$(EXEEXT)
--	$(CXXLINK) $(windowresize_LDFLAGS) $(windowresize_OBJECTS) $(windowresize_LDADD) $(LIBS)
+-colorselector$(EXEEXT): $(colorselector_OBJECTS) $(colorselector_DEPENDENCIES)
+-	@rm -f colorselector$(EXEEXT)
+-	$(CXXLINK) $(colorselector_LDFLAGS) $(colorselector_OBJECTS) $(colorselector_LDADD) $(LIBS)
 -.cpp.o:
 -	$(CXXCOMPILE) -c $<
 -.cpp.obj:
 -	$(CXXCOMPILE) -c `cygpath -w $<`
 -.cpp.lo:
 -	$(LTCXXCOMPILE) -c $<
-+	-rm -f libtool
-+uninstall-info-am:
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -384,13 +471,14 @@
- # (1) if the variable is set in `config.status', edit `config.status'
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
 -
-- at SET_MAKE@
--
--all-recursive install-data-recursive install-exec-recursive \
--installdirs-recursive install-recursive uninstall-recursive  \
--check-recursive installcheck-recursive info-recursive dvi-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+$(RECURSIVE_TARGETS):
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,7 +490,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -410,13 +498,24 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $(MAKEFLAGS); amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
--	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
--	  rev="$$subdir $$rev"; \
--	  test "$$subdir" != "." || dot_seen=yes; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
- 	done; \
--	test "$$dot_seen" = "no" && rev=". $$rev"; \
-+	rev="$$rev ."; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	for subdir in $$rev; do \
- 	  echo "Making $$target in $$subdir"; \
-@@ -426,339 +525,215 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
- 	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
- 
--tags: TAGS
--
--ID: $(HEADERS) $(SOURCES) $(LISP)
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
++	       END { for (i in files) print i; }'`; \
 +	mkid -fID $$unique
-+tags: TAGS
+ tags: TAGS
  
--TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
--   if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
--   fi; \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
- 	done; \
+-ID: $(HEADERS) $(SOURCES) $(LISP)
 -	list='$(SOURCES) $(HEADERS)'; \
 -	unique=`for i in $$list; do echo $$i; done | \
 -	  awk '    { files[$$0] = 1; } \
++TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
++	tags=; \
++	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+-	here=`pwd` && cd $(srcdir) \
+-	  && mkid -f$$here/ID $$unique $(LISP)
 -
--mostlyclean-tags:
--
--clean-tags:
+-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
 +	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  test -n "$$unique" || unique=$$empty_fix; \
 +	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	    $$tags $$unique; \
 +	fi
 +ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
+ 	tags=; \
+ 	here=`pwd`; \
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
+ 	       END { for (i in files) print i; }'`; \
+-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+-
+-mostlyclean-tags:
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -50026,7 +58283,7 @@
 -
 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 -
--subdir = test
+-subdir = test/colorselector
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
@@ -50061,247 +58318,58 @@
 +	    || exit 1; \
  	  fi; \
  	done
--	for subdir in $(SUBDIRS); do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
--	    chmod 777 $(distdir)/$$subdir; \
--	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-+	    (cd $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
-+	        distdir) \
- 	      || exit 1; \
- 	  fi; \
- 	done
--animation.o: animation.cpp ../include/pgapplication.h \
--	../include/pgmessageobject.h ../include/paragui.h \
--	../include/paraconfig.h ../include/paraconfig_gnu.h \
--	../include/paragui_types.h ../include/pgrect.h \
--	../include/pgfilearchive.h ../include/pgfile.h \
--	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
--	../include/pgfont.h ../include/pgtheme.h \
--	../include/pgpopupmenu.h ../include/pgthemewidget.h \
--	../include/pgwidget.h ../include/pgrectlist.h \
--	../include/pgbutton.h ../include/pgmenubar.h \
--	../include/pgeventobject.h ../include/pgscrollbar.h \
--	../include/pgtimerobject.h ../include/pglog.h
--array.o: array.cpp ../include/paragui.h ../include/paraconfig.h \
--	../include/paraconfig_gnu.h ../include/paragui_types.h \
--	../include/pgrect.h ../include/pgapplication.h \
--	../include/pgmessageobject.h ../include/pgfilearchive.h \
--	../include/pgfile.h ../include/pgsurfacecache.h \
--	../include/pgdatacontainer.h ../include/pgfont.h \
--	../include/pgtheme.h ../include/pgthemewidget.h \
--	../include/pgwidget.h ../include/pgrectlist.h \
--	../include/pglabel.h
--dblbuffer.o: dblbuffer.cpp ../include/pgapplication.h \
--	../include/pgmessageobject.h ../include/paragui.h \
--	../include/paraconfig.h ../include/paraconfig_gnu.h \
--	../include/paragui_types.h ../include/pgrect.h \
--	../include/pgfilearchive.h ../include/pgfile.h \
--	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
--	../include/pgfont.h ../include/pgtheme.h ../include/pgwidget.h \
--	../include/pgrectlist.h ../include/pglog.h \
--	../include/pgbutton.h ../include/pglabel.h \
--	../include/pgcheckbutton.h ../include/pgradiobutton.h \
--	../include/pgthemewidget.h
--dropdown.o: dropdown.cpp ../include/paragui.h ../include/paraconfig.h \
--	../include/paraconfig_gnu.h ../include/paragui_types.h \
--	../include/pgrect.h ../include/pgdropdown.h \
--	../include/pgbutton.h ../include/pgwidget.h \
--	../include/pgmessageobject.h ../include/pgrectlist.h \
--	../include/pgfont.h ../include/pgdatacontainer.h \
--	../include/pglineedit.h ../include/pgthemewidget.h \
--	../include/pglistbox.h ../include/pgwidgetlist.h \
--	../include/pgscrollbar.h ../include/pglistboxitem.h \
--	../include/pglistboxbaseitem.h ../include/pglabel.h \
--	../include/pgapplication.h ../include/pgfilearchive.h \
--	../include/pgfile.h ../include/pgsurfacecache.h \
--	../include/pgtheme.h ../include/pgeventobject.h
--event_bug.o: event_bug.cpp ../include/pgapplication.h \
--	../include/pgmessageobject.h ../include/paragui.h \
--	../include/paraconfig.h ../include/paraconfig_gnu.h \
--	../include/paragui_types.h ../include/pgrect.h \
--	../include/pgfilearchive.h ../include/pgfile.h \
--	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
--	../include/pgfont.h ../include/pgtheme.h ../include/pgwindow.h \
--	../include/pgthemewidget.h ../include/pgwidget.h \
--	../include/pgrectlist.h ../include/pgbutton.h \
--	../include/pglabel.h ../include/pglineedit.h \
--	../include/pgeventobject.h
--layouttest.o: layouttest.cpp ../include/paragui.h \
--	../include/paraconfig.h ../include/paraconfig_gnu.h \
--	../include/paragui_types.h ../include/pgrect.h \
--	../include/pgapplication.h ../include/pgmessageobject.h \
--	../include/pgfilearchive.h ../include/pgfile.h \
--	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
--	../include/pgfont.h ../include/pgtheme.h ../include/pgwindow.h \
--	../include/pgthemewidget.h ../include/pgwidget.h \
--	../include/pgrectlist.h ../include/pgbutton.h \
--	../include/pglabel.h
--listbox.o: listbox.cpp ../include/paragui.h ../include/paraconfig.h \
--	../include/paraconfig_gnu.h ../include/paragui_types.h \
--	../include/pgrect.h ../include/pgapplication.h \
--	../include/pgmessageobject.h ../include/pgfilearchive.h \
--	../include/pgfile.h ../include/pgsurfacecache.h \
--	../include/pgdatacontainer.h ../include/pgfont.h \
--	../include/pgtheme.h ../include/pglistbox.h \
--	../include/pgwidgetlist.h ../include/pgthemewidget.h \
--	../include/pgwidget.h ../include/pgrectlist.h \
--	../include/pgscrollbar.h ../include/pgbutton.h \
--	../include/pglistboxitem.h ../include/pglistboxbaseitem.h \
--	../include/pglabel.h
--navtest.o: navtest.cpp ../include/pgapplication.h \
--	../include/pgmessageobject.h ../include/paragui.h \
--	../include/paraconfig.h ../include/paraconfig_gnu.h \
--	../include/paragui_types.h ../include/pgrect.h \
--	../include/pgfilearchive.h ../include/pgfile.h \
--	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
--	../include/pgfont.h ../include/pgtheme.h ../include/pgbutton.h \
--	../include/pgwidget.h ../include/pgrectlist.h \
--	../include/pglineedit.h ../include/pgthemewidget.h \
--	../include/pgnavigator.h
--paratest.o: paratest.cpp ../include/paragui.h ../include/paraconfig.h \
--	../include/paraconfig_gnu.h ../include/paragui_types.h \
--	../include/pgrect.h ../include/pgapplication.h \
--	../include/pgmessageobject.h ../include/pgfilearchive.h \
--	../include/pgfile.h ../include/pgsurfacecache.h \
--	../include/pgdatacontainer.h ../include/pgfont.h \
--	../include/pgtheme.h ../include/pgbutton.h \
--	../include/pgwidget.h ../include/pgrectlist.h \
--	../include/pgwidgetlist.h ../include/pgthemewidget.h \
--	../include/pgscrollbar.h ../include/pglabel.h \
--	../include/pgwindow.h ../include/pgmaskedit.h \
--	../include/pglineedit.h ../include/pgprogressbar.h \
--	../include/pgradiobutton.h ../include/pgcheckbutton.h \
--	../include/pgslider.h ../include/pglistbox.h \
--	../include/pglistboxitem.h ../include/pglistboxbaseitem.h \
--	../include/pgcolumnitem.h ../include/pgdropdown.h \
--	../include/pgeventobject.h ../include/pgpopupmenu.h \
--	../include/pgspinnerbox.h ../include/pglog.h \
--	../include/pgmenubar.h
--stress1.o: stress1.cpp ../include/paragui.h ../include/paraconfig.h \
--	../include/paraconfig_gnu.h ../include/paragui_types.h \
--	../include/pgrect.h ../include/pgapplication.h \
--	../include/pgmessageobject.h ../include/pgfilearchive.h \
--	../include/pgfile.h ../include/pgsurfacecache.h \
--	../include/pgdatacontainer.h ../include/pgfont.h \
--	../include/pgtheme.h ../include/pgbutton.h \
--	../include/pgwidget.h ../include/pgrectlist.h \
--	../include/pgwidgetlist.h ../include/pgthemewidget.h \
--	../include/pgscrollbar.h ../include/pglabel.h \
--	../include/pgwindow.h ../include/pgmaskedit.h \
--	../include/pglineedit.h ../include/pgprogressbar.h \
--	../include/pgradiobutton.h ../include/pgcheckbutton.h \
--	../include/pgslider.h ../include/pglistbox.h \
--	../include/pglistboxitem.h ../include/pglistboxbaseitem.h \
--	../include/pgcolumnitem.h ../include/pgdropdown.h \
--	../include/pgeventobject.h ../include/pgpopupmenu.h \
--	../include/pgspinnerbox.h ../include/pglog.h \
--	../include/pgmenubar.h
--stress2.o: stress2.cpp ../include/paragui.h ../include/paraconfig.h \
--	../include/paraconfig_gnu.h ../include/paragui_types.h \
--	../include/pgrect.h ../include/pgapplication.h \
--	../include/pgmessageobject.h ../include/pgfilearchive.h \
--	../include/pgfile.h ../include/pgsurfacecache.h \
--	../include/pgdatacontainer.h ../include/pgfont.h \
--	../include/pgtheme.h ../include/pgbutton.h \
--	../include/pgwidget.h ../include/pgrectlist.h \
--	../include/pgwidgetlist.h ../include/pgthemewidget.h \
--	../include/pgscrollbar.h ../include/pglabel.h \
--	../include/pgwindow.h ../include/pgmaskedit.h \
--	../include/pglineedit.h ../include/pgprogressbar.h \
--	../include/pgradiobutton.h ../include/pgcheckbutton.h \
--	../include/pgslider.h ../include/pglistbox.h \
--	../include/pglistboxitem.h ../include/pglistboxbaseitem.h \
--	../include/pgcolumnitem.h ../include/pgdropdown.h \
--	../include/pgeventobject.h ../include/pgpopupmenu.h \
--	../include/pgspinnerbox.h ../include/pglog.h \
--	../include/pgmenubar.h
--widgetlistbug.o: widgetlistbug.cpp ../include/pgapplication.h \
--	../include/pgmessageobject.h ../include/paragui.h \
--	../include/paraconfig.h ../include/paraconfig_gnu.h \
--	../include/paragui_types.h ../include/pgrect.h \
--	../include/pgfilearchive.h ../include/pgfile.h \
--	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
--	../include/pgfont.h ../include/pgtheme.h ../include/pgbutton.h \
--	../include/pgwidget.h ../include/pgrectlist.h \
--	../include/pgwidgetlist.h ../include/pgthemewidget.h \
--	../include/pgscrollbar.h ../include/pglabel.h
--windowresize.o: windowresize.cpp ../include/paragui.h \
--	../include/paraconfig.h ../include/paraconfig_gnu.h \
--	../include/paragui_types.h ../include/pgrect.h \
--	../include/pgapplication.h ../include/pgmessageobject.h \
--	../include/pgfilearchive.h ../include/pgfile.h \
--	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
--	../include/pgfont.h ../include/pgtheme.h ../include/pgwindow.h \
--	../include/pgthemewidget.h ../include/pgwidget.h \
--	../include/pgrectlist.h ../include/pgbutton.h \
--	../include/pglabel.h
--windowtest.o: windowtest.cpp ../include/pgapplication.h \
--	../include/pgmessageobject.h ../include/paragui.h \
--	../include/paraconfig.h ../include/paraconfig_gnu.h \
--	../include/paragui_types.h ../include/pgrect.h \
--	../include/pgfilearchive.h ../include/pgfile.h \
--	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
--	../include/pgfont.h ../include/pgtheme.h \
--	../include/pgthemewidget.h ../include/pgwidget.h \
--	../include/pgrectlist.h ../include/pgwindow.h \
--	../include/pgbutton.h ../include/pglabel.h \
--	../include/pgmessagebox.h ../include/pgrichedit.h \
--	../include/pgwidgetlistex.h ../include/pgwidgetlist.h \
--	../include/pgscrollbar.h ../include/pgdropdown.h \
--	../include/pglineedit.h ../include/pglistbox.h \
--	../include/pglistboxitem.h ../include/pglistboxbaseitem.h \
--	../include/pgeventobject.h
--writefile.o: writefile.cpp ../include/pgfilearchive.h \
--	../include/paragui.h ../include/paraconfig.h \
--	../include/paraconfig_gnu.h ../include/paragui_types.h \
--	../include/pgrect.h ../include/pgfile.h \
--	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
--	../include/pglog.h
+-main.o: main.cpp pgcolorselector.h ../../include/pgthemewidget.h \
+-	../../include/pgwidget.h ../../include/pgmessageobject.h \
+-	../../include/paragui.h ../../include/paraconfig.h \
+-	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
+-	../../include/pgrect.h ../../include/pgrectlist.h \
+-	../../include/pgfont.h ../../include/pgdatacontainer.h \
+-	../../include/pgeventobject.h ../../include/pgslider.h \
+-	../../include/pgscrollbar.h ../../include/pgbutton.h \
+-	../../include/pgapplication.h ../../include/pgfilearchive.h \
+-	../../include/pgfile.h ../../include/pgsurfacecache.h \
+-	../../include/pgtheme.h
+-pgcolorselector.o: pgcolorselector.cpp pgcolorselector.h \
+-	../../include/pgthemewidget.h ../../include/pgwidget.h \
+-	../../include/pgmessageobject.h ../../include/paragui.h \
+-	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
+-	../../include/paragui_types.h ../../include/pgrect.h \
+-	../../include/pgrectlist.h ../../include/pgfont.h \
+-	../../include/pgdatacontainer.h ../../include/pgeventobject.h \
+-	../../include/pgslider.h ../../include/pgscrollbar.h \
+-	../../include/pgbutton.h
 -
 -info-am:
--info: info-recursive
+-info: info-am
 -dvi-am:
--dvi: dvi-recursive
+-dvi: dvi-am
  check-am: all-am
- check: check-recursive
+ check: check-am
 -installcheck-am:
--installcheck: installcheck-recursive
+-installcheck: installcheck-am
 -install-exec-am:
 +all-am: Makefile $(PROGRAMS)
-+installdirs: installdirs-recursive
-+installdirs-am:
-+install: install-recursive
- install-exec: install-exec-recursive
++installdirs:
++install: install-am
+ install-exec: install-exec-am
 -
 -install-data-am:
- install-data: install-data-recursive
-+uninstall: uninstall-recursive
+ install-data: install-data-am
++uninstall: uninstall-am
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-recursive
+-install: install-am
 -uninstall-am:
--uninstall: uninstall-recursive
+-uninstall: uninstall-am
 -all-am: Makefile $(PROGRAMS)
--all-redirect: all-recursive
+-all-redirect: all-am
 -install-strip:
 -	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs: installdirs-recursive
--installdirs-am:
+-installdirs:
 -
  
-+installcheck: installcheck-recursive
++installcheck: installcheck-am
 +install-strip:
 +	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -50322,33 +58390,31 @@
 -		mostlyclean-generic
 +	@echo "This command is intended for maintainers to use"
 +	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
++clean: clean-am
  
--mostlyclean: mostlyclean-recursive
+-mostlyclean: mostlyclean-am
 +clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
 +	mostlyclean-am
-+
-+distclean: distclean-recursive
+ 
+-clean-am:  clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
+-		clean-generic mostlyclean-am
++distclean: distclean-am
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +	distclean-libtool distclean-tags
  
--clean-am:  clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
--		clean-generic mostlyclean-am
-+dvi: dvi-recursive
+-clean: clean-am
++dvi: dvi-am
  
--clean: clean-recursive
-+dvi-am:
- 
 -distclean-am:  distclean-noinstPROGRAMS distclean-compile \
 -		distclean-libtool distclean-tags distclean-generic \
 -		clean-am
 -	-rm -f libtool
-+html: html-recursive
++dvi-am:
  
--distclean: distclean-recursive
-+info: info-recursive
+-distclean: distclean-am
++html: html-am
  
 -maintainer-clean-am:  maintainer-clean-noinstPROGRAMS \
 -		maintainer-clean-compile maintainer-clean-libtool \
@@ -50356,84 +58422,68 @@
 -		distclean-am
 -	@echo "This command is intended for maintainers to use;"
 -	@echo "it deletes files that may require special tools to rebuild."
++info: info-am
++
 +info-am:
 +
 +install-data-am:
 +
 +install-exec-am:
 +
-+install-info: install-info-recursive
++install-info: install-info-am
 +
 +install-man:
 +
 +installcheck-am:
  
- maintainer-clean: maintainer-clean-recursive
+ maintainer-clean: maintainer-clean-am
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
  
 -.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
 -clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
 -mostlyclean-compile distclean-compile clean-compile \
 -maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool install-data-recursive \
--uninstall-data-recursive install-exec-recursive \
--uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
--all-recursive check-recursive installcheck-recursive info-recursive \
--dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
--maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
+-clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
 -install-exec install-data-am install-data install-am install \
--uninstall-am uninstall all-redirect all-am all installdirs-am \
--installdirs mostlyclean-generic distclean-generic clean-generic \
+-uninstall-am uninstall all-redirect all-am all installdirs \
+-mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+pdf: pdf-recursive
++mostlyclean: mostlyclean-am
 +
-+pdf-am:
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
 +
-+ps: ps-recursive
++pdf: pdf-am
 +
++pdf-am:
+ 
++ps: ps-am
++
 +ps-am:
 +
 +uninstall-am: uninstall-info-am
 +
-+uninstall-info: uninstall-info-recursive
-+
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-noinstPROGRAMS \
-+	clean-recursive ctags ctags-recursive distclean \
++.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
++	clean-libtool clean-noinstPROGRAMS ctags distclean \
 +	distclean-compile distclean-generic distclean-libtool \
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-+	tags tags-recursive uninstall uninstall-am uninstall-info-am
++	distclean-tags distdir dvi dvi-am html html-am info info-am \
++	install install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am install-man \
++	install-strip installcheck installcheck-am installdirs \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags uninstall uninstall-am \
++	uninstall-info-am
  
- 
- $(PACKAGE)-$(VERSION).tar.gz: dist
-@@ -771,7 +746,6 @@
- 	rm -Rf $(PACKAGE)-$(VERSION)/init.d/CVS
- 	tar -czvf $(PACKAGE)-$(VERSION)_ML1.0.0-beta3.mlz $(PACKAGE)-$(VERSION)
- 	rm -Rf $(PACKAGE)-$(VERSION)
--
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-Index: libparagui1.0-1.0.4/test/colorselector/Makefile.in
-===================================================================
---- libparagui1.0-1.0.4.orig/test/colorselector/Makefile.in	2003-07-07 11:06:24.000000000 +0200
-+++ libparagui1.0-1.0.4/test/colorselector/Makefile.in	2006-06-15 22:26:31.000000000 +0200
+diff -Nurd libparagui1.0-1.0.4.orig/test/fireworks/Makefile.in libparagui1.0-1.0.4/test/fireworks/Makefile.in
+--- libparagui1.0-1.0.4.orig/test/fireworks/Makefile.in	2003-07-07 11:06:23.000000000 +0200
++++ libparagui1.0-1.0.4/test/fireworks/Makefile.in	2007-12-21 23:59:18.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -50507,8 +58557,8 @@
 +build_triplet = @build@
  host_triplet = @host@
 +target_triplet = @target@
-+noinst_PROGRAMS = colorselector$(EXEEXT)
-+subdir = test/colorselector
++noinst_PROGRAMS = fireworks$(EXEEXT)
++subdir = test/fireworks
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -50518,10 +58568,10 @@
 +CONFIG_HEADER = $(top_builddir)/include/paraconfig_gnu.h
 +CONFIG_CLEAN_FILES =
 +PROGRAMS = $(noinst_PROGRAMS)
-+am_colorselector_OBJECTS = pgcolorselector.$(OBJEXT) main.$(OBJEXT)
-+colorselector_OBJECTS = $(am_colorselector_OBJECTS)
++am_fireworks_OBJECTS = blob.$(OBJEXT) main.$(OBJEXT)
++fireworks_OBJECTS = $(am_fireworks_OBJECTS)
 +am__DEPENDENCIES_1 =
-+colorselector_DEPENDENCIES = $(am__DEPENDENCIES_1)
++fireworks_DEPENDENCIES = $(am__DEPENDENCIES_1)
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
@@ -50533,8 +58583,8 @@
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(colorselector_SOURCES)
-+DIST_SOURCES = $(colorselector_SOURCES)
++SOURCES = $(fireworks_SOURCES)
++DIST_SOURCES = $(fireworks_SOURCES)
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -50616,10 +58666,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,106 +159,151 @@
+@@ -110,106 +159,152 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -50652,9 +58703,9 @@
 +exec_prefix = @exec_prefix@
  freetype_config = @freetype_config@
 -
--noinst_PROGRAMS = colorselector
+-noinst_PROGRAMS = fireworks
 -
--colorselector_SOURCES =  	pgcolorselector.cpp 	main.cpp
+-fireworks_SOURCES =  	blob.cpp 	main.cpp
 -
 +host = @host@
 +host_alias = @host_alias@
@@ -50685,27 +58736,23 @@
 +target_cpu = @target_cpu@
 +target_os = @target_os@
 +target_vendor = @target_vendor@
-+colorselector_SOURCES = \
-+	pgcolorselector.cpp \
++fireworks_SOURCES = \
++	blob.cpp \
 +	main.cpp
  
- colorselector_LDADD = -L../../src $(PARAGUI_LIBS)
+ fireworks_LDADD = -L../../src $(PARAGUI_LIBS)
 +EXTRA_DIST = \
-+	pgcolorselector.h
++	blob.h
  
--EXTRA_DIST =  	pgcolorselector.h
-+INCLUDES = \
-+	-I$(top_srcdir)/include \
-+	$(PARAGUI_CFLAGS)
- 
-+all: all-am
- 
+-EXTRA_DIST =  	blob.h
+-
+-
 -INCLUDES =  	-I$(top_srcdir)/include 	$(PARAGUI_CFLAGS)
 -
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 -CONFIG_HEADER = ../../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
--noinst_PROGRAMS =  colorselector$(EXEEXT)
+-noinst_PROGRAMS =  fireworks$(EXEEXT)
 -PROGRAMS =  $(noinst_PROGRAMS)
 -
 -
@@ -50713,9 +58760,9 @@
 -CPPFLAGS = @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
--colorselector_OBJECTS =  pgcolorselector.$(OBJEXT) main.$(OBJEXT)
--colorselector_DEPENDENCIES = 
--colorselector_LDFLAGS = 
+-fireworks_OBJECTS =  blob.$(OBJEXT) main.$(OBJEXT)
+-fireworks_DEPENDENCIES = 
+-fireworks_LDFLAGS = 
 -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -CXXLD = $(CXX)
@@ -50724,24 +58771,25 @@
 -
 -
 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
++INCLUDES = \
++	-I$(top_srcdir)/include \
++	$(PARAGUI_CFLAGS)
+ 
 -TAR = gtar
 -GZIP_ENV = --best
--SOURCES = $(colorselector_SOURCES)
--OBJECTS = $(colorselector_OBJECTS)
--
+-SOURCES = $(fireworks_SOURCES)
+-OBJECTS = $(fireworks_OBJECTS)
++all: all-am
+ 
 -all: all-redirect
  .SUFFIXES:
 -.SUFFIXES: .S .c .cpp .lo .o .obj .s
 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps test/colorselector/Makefile
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps test/fireworks/Makefile
 -
 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-noinstPROGRAMS:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
@@ -50752,9 +58800,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  test/colorselector/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/fireworks/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  test/colorselector/Makefile
++	  $(AUTOMAKE) --gnu  test/fireworks/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -50764,10 +58812,11 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-mostlyclean-noinstPROGRAMS:
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -50798,9 +58847,9 @@
 +	  echo " rm -f $$p $$f"; \
 +	  rm -f $$p $$f ; \
 +	done
-+colorselector$(EXEEXT): $(colorselector_OBJECTS) $(colorselector_DEPENDENCIES) 
-+	@rm -f colorselector$(EXEEXT)
-+	$(CXXLINK) $(colorselector_LDFLAGS) $(colorselector_OBJECTS) $(colorselector_LDADD) $(LIBS)
++fireworks$(EXEEXT): $(fireworks_OBJECTS) $(fireworks_DEPENDENCIES) 
++	@rm -f fireworks$(EXEEXT)
++	$(CXXLINK) $(fireworks_LDFLAGS) $(fireworks_OBJECTS) $(fireworks_LDADD) $(LIBS)
  
  mostlyclean-compile:
 -	-rm -f *.o core *.core
@@ -50812,8 +58861,8 @@
  	-rm -f *.tab.c
  
 -maintainer-clean-compile:
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/blob.Po at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pgcolorselector.Po at am__quote@
  
 -.c.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
@@ -50844,7 +58893,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -218,158 +312,174 @@
+@@ -218,154 +313,174 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
@@ -50853,9 +58902,9 @@
  
 -maintainer-clean-libtool:
 -
--colorselector$(EXEEXT): $(colorselector_OBJECTS) $(colorselector_DEPENDENCIES)
--	@rm -f colorselector$(EXEEXT)
--	$(CXXLINK) $(colorselector_LDFLAGS) $(colorselector_OBJECTS) $(colorselector_LDADD) $(LIBS)
+-fireworks$(EXEEXT): $(fireworks_OBJECTS) $(fireworks_DEPENDENCIES)
+-	@rm -f fireworks$(EXEEXT)
+-	$(CXXLINK) $(fireworks_LDFLAGS) $(fireworks_OBJECTS) $(fireworks_LDADD) $(LIBS)
 -.cpp.o:
 -	$(CXXCOMPILE) -c $<
 -.cpp.obj:
@@ -50914,12 +58963,11 @@
 -	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 -
 -mostlyclean-tags:
--
--clean-tags:
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -50932,7 +58980,7 @@
 -
 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 -
--subdir = test/colorselector
+-subdir = test/fireworks
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
@@ -50967,26 +59015,22 @@
 +	    || exit 1; \
  	  fi; \
  	done
--main.o: main.cpp pgcolorselector.h ../../include/pgthemewidget.h \
+-blob.o: blob.cpp blob.h ../../include/pgthemewidget.h \
 -	../../include/pgwidget.h ../../include/pgmessageobject.h \
 -	../../include/paragui.h ../../include/paraconfig.h \
 -	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
 -	../../include/pgrect.h ../../include/pgrectlist.h \
 -	../../include/pgfont.h ../../include/pgdatacontainer.h \
--	../../include/pgeventobject.h ../../include/pgslider.h \
--	../../include/pgscrollbar.h ../../include/pgbutton.h \
--	../../include/pgapplication.h ../../include/pgfilearchive.h \
+-	../../include/pgtimerobject.h ../../include/pgdraw.h
+-main.o: main.cpp ../../include/paragui.h ../../include/paraconfig.h \
+-	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
+-	../../include/pgrect.h ../../include/pgapplication.h \
+-	../../include/pgmessageobject.h ../../include/pgfilearchive.h \
 -	../../include/pgfile.h ../../include/pgsurfacecache.h \
--	../../include/pgtheme.h
--pgcolorselector.o: pgcolorselector.cpp pgcolorselector.h \
--	../../include/pgthemewidget.h ../../include/pgwidget.h \
--	../../include/pgmessageobject.h ../../include/paragui.h \
--	../../include/paraconfig.h ../../include/paraconfig_gnu.h \
--	../../include/paragui_types.h ../../include/pgrect.h \
--	../../include/pgrectlist.h ../../include/pgfont.h \
--	../../include/pgdatacontainer.h ../../include/pgeventobject.h \
--	../../include/pgslider.h ../../include/pgscrollbar.h \
--	../../include/pgbutton.h
+-	../../include/pgdatacontainer.h ../../include/pgfont.h \
+-	../../include/pgtheme.h blob.h ../../include/pgthemewidget.h \
+-	../../include/pgwidget.h ../../include/pgrectlist.h \
+-	../../include/pgtimerobject.h
 -
 -info-am:
 -info: info-am
@@ -51089,15 +59133,6 @@
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
  
 -.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
 -clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
@@ -51110,8 +59145,17 @@
 -uninstall-am uninstall all-redirect all-am all installdirs \
 -mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+ps: ps-am
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
  
++ps: ps-am
++
 +ps-am:
 +
 +uninstall-am: uninstall-info-am
@@ -51130,10 +59174,9 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libparagui1.0-1.0.4/test/fireworks/Makefile.in
-===================================================================
---- libparagui1.0-1.0.4.orig/test/fireworks/Makefile.in	2003-07-07 11:06:23.000000000 +0200
-+++ libparagui1.0-1.0.4/test/fireworks/Makefile.in	2006-06-15 22:26:31.000000000 +0200
+diff -Nurd libparagui1.0-1.0.4.orig/test/keyboard/Makefile.in libparagui1.0-1.0.4/test/keyboard/Makefile.in
+--- libparagui1.0-1.0.4.orig/test/keyboard/Makefile.in	2003-07-07 11:06:23.000000000 +0200
++++ libparagui1.0-1.0.4/test/keyboard/Makefile.in	2007-12-21 23:59:18.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -51207,8 +59250,8 @@
 +build_triplet = @build@
  host_triplet = @host@
 +target_triplet = @target@
-+noinst_PROGRAMS = fireworks$(EXEEXT)
-+subdir = test/fireworks
++noinst_PROGRAMS = keyboard$(EXEEXT)
++subdir = test/keyboard
 +DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/configure.in
@@ -51218,10 +59261,10 @@
 +CONFIG_HEADER = $(top_builddir)/include/paraconfig_gnu.h
 +CONFIG_CLEAN_FILES =
 +PROGRAMS = $(noinst_PROGRAMS)
-+am_fireworks_OBJECTS = blob.$(OBJEXT) main.$(OBJEXT)
-+fireworks_OBJECTS = $(am_fireworks_OBJECTS)
++am_keyboard_OBJECTS = keyboard.$(OBJEXT) main.$(OBJEXT)
++keyboard_OBJECTS = $(am_keyboard_OBJECTS)
 +am__DEPENDENCIES_1 =
-+fireworks_DEPENDENCIES = $(am__DEPENDENCIES_1)
++keyboard_DEPENDENCIES = $(am__DEPENDENCIES_1)
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
@@ -51233,8 +59276,8 @@
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(fireworks_SOURCES)
-+DIST_SOURCES = $(fireworks_SOURCES)
++SOURCES = $(keyboard_SOURCES)
++DIST_SOURCES = $(keyboard_SOURCES)
 +ETAGS = etags
 +CTAGS = ctags
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -51316,10 +59359,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,106 +159,151 @@
+@@ -110,106 +159,152 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -51352,9 +59396,9 @@
 +exec_prefix = @exec_prefix@
  freetype_config = @freetype_config@
 -
--noinst_PROGRAMS = fireworks
+-noinst_PROGRAMS = keyboard
 -
--fireworks_SOURCES =  	blob.cpp 	main.cpp
+-keyboard_SOURCES =  	keyboard.cpp 	main.cpp
 -
 +host = @host@
 +host_alias = @host_alias@
@@ -51385,27 +59429,23 @@
 +target_cpu = @target_cpu@
 +target_os = @target_os@
 +target_vendor = @target_vendor@
-+fireworks_SOURCES = \
-+	blob.cpp \
++keyboard_SOURCES = \
++	keyboard.cpp \
 +	main.cpp
  
- fireworks_LDADD = -L../../src $(PARAGUI_LIBS)
+ keyboard_LDADD = -L../../src $(PARAGUI_LIBS)
 +EXTRA_DIST = \
-+	blob.h
++	keyboard.h
  
--EXTRA_DIST =  	blob.h
-+INCLUDES = \
-+	-I$(top_srcdir)/include \
-+	$(PARAGUI_CFLAGS)
- 
-+all: all-am
- 
+-EXTRA_DIST =  	keyboard.h
+-
+-
 -INCLUDES =  	-I$(top_srcdir)/include 	$(PARAGUI_CFLAGS)
 -
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 -CONFIG_HEADER = ../../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
--noinst_PROGRAMS =  fireworks$(EXEEXT)
+-noinst_PROGRAMS =  keyboard$(EXEEXT)
 -PROGRAMS =  $(noinst_PROGRAMS)
 -
 -
@@ -51413,9 +59453,9 @@
 -CPPFLAGS = @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
--fireworks_OBJECTS =  blob.$(OBJEXT) main.$(OBJEXT)
--fireworks_DEPENDENCIES = 
--fireworks_LDFLAGS = 
+-keyboard_OBJECTS =  keyboard.$(OBJEXT) main.$(OBJEXT)
+-keyboard_DEPENDENCIES = 
+-keyboard_LDFLAGS = 
 -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -CXXLD = $(CXX)
@@ -51424,24 +59464,25 @@
 -
 -
 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
--
++INCLUDES = \
++	-I$(top_srcdir)/include \
++	$(PARAGUI_CFLAGS)
+ 
 -TAR = gtar
 -GZIP_ENV = --best
--SOURCES = $(fireworks_SOURCES)
--OBJECTS = $(fireworks_OBJECTS)
--
+-SOURCES = $(keyboard_SOURCES)
+-OBJECTS = $(keyboard_OBJECTS)
++all: all-am
+ 
 -all: all-redirect
  .SUFFIXES:
 -.SUFFIXES: .S .c .cpp .lo .o .obj .s
 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps test/fireworks/Makefile
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps test/keyboard/Makefile
 -
 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-noinstPROGRAMS:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
@@ -51452,9 +59493,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  test/fireworks/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  test/keyboard/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  test/fireworks/Makefile
++	  $(AUTOMAKE) --gnu  test/keyboard/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -51464,10 +59505,11 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-mostlyclean-noinstPROGRAMS:
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -51498,9 +59540,9 @@
 +	  echo " rm -f $$p $$f"; \
 +	  rm -f $$p $$f ; \
 +	done
-+fireworks$(EXEEXT): $(fireworks_OBJECTS) $(fireworks_DEPENDENCIES) 
-+	@rm -f fireworks$(EXEEXT)
-+	$(CXXLINK) $(fireworks_LDFLAGS) $(fireworks_OBJECTS) $(fireworks_LDADD) $(LIBS)
++keyboard$(EXEEXT): $(keyboard_OBJECTS) $(keyboard_DEPENDENCIES) 
++	@rm -f keyboard$(EXEEXT)
++	$(CXXLINK) $(keyboard_LDFLAGS) $(keyboard_OBJECTS) $(keyboard_LDADD) $(LIBS)
  
  mostlyclean-compile:
 -	-rm -f *.o core *.core
@@ -51512,7 +59554,7 @@
  	-rm -f *.tab.c
  
 -maintainer-clean-compile:
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/blob.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keyboard.Po at am__quote@
 + at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
  
 -.c.lo:
@@ -51544,7 +59586,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -218,154 +312,174 @@
+@@ -218,158 +313,174 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
@@ -51553,9 +59595,9 @@
  
 -maintainer-clean-libtool:
 -
--fireworks$(EXEEXT): $(fireworks_OBJECTS) $(fireworks_DEPENDENCIES)
--	@rm -f fireworks$(EXEEXT)
--	$(CXXLINK) $(fireworks_LDFLAGS) $(fireworks_OBJECTS) $(fireworks_LDADD) $(LIBS)
+-keyboard$(EXEEXT): $(keyboard_OBJECTS) $(keyboard_DEPENDENCIES)
+-	@rm -f keyboard$(EXEEXT)
+-	$(CXXLINK) $(keyboard_LDFLAGS) $(keyboard_OBJECTS) $(keyboard_LDADD) $(LIBS)
 -.cpp.o:
 -	$(CXXCOMPILE) -c $<
 -.cpp.obj:
@@ -51614,12 +59656,11 @@
 -	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 -
 -mostlyclean-tags:
--
--clean-tags:
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -51632,7 +59673,7 @@
 -
 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 -
--subdir = test/fireworks
+-subdir = test/keyboard
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
@@ -51667,22 +59708,26 @@
 +	    || exit 1; \
  	  fi; \
  	done
--blob.o: blob.cpp blob.h ../../include/pgthemewidget.h \
+-keyboard.o: keyboard.cpp keyboard.h ../../include/pglabel.h \
 -	../../include/pgwidget.h ../../include/pgmessageobject.h \
 -	../../include/paragui.h ../../include/paraconfig.h \
 -	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
 -	../../include/pgrect.h ../../include/pgrectlist.h \
 -	../../include/pgfont.h ../../include/pgdatacontainer.h \
--	../../include/pgtimerobject.h ../../include/pgdraw.h
--main.o: main.cpp ../../include/paragui.h ../../include/paraconfig.h \
+-	../../include/pgapplication.h ../../include/pgfilearchive.h \
+-	../../include/pgfile.h ../../include/pgsurfacecache.h \
+-	../../include/pgtheme.h ../../include/pgbutton.h \
+-	../../include/pglineedit.h ../../include/pgthemewidget.h
+-main.o: main.cpp keyboard.h ../../include/pglabel.h \
+-	../../include/pgwidget.h ../../include/pgmessageobject.h \
+-	../../include/paragui.h ../../include/paraconfig.h \
 -	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
--	../../include/pgrect.h ../../include/pgapplication.h \
--	../../include/pgmessageobject.h ../../include/pgfilearchive.h \
+-	../../include/pgrect.h ../../include/pgrectlist.h \
+-	../../include/pgfont.h ../../include/pgdatacontainer.h \
+-	../../include/pgapplication.h ../../include/pgfilearchive.h \
 -	../../include/pgfile.h ../../include/pgsurfacecache.h \
--	../../include/pgdatacontainer.h ../../include/pgfont.h \
--	../../include/pgtheme.h blob.h ../../include/pgthemewidget.h \
--	../../include/pgwidget.h ../../include/pgrectlist.h \
--	../../include/pgtimerobject.h
+-	../../include/pgtheme.h ../../include/pgbutton.h \
+-	../../include/pglineedit.h ../../include/pgthemewidget.h
 -
 -info-am:
 -info: info-am
@@ -51785,15 +59830,6 @@
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
  
 -.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
 -clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
@@ -51806,8 +59842,17 @@
 -uninstall-am uninstall all-redirect all-am all installdirs \
 -mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+ps: ps-am
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
++
++pdf: pdf-am
++
++pdf-am:
  
++ps: ps-am
++
 +ps-am:
 +
 +uninstall-am: uninstall-info-am
@@ -51826,10 +59871,9 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libparagui1.0-1.0.4/test/keyboard/Makefile.in
-===================================================================
---- libparagui1.0-1.0.4.orig/test/keyboard/Makefile.in	2003-07-07 11:06:23.000000000 +0200
-+++ libparagui1.0-1.0.4/test/keyboard/Makefile.in	2006-06-15 22:26:31.000000000 +0200
+diff -Nurd libparagui1.0-1.0.4.orig/test/Makefile.in libparagui1.0-1.0.4/test/Makefile.in
+--- libparagui1.0-1.0.4.orig/test/Makefile.in	2003-07-07 11:06:21.000000000 +0200
++++ libparagui1.0-1.0.4/test/Makefile.in	2007-12-21 23:59:18.000000000 +0100
 @@ -1,6 +1,8 @@
 -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
@@ -51841,7 +59885,7 @@
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -10,83 +12,129 @@
+@@ -10,83 +12,193 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -51874,7 +59918,7 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
 -
- top_builddir = ../..
+ top_builddir = ..
 -
 -ACLOCAL = @ACLOCAL@
 -AUTOCONF = @AUTOCONF@
@@ -51903,9 +59947,14 @@
 +build_triplet = @build@
  host_triplet = @host@
 +target_triplet = @target@
-+noinst_PROGRAMS = keyboard$(EXEEXT)
-+subdir = test/keyboard
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++noinst_PROGRAMS = widgetlistbug$(EXEEXT) eventbug$(EXEEXT) \
++	array$(EXEEXT) writefile$(EXEEXT) stress1$(EXEEXT) \
++	stress2$(EXEEXT) listbox$(EXEEXT) animation$(EXEEXT) \
++	dropdown$(EXEEXT) paratest$(EXEEXT) dblbuffer$(EXEEXT) \
++	navtest$(EXEEXT) windowtest$(EXEEXT) layouttest$(EXEEXT) \
++	windowresize$(EXEEXT)
++subdir = test
++DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 +am__aclocal_m4_deps = $(top_srcdir)/configure.in
 +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -51914,10 +59963,52 @@
 +CONFIG_HEADER = $(top_builddir)/include/paraconfig_gnu.h
 +CONFIG_CLEAN_FILES =
 +PROGRAMS = $(noinst_PROGRAMS)
-+am_keyboard_OBJECTS = keyboard.$(OBJEXT) main.$(OBJEXT)
-+keyboard_OBJECTS = $(am_keyboard_OBJECTS)
++am_animation_OBJECTS = animation.$(OBJEXT)
++animation_OBJECTS = $(am_animation_OBJECTS)
 +am__DEPENDENCIES_1 =
-+keyboard_DEPENDENCIES = $(am__DEPENDENCIES_1)
++animation_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_array_OBJECTS = array.$(OBJEXT)
++array_OBJECTS = $(am_array_OBJECTS)
++array_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_dblbuffer_OBJECTS = dblbuffer.$(OBJEXT)
++dblbuffer_OBJECTS = $(am_dblbuffer_OBJECTS)
++dblbuffer_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_dropdown_OBJECTS = dropdown.$(OBJEXT)
++dropdown_OBJECTS = $(am_dropdown_OBJECTS)
++dropdown_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_eventbug_OBJECTS = event_bug.$(OBJEXT)
++eventbug_OBJECTS = $(am_eventbug_OBJECTS)
++eventbug_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_layouttest_OBJECTS = layouttest.$(OBJEXT)
++layouttest_OBJECTS = $(am_layouttest_OBJECTS)
++layouttest_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_listbox_OBJECTS = listbox.$(OBJEXT)
++listbox_OBJECTS = $(am_listbox_OBJECTS)
++listbox_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_navtest_OBJECTS = navtest.$(OBJEXT)
++navtest_OBJECTS = $(am_navtest_OBJECTS)
++navtest_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_paratest_OBJECTS = paratest.$(OBJEXT)
++paratest_OBJECTS = $(am_paratest_OBJECTS)
++paratest_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_stress1_OBJECTS = stress1.$(OBJEXT)
++stress1_OBJECTS = $(am_stress1_OBJECTS)
++stress1_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_stress2_OBJECTS = stress2.$(OBJEXT)
++stress2_OBJECTS = $(am_stress2_OBJECTS)
++stress2_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_widgetlistbug_OBJECTS = widgetlistbug.$(OBJEXT)
++widgetlistbug_OBJECTS = $(am_widgetlistbug_OBJECTS)
++widgetlistbug_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_windowresize_OBJECTS = windowresize.$(OBJEXT)
++windowresize_OBJECTS = $(am_windowresize_OBJECTS)
++windowresize_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_windowtest_OBJECTS = windowtest.$(OBJEXT)
++windowtest_OBJECTS = $(am_windowtest_OBJECTS)
++windowtest_DEPENDENCIES = $(am__DEPENDENCIES_1)
++am_writefile_OBJECTS = writefile.$(OBJEXT)
++writefile_OBJECTS = $(am_writefile_OBJECTS)
++writefile_DEPENDENCIES = $(am__DEPENDENCIES_1)
 +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
 +depcomp = $(SHELL) $(top_srcdir)/depcomp
 +am__depfiles_maybe = depfiles
@@ -51929,10 +60020,27 @@
 +CXXLD = $(CXX)
 +CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 +	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(keyboard_SOURCES)
-+DIST_SOURCES = $(keyboard_SOURCES)
++SOURCES = $(animation_SOURCES) $(array_SOURCES) $(dblbuffer_SOURCES) \
++	$(dropdown_SOURCES) $(eventbug_SOURCES) $(layouttest_SOURCES) \
++	$(listbox_SOURCES) $(navtest_SOURCES) $(paratest_SOURCES) \
++	$(stress1_SOURCES) $(stress2_SOURCES) $(widgetlistbug_SOURCES) \
++	$(windowresize_SOURCES) $(windowtest_SOURCES) \
++	$(writefile_SOURCES)
++DIST_SOURCES = $(animation_SOURCES) $(array_SOURCES) \
++	$(dblbuffer_SOURCES) $(dropdown_SOURCES) $(eventbug_SOURCES) \
++	$(layouttest_SOURCES) $(listbox_SOURCES) $(navtest_SOURCES) \
++	$(paratest_SOURCES) $(stress1_SOURCES) $(stress2_SOURCES) \
++	$(widgetlistbug_SOURCES) $(windowresize_SOURCES) \
++	$(windowtest_SOURCES) $(writefile_SOURCES)
++RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
++	html-recursive info-recursive install-data-recursive \
++	install-exec-recursive install-info-recursive \
++	install-recursive installcheck-recursive installdirs-recursive \
++	pdf-recursive ps-recursive uninstall-info-recursive \
++	uninstall-recursive
 +ETAGS = etags
 +CTAGS = ctags
++DIST_SUBDIRS = $(SUBDIRS)
 +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 +ACLOCAL = @ACLOCAL@
 +AMDEP_FALSE = @AMDEP_FALSE@
@@ -52004,7 +60112,7 @@
  PARAGUI_BINARY_AGE = @PARAGUI_BINARY_AGE@
  PARAGUI_CFLAGS = @PARAGUI_CFLAGS@
  PARAGUI_INTERFACE_AGE = @PARAGUI_INTERFACE_AGE@
-@@ -95,6 +143,7 @@
+@@ -95,6 +207,7 @@
  PARAGUI_MICRO_VERSION = @PARAGUI_MICRO_VERSION@
  PARAGUI_MINOR_VERSION = @PARAGUI_MINOR_VERSION@
  PARAGUI_VERSION = @PARAGUI_VERSION@
@@ -52012,10 +60120,11 @@
  PHYSFS_INCLUDE = @PHYSFS_INCLUDE@
  PHYSFS_LIB = @PHYSFS_LIB@
  PHYSFS_SUBDIR = @PHYSFS_SUBDIR@
-@@ -110,106 +159,151 @@
+@@ -110,197 +223,238 @@
  SDL_CONFIG = @SDL_CONFIG@
  SDL_LIBS = @SDL_LIBS@
  SDL_PREFIX = @SDL_PREFIX@
++SED = @SED@
 +SET_MAKE = @SET_MAKE@
 +SHELL = @SHELL@
  STRIP = @STRIP@
@@ -52048,10 +60157,6 @@
 +exec_prefix = @exec_prefix@
  freetype_config = @freetype_config@
 -
--noinst_PROGRAMS = keyboard
--
--keyboard_SOURCES =  	keyboard.cpp 	main.cpp
--
 +host = @host@
 +host_alias = @host_alias@
 +host_cpu = @host_cpu@
@@ -52081,63 +60186,156 @@
 +target_cpu = @target_cpu@
 +target_os = @target_os@
 +target_vendor = @target_vendor@
-+keyboard_SOURCES = \
-+	keyboard.cpp \
-+	main.cpp
+ AUTOMAKE_OPTIONS = foreign
+-
+-SUBDIRS =  	keyboard 	fireworks 	colorselector
+-
+-
+-noinst_PROGRAMS =  	widgetlistbug 	eventbug 	array 	writefile 	stress1 	stress2 	listbox 	animation 	dropdown 	paratest 	dblbuffer 	navtest 	windowtest 	layouttest 	windowresize
+-
++SUBDIRS = \
++	keyboard \
++	fireworks \
++	colorselector
  
- keyboard_LDADD = -L../../src $(PARAGUI_LIBS)
+ widgetlistbug_SOURCES = widgetlistbug.cpp
+ widgetlistbug_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ eventbug_SOURCES = event_bug.cpp
+ eventbug_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ array_SOURCES = array.cpp
+ array_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ writefile_SOURCES = writefile.cpp
+ writefile_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ stress1_SOURCES = stress1.cpp
+ stress1_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ stress2_SOURCES = stress2.cpp
+ stress2_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ listbox_SOURCES = listbox.cpp
+ listbox_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ windowresize_SOURCES = windowresize.cpp
+ windowresize_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ dropdown_SOURCES = dropdown.cpp
+ dropdown_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ animation_SOURCES = animation.cpp
+ animation_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ dblbuffer_SOURCES = dblbuffer.cpp
+ dblbuffer_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ paratest_SOURCES = paratest.cpp
+ paratest_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ navtest_SOURCES = navtest.cpp
+ navtest_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ windowtest_SOURCES = windowtest.cpp
+ windowtest_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ layouttest_SOURCES = layouttest.cpp
+ layouttest_LDADD = -L../src $(PARAGUI_LIBS)
+-
+ INCLUDES = $(PARAGUI_CFLAGS) -I$(top_srcdir)/include
 +EXTRA_DIST = \
-+	keyboard.h
++	dblbuffer.xml \
++	pokus.xml \
++	icon.bmp \
++	paratest.dev
  
--EXTRA_DIST =  	keyboard.h
-+INCLUDES = \
-+	-I$(top_srcdir)/include \
-+	$(PARAGUI_CFLAGS)
- 
-+all: all-am
- 
--INCLUDES =  	-I$(top_srcdir)/include 	$(PARAGUI_CFLAGS)
+-EXTRA_DIST =  	dblbuffer.xml 	pokus.xml 	icon.bmp 	paratest.dev
 -
 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
--CONFIG_HEADER = ../../include/paraconfig_gnu.h
+-CONFIG_HEADER = ../include/paraconfig_gnu.h
 -CONFIG_CLEAN_FILES = 
--noinst_PROGRAMS =  keyboard$(EXEEXT)
+-noinst_PROGRAMS =  widgetlistbug$(EXEEXT) eventbug$(EXEEXT) \
+-array$(EXEEXT) writefile$(EXEEXT) stress1$(EXEEXT) stress2$(EXEEXT) \
+-listbox$(EXEEXT) animation$(EXEEXT) dropdown$(EXEEXT) paratest$(EXEEXT) \
+-dblbuffer$(EXEEXT) navtest$(EXEEXT) windowtest$(EXEEXT) \
+-layouttest$(EXEEXT) windowresize$(EXEEXT)
 -PROGRAMS =  $(noinst_PROGRAMS)
 -
 -
--DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
+-DEFS = @DEFS@ -I. -I$(srcdir) -I../include
 -CPPFLAGS = @CPPFLAGS@
 -LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
--keyboard_OBJECTS =  keyboard.$(OBJEXT) main.$(OBJEXT)
--keyboard_DEPENDENCIES = 
--keyboard_LDFLAGS = 
+-widgetlistbug_OBJECTS =  widgetlistbug.$(OBJEXT)
+-widgetlistbug_DEPENDENCIES = 
+-widgetlistbug_LDFLAGS = 
+-eventbug_OBJECTS =  event_bug.$(OBJEXT)
+-eventbug_DEPENDENCIES = 
+-eventbug_LDFLAGS = 
+-array_OBJECTS =  array.$(OBJEXT)
+-array_DEPENDENCIES = 
+-array_LDFLAGS = 
+-writefile_OBJECTS =  writefile.$(OBJEXT)
+-writefile_DEPENDENCIES = 
+-writefile_LDFLAGS = 
+-stress1_OBJECTS =  stress1.$(OBJEXT)
+-stress1_DEPENDENCIES = 
+-stress1_LDFLAGS = 
+-stress2_OBJECTS =  stress2.$(OBJEXT)
+-stress2_DEPENDENCIES = 
+-stress2_LDFLAGS = 
+-listbox_OBJECTS =  listbox.$(OBJEXT)
+-listbox_DEPENDENCIES = 
+-listbox_LDFLAGS = 
+-animation_OBJECTS =  animation.$(OBJEXT)
+-animation_DEPENDENCIES = 
+-animation_LDFLAGS = 
+-dropdown_OBJECTS =  dropdown.$(OBJEXT)
+-dropdown_DEPENDENCIES = 
+-dropdown_LDFLAGS = 
+-paratest_OBJECTS =  paratest.$(OBJEXT)
+-paratest_DEPENDENCIES = 
+-paratest_LDFLAGS = 
+-dblbuffer_OBJECTS =  dblbuffer.$(OBJEXT)
+-dblbuffer_DEPENDENCIES = 
+-dblbuffer_LDFLAGS = 
+-navtest_OBJECTS =  navtest.$(OBJEXT)
+-navtest_DEPENDENCIES = 
+-navtest_LDFLAGS = 
+-windowtest_OBJECTS =  windowtest.$(OBJEXT)
+-windowtest_DEPENDENCIES = 
+-windowtest_LDFLAGS = 
+-layouttest_OBJECTS =  layouttest.$(OBJEXT)
+-layouttest_DEPENDENCIES = 
+-layouttest_LDFLAGS = 
+-windowresize_OBJECTS =  windowresize.$(OBJEXT)
+-windowresize_DEPENDENCIES = 
+-windowresize_LDFLAGS = 
 -CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 -CXXLD = $(CXX)
 -CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
--DIST_COMMON =  Makefile.am Makefile.in
+-DIST_COMMON =  README Makefile.am Makefile.in
 -
 -
 -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 -
 -TAR = gtar
 -GZIP_ENV = --best
--SOURCES = $(keyboard_SOURCES)
--OBJECTS = $(keyboard_OBJECTS)
--
+-SOURCES = $(widgetlistbug_SOURCES) $(eventbug_SOURCES) $(array_SOURCES) $(writefile_SOURCES) $(stress1_SOURCES) $(stress2_SOURCES) $(listbox_SOURCES) $(animation_SOURCES) $(dropdown_SOURCES) $(paratest_SOURCES) $(dblbuffer_SOURCES) $(navtest_SOURCES) $(windowtest_SOURCES) $(layouttest_SOURCES) $(windowresize_SOURCES)
+-OBJECTS = $(widgetlistbug_OBJECTS) $(eventbug_OBJECTS) $(array_OBJECTS) $(writefile_OBJECTS) $(stress1_OBJECTS) $(stress2_OBJECTS) $(listbox_OBJECTS) $(animation_OBJECTS) $(dropdown_OBJECTS) $(paratest_OBJECTS) $(dblbuffer_OBJECTS) $(navtest_OBJECTS) $(windowtest_OBJECTS) $(layouttest_OBJECTS) $(windowresize_OBJECTS)
++all: all-recursive
+ 
 -all: all-redirect
  .SUFFIXES:
 -.SUFFIXES: .S .c .cpp .lo .o .obj .s
 -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
--	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps test/keyboard/Makefile
+-	cd $(top_srcdir) && $(AUTOMAKE) --foreign --include-deps test/Makefile
 -
 -Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) \
 -	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
--
--
--mostlyclean-noinstPROGRAMS:
 +.SUFFIXES: .cpp .lo .o .obj
 +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +	@for dep in $?; do \
@@ -52148,9 +60346,9 @@
 +	      exit 1;; \
 +	  esac; \
 +	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  test/keyboard/Makefile'; \
++	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  test/Makefile'; \
 +	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  test/keyboard/Makefile
++	  $(AUTOMAKE) --foreign  test/Makefile
 +.PRECIOUS: Makefile
 +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 +	@case '$?' in \
@@ -52160,10 +60358,11 @@
 +	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
 +	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
 +	esac;
-+
+ 
 +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
+ 
+-mostlyclean-noinstPROGRAMS:
 +$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 +	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 +$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
@@ -52194,9 +60393,51 @@
 +	  echo " rm -f $$p $$f"; \
 +	  rm -f $$p $$f ; \
 +	done
-+keyboard$(EXEEXT): $(keyboard_OBJECTS) $(keyboard_DEPENDENCIES) 
-+	@rm -f keyboard$(EXEEXT)
-+	$(CXXLINK) $(keyboard_LDFLAGS) $(keyboard_OBJECTS) $(keyboard_LDADD) $(LIBS)
++animation$(EXEEXT): $(animation_OBJECTS) $(animation_DEPENDENCIES) 
++	@rm -f animation$(EXEEXT)
++	$(CXXLINK) $(animation_LDFLAGS) $(animation_OBJECTS) $(animation_LDADD) $(LIBS)
++array$(EXEEXT): $(array_OBJECTS) $(array_DEPENDENCIES) 
++	@rm -f array$(EXEEXT)
++	$(CXXLINK) $(array_LDFLAGS) $(array_OBJECTS) $(array_LDADD) $(LIBS)
++dblbuffer$(EXEEXT): $(dblbuffer_OBJECTS) $(dblbuffer_DEPENDENCIES) 
++	@rm -f dblbuffer$(EXEEXT)
++	$(CXXLINK) $(dblbuffer_LDFLAGS) $(dblbuffer_OBJECTS) $(dblbuffer_LDADD) $(LIBS)
++dropdown$(EXEEXT): $(dropdown_OBJECTS) $(dropdown_DEPENDENCIES) 
++	@rm -f dropdown$(EXEEXT)
++	$(CXXLINK) $(dropdown_LDFLAGS) $(dropdown_OBJECTS) $(dropdown_LDADD) $(LIBS)
++eventbug$(EXEEXT): $(eventbug_OBJECTS) $(eventbug_DEPENDENCIES) 
++	@rm -f eventbug$(EXEEXT)
++	$(CXXLINK) $(eventbug_LDFLAGS) $(eventbug_OBJECTS) $(eventbug_LDADD) $(LIBS)
++layouttest$(EXEEXT): $(layouttest_OBJECTS) $(layouttest_DEPENDENCIES) 
++	@rm -f layouttest$(EXEEXT)
++	$(CXXLINK) $(layouttest_LDFLAGS) $(layouttest_OBJECTS) $(layouttest_LDADD) $(LIBS)
++listbox$(EXEEXT): $(listbox_OBJECTS) $(listbox_DEPENDENCIES) 
++	@rm -f listbox$(EXEEXT)
++	$(CXXLINK) $(listbox_LDFLAGS) $(listbox_OBJECTS) $(listbox_LDADD) $(LIBS)
++navtest$(EXEEXT): $(navtest_OBJECTS) $(navtest_DEPENDENCIES) 
++	@rm -f navtest$(EXEEXT)
++	$(CXXLINK) $(navtest_LDFLAGS) $(navtest_OBJECTS) $(navtest_LDADD) $(LIBS)
++paratest$(EXEEXT): $(paratest_OBJECTS) $(paratest_DEPENDENCIES) 
++	@rm -f paratest$(EXEEXT)
++	$(CXXLINK) $(paratest_LDFLAGS) $(paratest_OBJECTS) $(paratest_LDADD) $(LIBS)
++stress1$(EXEEXT): $(stress1_OBJECTS) $(stress1_DEPENDENCIES) 
++	@rm -f stress1$(EXEEXT)
++	$(CXXLINK) $(stress1_LDFLAGS) $(stress1_OBJECTS) $(stress1_LDADD) $(LIBS)
++stress2$(EXEEXT): $(stress2_OBJECTS) $(stress2_DEPENDENCIES) 
++	@rm -f stress2$(EXEEXT)
++	$(CXXLINK) $(stress2_LDFLAGS) $(stress2_OBJECTS) $(stress2_LDADD) $(LIBS)
++widgetlistbug$(EXEEXT): $(widgetlistbug_OBJECTS) $(widgetlistbug_DEPENDENCIES) 
++	@rm -f widgetlistbug$(EXEEXT)
++	$(CXXLINK) $(widgetlistbug_LDFLAGS) $(widgetlistbug_OBJECTS) $(widgetlistbug_LDADD) $(LIBS)
++windowresize$(EXEEXT): $(windowresize_OBJECTS) $(windowresize_DEPENDENCIES) 
++	@rm -f windowresize$(EXEEXT)
++	$(CXXLINK) $(windowresize_LDFLAGS) $(windowresize_OBJECTS) $(windowresize_LDADD) $(LIBS)
++windowtest$(EXEEXT): $(windowtest_OBJECTS) $(windowtest_DEPENDENCIES) 
++	@rm -f windowtest$(EXEEXT)
++	$(CXXLINK) $(windowtest_LDFLAGS) $(windowtest_OBJECTS) $(windowtest_LDADD) $(LIBS)
++writefile$(EXEEXT): $(writefile_OBJECTS) $(writefile_DEPENDENCIES) 
++	@rm -f writefile$(EXEEXT)
++	$(CXXLINK) $(writefile_LDFLAGS) $(writefile_OBJECTS) $(writefile_LDADD) $(LIBS)
  
  mostlyclean-compile:
 -	-rm -f *.o core *.core
@@ -52208,8 +60449,21 @@
  	-rm -f *.tab.c
  
 -maintainer-clean-compile:
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/keyboard.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/animation.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/array.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dblbuffer.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dropdown.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/event_bug.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/layouttest.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/listbox.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/navtest.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/paratest.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stress1.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stress2.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/widgetlistbug.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/windowresize.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/windowtest.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/writefile.Po at am__quote@
  
 -.c.lo:
 -	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
@@ -52240,82 +60494,233 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -218,158 +312,174 @@
+@@ -309,74 +463,8 @@
  	-rm -rf .libs _libs
  
  distclean-libtool:
-+	-rm -f libtool
-+uninstall-info-am:
- 
+-
 -maintainer-clean-libtool:
 -
--keyboard$(EXEEXT): $(keyboard_OBJECTS) $(keyboard_DEPENDENCIES)
--	@rm -f keyboard$(EXEEXT)
--	$(CXXLINK) $(keyboard_LDFLAGS) $(keyboard_OBJECTS) $(keyboard_LDADD) $(LIBS)
+-widgetlistbug$(EXEEXT): $(widgetlistbug_OBJECTS) $(widgetlistbug_DEPENDENCIES)
+-	@rm -f widgetlistbug$(EXEEXT)
+-	$(CXXLINK) $(widgetlistbug_LDFLAGS) $(widgetlistbug_OBJECTS) $(widgetlistbug_LDADD) $(LIBS)
+-
+-eventbug$(EXEEXT): $(eventbug_OBJECTS) $(eventbug_DEPENDENCIES)
+-	@rm -f eventbug$(EXEEXT)
+-	$(CXXLINK) $(eventbug_LDFLAGS) $(eventbug_OBJECTS) $(eventbug_LDADD) $(LIBS)
+-
+-array$(EXEEXT): $(array_OBJECTS) $(array_DEPENDENCIES)
+-	@rm -f array$(EXEEXT)
+-	$(CXXLINK) $(array_LDFLAGS) $(array_OBJECTS) $(array_LDADD) $(LIBS)
+-
+-writefile$(EXEEXT): $(writefile_OBJECTS) $(writefile_DEPENDENCIES)
+-	@rm -f writefile$(EXEEXT)
+-	$(CXXLINK) $(writefile_LDFLAGS) $(writefile_OBJECTS) $(writefile_LDADD) $(LIBS)
+-
+-stress1$(EXEEXT): $(stress1_OBJECTS) $(stress1_DEPENDENCIES)
+-	@rm -f stress1$(EXEEXT)
+-	$(CXXLINK) $(stress1_LDFLAGS) $(stress1_OBJECTS) $(stress1_LDADD) $(LIBS)
+-
+-stress2$(EXEEXT): $(stress2_OBJECTS) $(stress2_DEPENDENCIES)
+-	@rm -f stress2$(EXEEXT)
+-	$(CXXLINK) $(stress2_LDFLAGS) $(stress2_OBJECTS) $(stress2_LDADD) $(LIBS)
+-
+-listbox$(EXEEXT): $(listbox_OBJECTS) $(listbox_DEPENDENCIES)
+-	@rm -f listbox$(EXEEXT)
+-	$(CXXLINK) $(listbox_LDFLAGS) $(listbox_OBJECTS) $(listbox_LDADD) $(LIBS)
+-
+-animation$(EXEEXT): $(animation_OBJECTS) $(animation_DEPENDENCIES)
+-	@rm -f animation$(EXEEXT)
+-	$(CXXLINK) $(animation_LDFLAGS) $(animation_OBJECTS) $(animation_LDADD) $(LIBS)
+-
+-dropdown$(EXEEXT): $(dropdown_OBJECTS) $(dropdown_DEPENDENCIES)
+-	@rm -f dropdown$(EXEEXT)
+-	$(CXXLINK) $(dropdown_LDFLAGS) $(dropdown_OBJECTS) $(dropdown_LDADD) $(LIBS)
+-
+-paratest$(EXEEXT): $(paratest_OBJECTS) $(paratest_DEPENDENCIES)
+-	@rm -f paratest$(EXEEXT)
+-	$(CXXLINK) $(paratest_LDFLAGS) $(paratest_OBJECTS) $(paratest_LDADD) $(LIBS)
+-
+-dblbuffer$(EXEEXT): $(dblbuffer_OBJECTS) $(dblbuffer_DEPENDENCIES)
+-	@rm -f dblbuffer$(EXEEXT)
+-	$(CXXLINK) $(dblbuffer_LDFLAGS) $(dblbuffer_OBJECTS) $(dblbuffer_LDADD) $(LIBS)
+-
+-navtest$(EXEEXT): $(navtest_OBJECTS) $(navtest_DEPENDENCIES)
+-	@rm -f navtest$(EXEEXT)
+-	$(CXXLINK) $(navtest_LDFLAGS) $(navtest_OBJECTS) $(navtest_LDADD) $(LIBS)
+-
+-windowtest$(EXEEXT): $(windowtest_OBJECTS) $(windowtest_DEPENDENCIES)
+-	@rm -f windowtest$(EXEEXT)
+-	$(CXXLINK) $(windowtest_LDFLAGS) $(windowtest_OBJECTS) $(windowtest_LDADD) $(LIBS)
+-
+-layouttest$(EXEEXT): $(layouttest_OBJECTS) $(layouttest_DEPENDENCIES)
+-	@rm -f layouttest$(EXEEXT)
+-	$(CXXLINK) $(layouttest_LDFLAGS) $(layouttest_OBJECTS) $(layouttest_LDADD) $(LIBS)
+-
+-windowresize$(EXEEXT): $(windowresize_OBJECTS) $(windowresize_DEPENDENCIES)
+-	@rm -f windowresize$(EXEEXT)
+-	$(CXXLINK) $(windowresize_LDFLAGS) $(windowresize_OBJECTS) $(windowresize_LDADD) $(LIBS)
 -.cpp.o:
 -	$(CXXCOMPILE) -c $<
 -.cpp.obj:
 -	$(CXXCOMPILE) -c `cygpath -w $<`
 -.cpp.lo:
 -	$(LTCXXCOMPILE) -c $<
++	-rm -f libtool
++uninstall-info-am:
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -384,13 +472,14 @@
+ # (1) if the variable is set in `config.status', edit `config.status'
+ #     (which will cause the Makefiles to be regenerated when you run `make');
+ # (2) otherwise, pass the desired values on the `make' command line.
 -
+- at SET_MAKE@
+-
+-all-recursive install-data-recursive install-exec-recursive \
+-installdirs-recursive install-recursive uninstall-recursive  \
+-check-recursive installcheck-recursive info-recursive dvi-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++$(RECURSIVE_TARGETS):
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -402,7 +491,7 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done; \
+ 	if test "$$dot_seen" = "no"; then \
+ 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+@@ -410,13 +499,24 @@
+ 
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@failcom='exit 1'; \
++	for f in x $$MAKEFLAGS; do \
++	  case $$f in \
++	    *=* | --[!k]*);; \
++	    *k*) failcom='fail=yes';; \
++	  esac; \
++	done; \
+ 	dot_seen=no; \
+-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+-	  rev="$$subdir $$rev"; \
+-	  test "$$subdir" != "." || dot_seen=yes; \
++	case "$@" in \
++	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
++	  *) list='$(SUBDIRS)' ;; \
++	esac; \
++	rev=''; for subdir in $$list; do \
++	  if test "$$subdir" = "."; then :; else \
++	    rev="$$subdir $$rev"; \
++	  fi; \
+ 	done; \
+-	test "$$dot_seen" = "no" && rev=". $$rev"; \
++	rev="$$rev ."; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	for subdir in $$rev; do \
+ 	  echo "Making $$target in $$subdir"; \
+@@ -426,339 +526,215 @@
+ 	    local_target="$$target"; \
+ 	  fi; \
+ 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
++	  || eval $$failcom; \
+ 	done && test -z "$$fail"
+ tags-recursive:
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ 	done
++ctags-recursive:
++	list='$(SUBDIRS)'; for subdir in $$list; do \
++	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
++	done
+ 
+-tags: TAGS
+-
+-ID: $(HEADERS) $(SOURCES) $(LISP)
+-	list='$(SOURCES) $(HEADERS)'; \
+-	unique=`for i in $$list; do echo $$i; done | \
+-	  awk '    { files[$$0] = 1; } \
 +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 +	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
-+	       END { for (i in files) print i; }'`; \
+ 	       END { for (i in files) print i; }'`; \
+-	here=`pwd` && cd $(srcdir) \
+-	  && mkid -f$$here/ID $$unique $(LISP)
 +	mkid -fID $$unique
- tags: TAGS
++tags: TAGS
  
--ID: $(HEADERS) $(SOURCES) $(LISP)
+-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
++TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++		$(TAGS_FILES) $(LISP)
+ 	tags=; \
+ 	here=`pwd`; \
++	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
++	  include_option=--etags-include; \
++	  empty_fix=.; \
++	else \
++	  include_option=--include; \
++	  empty_fix=; \
++	fi; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+-   if test "$$subdir" = .; then :; else \
+-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
+-   fi; \
++	  if test "$$subdir" = .; then :; else \
++	    test ! -f $$subdir/TAGS || \
++	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
++	  fi; \
+ 	done; \
 -	list='$(SOURCES) $(HEADERS)'; \
 -	unique=`for i in $$list; do echo $$i; done | \
 -	  awk '    { files[$$0] = 1; } \
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	tags=; \
-+	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
--	here=`pwd` && cd $(srcdir) \
--	  && mkid -f$$here/ID $$unique $(LISP)
+-	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
+-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
 -
--TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+-mostlyclean-tags:
 +	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 +	  test -n "$$unique" || unique=$$empty_fix; \
 +	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 +	    $$tags $$unique; \
 +	fi
 +ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
++CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 +		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	list='$(SOURCES) $(HEADERS)'; \
--	unique=`for i in $$list; do echo $$i; done | \
--	  awk '    { files[$$0] = 1; } \
++	tags=; \
++	here=`pwd`; \
 +	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 +	unique=`for i in $$list; do \
 +	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 +	  done | \
 +	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
--	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
--
--mostlyclean-tags:
--
--clean-tags:
++	       END { for (i in files) print i; }'`; \
 +	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 +	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 +	     $$tags $$unique
-+
+ 
+-clean-tags:
 +GTAGS:
 +	here=`$(am__cd) $(top_builddir) && pwd` \
 +	  && cd $(top_srcdir) \
@@ -52328,7 +60733,7 @@
 -
 -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 -
--subdir = test/keyboard
+-subdir = test
 +	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
  
  distdir: $(DISTFILES)
@@ -52363,58 +60768,247 @@
 +	    || exit 1; \
  	  fi; \
  	done
--keyboard.o: keyboard.cpp keyboard.h ../../include/pglabel.h \
--	../../include/pgwidget.h ../../include/pgmessageobject.h \
--	../../include/paragui.h ../../include/paraconfig.h \
--	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
--	../../include/pgrect.h ../../include/pgrectlist.h \
--	../../include/pgfont.h ../../include/pgdatacontainer.h \
--	../../include/pgapplication.h ../../include/pgfilearchive.h \
--	../../include/pgfile.h ../../include/pgsurfacecache.h \
--	../../include/pgtheme.h ../../include/pgbutton.h \
--	../../include/pglineedit.h ../../include/pgthemewidget.h
--main.o: main.cpp keyboard.h ../../include/pglabel.h \
--	../../include/pgwidget.h ../../include/pgmessageobject.h \
--	../../include/paragui.h ../../include/paraconfig.h \
--	../../include/paraconfig_gnu.h ../../include/paragui_types.h \
--	../../include/pgrect.h ../../include/pgrectlist.h \
--	../../include/pgfont.h ../../include/pgdatacontainer.h \
--	../../include/pgapplication.h ../../include/pgfilearchive.h \
--	../../include/pgfile.h ../../include/pgsurfacecache.h \
--	../../include/pgtheme.h ../../include/pgbutton.h \
--	../../include/pglineedit.h ../../include/pgthemewidget.h
+-	for subdir in $(SUBDIRS); do \
++	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ 	  if test "$$subdir" = .; then :; else \
+-	    test -d $(distdir)/$$subdir \
+-	    || mkdir $(distdir)/$$subdir \
++	    test -d "$(distdir)/$$subdir" \
++	    || $(mkdir_p) "$(distdir)/$$subdir" \
+ 	    || exit 1; \
+-	    chmod 777 $(distdir)/$$subdir; \
+-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
++	    distdir=`$(am__cd) $(distdir) && pwd`; \
++	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
++	    (cd $$subdir && \
++	      $(MAKE) $(AM_MAKEFLAGS) \
++	        top_distdir="$$top_distdir" \
++	        distdir="$$distdir/$$subdir" \
++	        distdir) \
+ 	      || exit 1; \
+ 	  fi; \
+ 	done
+-animation.o: animation.cpp ../include/pgapplication.h \
+-	../include/pgmessageobject.h ../include/paragui.h \
+-	../include/paraconfig.h ../include/paraconfig_gnu.h \
+-	../include/paragui_types.h ../include/pgrect.h \
+-	../include/pgfilearchive.h ../include/pgfile.h \
+-	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
+-	../include/pgfont.h ../include/pgtheme.h \
+-	../include/pgpopupmenu.h ../include/pgthemewidget.h \
+-	../include/pgwidget.h ../include/pgrectlist.h \
+-	../include/pgbutton.h ../include/pgmenubar.h \
+-	../include/pgeventobject.h ../include/pgscrollbar.h \
+-	../include/pgtimerobject.h ../include/pglog.h
+-array.o: array.cpp ../include/paragui.h ../include/paraconfig.h \
+-	../include/paraconfig_gnu.h ../include/paragui_types.h \
+-	../include/pgrect.h ../include/pgapplication.h \
+-	../include/pgmessageobject.h ../include/pgfilearchive.h \
+-	../include/pgfile.h ../include/pgsurfacecache.h \
+-	../include/pgdatacontainer.h ../include/pgfont.h \
+-	../include/pgtheme.h ../include/pgthemewidget.h \
+-	../include/pgwidget.h ../include/pgrectlist.h \
+-	../include/pglabel.h
+-dblbuffer.o: dblbuffer.cpp ../include/pgapplication.h \
+-	../include/pgmessageobject.h ../include/paragui.h \
+-	../include/paraconfig.h ../include/paraconfig_gnu.h \
+-	../include/paragui_types.h ../include/pgrect.h \
+-	../include/pgfilearchive.h ../include/pgfile.h \
+-	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
+-	../include/pgfont.h ../include/pgtheme.h ../include/pgwidget.h \
+-	../include/pgrectlist.h ../include/pglog.h \
+-	../include/pgbutton.h ../include/pglabel.h \
+-	../include/pgcheckbutton.h ../include/pgradiobutton.h \
+-	../include/pgthemewidget.h
+-dropdown.o: dropdown.cpp ../include/paragui.h ../include/paraconfig.h \
+-	../include/paraconfig_gnu.h ../include/paragui_types.h \
+-	../include/pgrect.h ../include/pgdropdown.h \
+-	../include/pgbutton.h ../include/pgwidget.h \
+-	../include/pgmessageobject.h ../include/pgrectlist.h \
+-	../include/pgfont.h ../include/pgdatacontainer.h \
+-	../include/pglineedit.h ../include/pgthemewidget.h \
+-	../include/pglistbox.h ../include/pgwidgetlist.h \
+-	../include/pgscrollbar.h ../include/pglistboxitem.h \
+-	../include/pglistboxbaseitem.h ../include/pglabel.h \
+-	../include/pgapplication.h ../include/pgfilearchive.h \
+-	../include/pgfile.h ../include/pgsurfacecache.h \
+-	../include/pgtheme.h ../include/pgeventobject.h
+-event_bug.o: event_bug.cpp ../include/pgapplication.h \
+-	../include/pgmessageobject.h ../include/paragui.h \
+-	../include/paraconfig.h ../include/paraconfig_gnu.h \
+-	../include/paragui_types.h ../include/pgrect.h \
+-	../include/pgfilearchive.h ../include/pgfile.h \
+-	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
+-	../include/pgfont.h ../include/pgtheme.h ../include/pgwindow.h \
+-	../include/pgthemewidget.h ../include/pgwidget.h \
+-	../include/pgrectlist.h ../include/pgbutton.h \
+-	../include/pglabel.h ../include/pglineedit.h \
+-	../include/pgeventobject.h
+-layouttest.o: layouttest.cpp ../include/paragui.h \
+-	../include/paraconfig.h ../include/paraconfig_gnu.h \
+-	../include/paragui_types.h ../include/pgrect.h \
+-	../include/pgapplication.h ../include/pgmessageobject.h \
+-	../include/pgfilearchive.h ../include/pgfile.h \
+-	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
+-	../include/pgfont.h ../include/pgtheme.h ../include/pgwindow.h \
+-	../include/pgthemewidget.h ../include/pgwidget.h \
+-	../include/pgrectlist.h ../include/pgbutton.h \
+-	../include/pglabel.h
+-listbox.o: listbox.cpp ../include/paragui.h ../include/paraconfig.h \
+-	../include/paraconfig_gnu.h ../include/paragui_types.h \
+-	../include/pgrect.h ../include/pgapplication.h \
+-	../include/pgmessageobject.h ../include/pgfilearchive.h \
+-	../include/pgfile.h ../include/pgsurfacecache.h \
+-	../include/pgdatacontainer.h ../include/pgfont.h \
+-	../include/pgtheme.h ../include/pglistbox.h \
+-	../include/pgwidgetlist.h ../include/pgthemewidget.h \
+-	../include/pgwidget.h ../include/pgrectlist.h \
+-	../include/pgscrollbar.h ../include/pgbutton.h \
+-	../include/pglistboxitem.h ../include/pglistboxbaseitem.h \
+-	../include/pglabel.h
+-navtest.o: navtest.cpp ../include/pgapplication.h \
+-	../include/pgmessageobject.h ../include/paragui.h \
+-	../include/paraconfig.h ../include/paraconfig_gnu.h \
+-	../include/paragui_types.h ../include/pgrect.h \
+-	../include/pgfilearchive.h ../include/pgfile.h \
+-	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
+-	../include/pgfont.h ../include/pgtheme.h ../include/pgbutton.h \
+-	../include/pgwidget.h ../include/pgrectlist.h \
+-	../include/pglineedit.h ../include/pgthemewidget.h \
+-	../include/pgnavigator.h
+-paratest.o: paratest.cpp ../include/paragui.h ../include/paraconfig.h \
+-	../include/paraconfig_gnu.h ../include/paragui_types.h \
+-	../include/pgrect.h ../include/pgapplication.h \
+-	../include/pgmessageobject.h ../include/pgfilearchive.h \
+-	../include/pgfile.h ../include/pgsurfacecache.h \
+-	../include/pgdatacontainer.h ../include/pgfont.h \
+-	../include/pgtheme.h ../include/pgbutton.h \
+-	../include/pgwidget.h ../include/pgrectlist.h \
+-	../include/pgwidgetlist.h ../include/pgthemewidget.h \
+-	../include/pgscrollbar.h ../include/pglabel.h \
+-	../include/pgwindow.h ../include/pgmaskedit.h \
+-	../include/pglineedit.h ../include/pgprogressbar.h \
+-	../include/pgradiobutton.h ../include/pgcheckbutton.h \
+-	../include/pgslider.h ../include/pglistbox.h \
+-	../include/pglistboxitem.h ../include/pglistboxbaseitem.h \
+-	../include/pgcolumnitem.h ../include/pgdropdown.h \
+-	../include/pgeventobject.h ../include/pgpopupmenu.h \
+-	../include/pgspinnerbox.h ../include/pglog.h \
+-	../include/pgmenubar.h
+-stress1.o: stress1.cpp ../include/paragui.h ../include/paraconfig.h \
+-	../include/paraconfig_gnu.h ../include/paragui_types.h \
+-	../include/pgrect.h ../include/pgapplication.h \
+-	../include/pgmessageobject.h ../include/pgfilearchive.h \
+-	../include/pgfile.h ../include/pgsurfacecache.h \
+-	../include/pgdatacontainer.h ../include/pgfont.h \
+-	../include/pgtheme.h ../include/pgbutton.h \
+-	../include/pgwidget.h ../include/pgrectlist.h \
+-	../include/pgwidgetlist.h ../include/pgthemewidget.h \
+-	../include/pgscrollbar.h ../include/pglabel.h \
+-	../include/pgwindow.h ../include/pgmaskedit.h \
+-	../include/pglineedit.h ../include/pgprogressbar.h \
+-	../include/pgradiobutton.h ../include/pgcheckbutton.h \
+-	../include/pgslider.h ../include/pglistbox.h \
+-	../include/pglistboxitem.h ../include/pglistboxbaseitem.h \
+-	../include/pgcolumnitem.h ../include/pgdropdown.h \
+-	../include/pgeventobject.h ../include/pgpopupmenu.h \
+-	../include/pgspinnerbox.h ../include/pglog.h \
+-	../include/pgmenubar.h
+-stress2.o: stress2.cpp ../include/paragui.h ../include/paraconfig.h \
+-	../include/paraconfig_gnu.h ../include/paragui_types.h \
+-	../include/pgrect.h ../include/pgapplication.h \
+-	../include/pgmessageobject.h ../include/pgfilearchive.h \
+-	../include/pgfile.h ../include/pgsurfacecache.h \
+-	../include/pgdatacontainer.h ../include/pgfont.h \
+-	../include/pgtheme.h ../include/pgbutton.h \
+-	../include/pgwidget.h ../include/pgrectlist.h \
+-	../include/pgwidgetlist.h ../include/pgthemewidget.h \
+-	../include/pgscrollbar.h ../include/pglabel.h \
+-	../include/pgwindow.h ../include/pgmaskedit.h \
+-	../include/pglineedit.h ../include/pgprogressbar.h \
+-	../include/pgradiobutton.h ../include/pgcheckbutton.h \
+-	../include/pgslider.h ../include/pglistbox.h \
+-	../include/pglistboxitem.h ../include/pglistboxbaseitem.h \
+-	../include/pgcolumnitem.h ../include/pgdropdown.h \
+-	../include/pgeventobject.h ../include/pgpopupmenu.h \
+-	../include/pgspinnerbox.h ../include/pglog.h \
+-	../include/pgmenubar.h
+-widgetlistbug.o: widgetlistbug.cpp ../include/pgapplication.h \
+-	../include/pgmessageobject.h ../include/paragui.h \
+-	../include/paraconfig.h ../include/paraconfig_gnu.h \
+-	../include/paragui_types.h ../include/pgrect.h \
+-	../include/pgfilearchive.h ../include/pgfile.h \
+-	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
+-	../include/pgfont.h ../include/pgtheme.h ../include/pgbutton.h \
+-	../include/pgwidget.h ../include/pgrectlist.h \
+-	../include/pgwidgetlist.h ../include/pgthemewidget.h \
+-	../include/pgscrollbar.h ../include/pglabel.h
+-windowresize.o: windowresize.cpp ../include/paragui.h \
+-	../include/paraconfig.h ../include/paraconfig_gnu.h \
+-	../include/paragui_types.h ../include/pgrect.h \
+-	../include/pgapplication.h ../include/pgmessageobject.h \
+-	../include/pgfilearchive.h ../include/pgfile.h \
+-	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
+-	../include/pgfont.h ../include/pgtheme.h ../include/pgwindow.h \
+-	../include/pgthemewidget.h ../include/pgwidget.h \
+-	../include/pgrectlist.h ../include/pgbutton.h \
+-	../include/pglabel.h
+-windowtest.o: windowtest.cpp ../include/pgapplication.h \
+-	../include/pgmessageobject.h ../include/paragui.h \
+-	../include/paraconfig.h ../include/paraconfig_gnu.h \
+-	../include/paragui_types.h ../include/pgrect.h \
+-	../include/pgfilearchive.h ../include/pgfile.h \
+-	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
+-	../include/pgfont.h ../include/pgtheme.h \
+-	../include/pgthemewidget.h ../include/pgwidget.h \
+-	../include/pgrectlist.h ../include/pgwindow.h \
+-	../include/pgbutton.h ../include/pglabel.h \
+-	../include/pgmessagebox.h ../include/pgrichedit.h \
+-	../include/pgwidgetlistex.h ../include/pgwidgetlist.h \
+-	../include/pgscrollbar.h ../include/pgdropdown.h \
+-	../include/pglineedit.h ../include/pglistbox.h \
+-	../include/pglistboxitem.h ../include/pglistboxbaseitem.h \
+-	../include/pgeventobject.h
+-writefile.o: writefile.cpp ../include/pgfilearchive.h \
+-	../include/paragui.h ../include/paraconfig.h \
+-	../include/paraconfig_gnu.h ../include/paragui_types.h \
+-	../include/pgrect.h ../include/pgfile.h \
+-	../include/pgsurfacecache.h ../include/pgdatacontainer.h \
+-	../include/pglog.h
 -
 -info-am:
--info: info-am
+-info: info-recursive
 -dvi-am:
--dvi: dvi-am
+-dvi: dvi-recursive
  check-am: all-am
- check: check-am
+ check: check-recursive
 -installcheck-am:
--installcheck: installcheck-am
+-installcheck: installcheck-recursive
 -install-exec-am:
 +all-am: Makefile $(PROGRAMS)
-+installdirs:
-+install: install-am
- install-exec: install-exec-am
++installdirs: installdirs-recursive
++installdirs-am:
++install: install-recursive
+ install-exec: install-exec-recursive
 -
 -install-data-am:
- install-data: install-data-am
-+uninstall: uninstall-am
+ install-data: install-data-recursive
++uninstall: uninstall-recursive
  
  install-am: all-am
  	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
--install: install-am
+-install: install-recursive
 -uninstall-am:
--uninstall: uninstall-am
+-uninstall: uninstall-recursive
 -all-am: Makefile $(PROGRAMS)
--all-redirect: all-am
+-all-redirect: all-recursive
 -install-strip:
 -	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
--installdirs:
+-installdirs: installdirs-recursive
+-installdirs-am:
 -
  
-+installcheck: installcheck-am
++installcheck: installcheck-recursive
 +install-strip:
 +	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
 +	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -52435,22 +61029,22 @@
 -		mostlyclean-generic
 +	@echo "This command is intended for maintainers to use"
 +	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
++clean: clean-recursive
  
--mostlyclean: mostlyclean-am
+-mostlyclean: mostlyclean-recursive
 +clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \
 +	mostlyclean-am
  
 -clean-am:  clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \
 -		clean-generic mostlyclean-am
-+distclean: distclean-am
++distclean: distclean-recursive
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +distclean-am: clean-am distclean-compile distclean-generic \
 +	distclean-libtool distclean-tags
  
--clean: clean-am
-+dvi: dvi-am
+-clean: clean-recursive
++dvi: dvi-recursive
  
 -distclean-am:  distclean-noinstPROGRAMS distclean-compile \
 -		distclean-libtool distclean-tags distclean-generic \
@@ -52458,8 +61052,8 @@
 -	-rm -f libtool
 +dvi-am:
  
--distclean: distclean-am
-+html: html-am
+-distclean: distclean-recursive
++html: html-recursive
  
 -maintainer-clean-am:  maintainer-clean-noinstPROGRAMS \
 -		maintainer-clean-compile maintainer-clean-libtool \
@@ -52467,7 +61061,7 @@
 -		distclean-am
 -	@echo "This command is intended for maintainers to use;"
 -	@echo "it deletes files that may require special tools to rebuild."
-+info: info-am
++info: info-recursive
 +
 +info-am:
 +
@@ -52475,10802 +61069,71 @@
 +
 +install-exec-am:
 +
-+install-info: install-info-am
++install-info: install-info-recursive
 +
 +install-man:
 +
 +installcheck-am:
  
- maintainer-clean: maintainer-clean-am
+ maintainer-clean: maintainer-clean-recursive
 +	-rm -rf ./$(DEPDIR)
 +	-rm -f Makefile
 +maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-+	mostlyclean-libtool
-+
-+pdf: pdf-am
-+
-+pdf-am:
  
 -.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \
 -clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \
 -mostlyclean-compile distclean-compile clean-compile \
 -maintainer-clean-compile mostlyclean-libtool distclean-libtool \
--clean-libtool maintainer-clean-libtool tags mostlyclean-tags \
+-clean-libtool maintainer-clean-libtool install-data-recursive \
+-uninstall-data-recursive install-exec-recursive \
+-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
+-all-recursive check-recursive installcheck-recursive info-recursive \
+-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
+-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
 -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
 -install-exec install-data-am install-data install-am install \
--uninstall-am uninstall all-redirect all-am all installdirs \
--mostlyclean-generic distclean-generic clean-generic \
+-uninstall-am uninstall all-redirect all-am all installdirs-am \
+-installdirs mostlyclean-generic distclean-generic clean-generic \
 -maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+ps: ps-am
- 
-+ps-am:
++mostlyclean: mostlyclean-recursive
 +
-+uninstall-am: uninstall-info-am
++mostlyclean-am: mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool
 +
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-libtool clean-noinstPROGRAMS ctags distclean \
-+	distclean-compile distclean-generic distclean-libtool \
-+	distclean-tags distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am install-exec \
-+	install-exec-am install-info install-info-am install-man \
-+	install-strip installcheck installcheck-am installdirs \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-+	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-+	uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: libparagui1.0-1.0.4/aclocal.m4
-===================================================================
---- libparagui1.0-1.0.4.orig/aclocal.m4	2003-06-27 10:34:28.000000000 +0200
-+++ libparagui1.0-1.0.4/aclocal.m4	2006-06-15 22:26:21.000000000 +0200
-@@ -1,166 +1,73 @@
--dnl aclocal.m4 generated automatically by aclocal 1.4-p6
-+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
- 
--dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
--dnl This file is free software; the Free Software Foundation
--dnl gives unlimited permission to copy and/or distribute it,
--dnl with or without modifications, as long as this notice is preserved.
--
--dnl This program is distributed in the hope that it will be useful,
--dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
--dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
--dnl PARTICULAR PURPOSE.
--
--# Like AC_CONFIG_HEADER, but automatically create stamp file.
--
--AC_DEFUN([AM_CONFIG_HEADER],
--[AC_PREREQ([2.12])
--AC_CONFIG_HEADER([$1])
--dnl When config.status generates a header, we must update the stamp-h file.
--dnl This file resides in the same directory as the config header
--dnl that is generated.  We must strip everything past the first ":",
--dnl and everything past the last "/".
--AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
--ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
--<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
--<<am_indx=1
--for am_file in <<$1>>; do
--  case " <<$>>CONFIG_HEADERS " in
--  *" <<$>>am_file "*<<)>>
--    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
--    ;;
--  esac
--  am_indx=`expr "<<$>>am_indx" + 1`
--done<<>>dnl>>)
--changequote([,]))])
--
--# Do all the work for Automake.  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.
--
--# serial 1
--
--dnl Usage:
--dnl AM_INIT_AUTOMAKE(package,version, [no-define])
--
--AC_DEFUN([AM_INIT_AUTOMAKE],
--[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
--AC_REQUIRE([AC_PROG_INSTALL])
--PACKAGE=[$1]
--AC_SUBST(PACKAGE)
--VERSION=[$2]
--AC_SUBST(VERSION)
--dnl test to see if srcdir already configured
--if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
--  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
--fi
--ifelse([$3],,
--AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
--AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
--AC_REQUIRE([AM_SANITY_CHECK])
--AC_REQUIRE([AC_ARG_PROGRAM])
--dnl FIXME This is truly gross.
--missing_dir=`cd $ac_aux_dir && pwd`
--AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
--AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
--AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
--AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
--AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
--AC_REQUIRE([AC_PROG_MAKE_SET])])
--
--# Copyright 2002  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.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005  Free Software Foundation, Inc.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
- 
- # 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
--
--# AM_AUTOMAKE_VERSION(VERSION)
--# ----------------------------
--# Automake X.Y traces this macro to ensure aclocal.m4 has been
--# generated from the m4 files accompanying Automake X.Y.
--AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"])
--
--# AM_SET_CURRENT_AUTOMAKE_VERSION
--# -------------------------------
--# 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.4-p6])])
--
--#
--# Check to make sure that the build environment is sane.
--#
--
--AC_DEFUN([AM_SANITY_CHECK],
--[AC_MSG_CHECKING([whether build environment is sane])
--# Just in case
--sleep 1
--echo timestamp > conftestfile
--# Do `set' in a subshell so we don't clobber the current shell's
--# arguments.  Must try -L first in case configure is actually a
--# symlink; some systems play weird games with the mod time of symlinks
--# (eg FreeBSD returns the mod time of the symlink's containing
--# directory).
--if (
--   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
--   if test "[$]*" = "X"; then
--      # -L didn't work.
--      set X `ls -t $srcdir/configure conftestfile`
--   fi
--   if test "[$]*" != "X $srcdir/configure conftestfile" \
--      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
- 
--      # If neither matched, then we have a broken ls.  This can happen
--      # if, for instance, CONFIG_SHELL is bash and it inherits a
--      # broken ls alias from the environment.  This has actually
--      # happened.  Such a system could not be considered "sane".
--      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
--alias in your environment])
--   fi
-+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
- 
--   test "[$]2" = conftestfile
--   )
--then
--   # Ok.
--   :
--else
--   AC_MSG_ERROR([newly created file is older than distributed files!
--Check your system clock])
--fi
--rm -f conftest*
--AC_MSG_RESULT(yes)])
-+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL
- 
--dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
--dnl The program must properly implement --version.
--AC_DEFUN([AM_MISSING_PROG],
--[AC_MSG_CHECKING(for working $2)
--# Run test in a subshell; some versions of sh will print an error if
--# an executable is not found, even if stderr is redirected.
--# Redirect stdin to placate older versions of autoconf.  Sigh.
--if ($2 --version) < /dev/null > /dev/null 2>&1; then
--   $1=$2
--   AC_MSG_RESULT(found)
--else
--   $1="$3/missing $2"
--   AC_MSG_RESULT(missing)
--fi
--AC_SUBST($1)])
- 
--# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
-+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-+# -----------------------------------------------------------
-+# If this macro is not defined by Autoconf, define it here.
-+m4_ifdef([AC_PROVIDE_IFELSE],
-+         [],
-+         [m4_define([AC_PROVIDE_IFELSE],
-+	         [m4_ifdef([AC_PROVIDE_$1],
-+		           [$2], [$3])])])
- 
--# serial 46 AC_PROG_LIBTOOL
- 
-+# AC_PROG_LIBTOOL
-+# ---------------
- AC_DEFUN([AC_PROG_LIBTOOL],
-+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+    [AC_LIBTOOL_CXX],
-+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-+  ])])
-+dnl And a similar setup for Fortran 77 support
-+  AC_PROVIDE_IFELSE([AC_PROG_F77],
-+    [AC_LIBTOOL_F77],
-+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-+])])
++pdf: pdf-recursive
 +
-+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-+    [AC_LIBTOOL_GCJ],
-+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-+      [AC_LIBTOOL_GCJ],
-+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-+	[AC_LIBTOOL_GCJ],
-+      [ifdef([AC_PROG_GCJ],
-+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+       ifdef([A][M_PROG_GCJ],
-+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-+       ifdef([LT_AC_PROG_GCJ],
-+	     [define([LT_AC_PROG_GCJ],
-+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-+])])# AC_PROG_LIBTOOL
++pdf-am:
 +
++ps: ps-recursive
 +
-+# _AC_PROG_LIBTOOL
-+# ----------------
-+AC_DEFUN([_AC_PROG_LIBTOOL],
- [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-@@ -171,10 +78,13 @@
- 
- # Prevent multiple expansion
- define([AC_PROG_LIBTOOL], [])
--])
-+])# _AC_PROG_LIBTOOL
++ps-am:
 +
- 
-+# AC_LIBTOOL_SETUP
-+# ----------------
- AC_DEFUN([AC_LIBTOOL_SETUP],
--[AC_PREREQ(2.13)dnl
-+[AC_PREREQ(2.50)dnl
- AC_REQUIRE([AC_ENABLE_SHARED])dnl
- AC_REQUIRE([AC_ENABLE_STATIC])dnl
- AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-@@ -184,366 +94,239 @@
- AC_REQUIRE([AC_PROG_LD])dnl
- AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
- AC_REQUIRE([AC_PROG_NM])dnl
--AC_REQUIRE([LT_AC_PROG_SED])dnl
- 
- AC_REQUIRE([AC_PROG_LN_S])dnl
- AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
- AC_REQUIRE([AC_OBJEXT])dnl
- AC_REQUIRE([AC_EXEEXT])dnl
- dnl
- 
-+AC_LIBTOOL_SYS_MAX_CMD_LEN
-+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+AC_LIBTOOL_OBJDIR
++uninstall-am: uninstall-info-am
 +
-+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
- _LT_AC_PROG_ECHO_BACKSLASH
--# Only perform the check for file, if the check method requires it
--case $deplibs_check_method in
--file_magic*)
--  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    AC_PATH_MAGIC
++uninstall-info: uninstall-info-recursive
 +
-+case $host_os in
-+aix3*)
-+  # AIX sometimes has problems with the GCC collect2 program.  For some
-+  # reason, if we set the COLLECT_NAMES environment variable, the problems
-+  # vanish in a puff of smoke.
-+  if test "X${COLLECT_NAMES+set}" != Xset; then
-+    COLLECT_NAMES=
-+    export COLLECT_NAMES
-   fi
-   ;;
- esac
++.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
++	clean clean-generic clean-libtool clean-noinstPROGRAMS \
++	clean-recursive ctags ctags-recursive distclean \
++	distclean-compile distclean-generic distclean-libtool \
++	distclean-recursive distclean-tags distdir dvi dvi-am html \
++	html-am info info-am install install-am install-data \
++	install-data-am install-exec install-exec-am install-info \
++	install-info-am install-man install-strip installcheck \
++	installcheck-am installdirs installdirs-am maintainer-clean \
++	maintainer-clean-generic maintainer-clean-recursive \
++	mostlyclean mostlyclean-compile mostlyclean-generic \
++	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am uninstall-info-am
  
-+# Sed substitution that helps us do robust quoting.  It backslashifies
-+# metacharacters that are still active within double-quoted strings.
-+Xsed='sed -e 1s/^X//'
-+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-+
-+# Same as above, but do not quote variable references.
-+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-+
-+# Sed substitution to delay expansion of an escaped shell variable in a
-+# double_quote_subst'ed string.
-+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-+
-+# Sed substitution to avoid accidental globbing in evaled expressions
-+no_glob_subst='s/\*/\\\*/g'
-+
-+# Constants:
-+rm="rm -f"
-+
-+# Global variables:
-+default_ofile=libtool
-+can_build_shared=yes
-+
-+# All known linkers require a `.a' archive for static linking (except MSVC,
-+# which needs '.lib').
-+libext=a
-+ltmain="$ac_aux_dir/ltmain.sh"
-+ofile="$default_ofile"
-+with_gnu_ld="$lt_cv_prog_gnu_ld"
-+
-+AC_CHECK_TOOL(AR, ar, false)
- AC_CHECK_TOOL(RANLIB, ranlib, :)
- AC_CHECK_TOOL(STRIP, strip, :)
  
--ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
--ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
--enable_win32_dll=yes, enable_win32_dll=no)
-+old_CC="$CC"
-+old_CFLAGS="$CFLAGS"
- 
--AC_ARG_ENABLE(libtool-lock,
--  [  --disable-libtool-lock  avoid locking (might break parallel builds)])
--test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-+# Set sane defaults for various variables
-+test -z "$AR" && AR=ar
-+test -z "$AR_FLAGS" && AR_FLAGS=cru
-+test -z "$AS" && AS=as
-+test -z "$CC" && CC=cc
-+test -z "$LTCC" && LTCC=$CC
-+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
-+test -z "$DLLTOOL" && DLLTOOL=dlltool
-+test -z "$LD" && LD=ld
-+test -z "$LN_S" && LN_S="ln -s"
-+test -z "$MAGIC_CMD" && MAGIC_CMD=file
-+test -z "$NM" && NM=nm
-+test -z "$SED" && SED=sed
-+test -z "$OBJDUMP" && OBJDUMP=objdump
-+test -z "$RANLIB" && RANLIB=:
-+test -z "$STRIP" && STRIP=:
-+test -z "$ac_objext" && ac_objext=o
- 
--# Some flags need to be propagated to the compiler or linker for good
--# libtool support.
--case $host in
--*-*-irix6*)
--  # Find out which ABI we are using.
--  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.$ac_objext` in
--    *32-bit*)
--      LD="${LD-ld} -32"
--      ;;
--    *N32*)
--      LD="${LD-ld} -n32"
--      ;;
--    *64-bit*)
--      LD="${LD-ld} -64"
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
-+# Determine commands to create old-style static archives.
-+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-+old_postinstall_cmds='chmod 644 $oldlib'
-+old_postuninstall_cmds=
- 
--*-*-linux*)
--  # Test if the compiler is 64bit
--  echo 'int i;' > conftest.$ac_ext
--  lt_cv_cc_64bit_output=no
--  if AC_TRY_EVAL(ac_compile); then
--    case `/usr/bin/file conftest.$ac_objext` in
--    *"ELF 64"*)
--      lt_cv_cc_64bit_output=yes
--      ;;
--    esac
--  fi
--  rm -rf conftest*
--  ;;
--  
--*-*-sco3.2v5*)
--  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
--  SAVE_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -belf"
--  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
--    [AC_LANG_SAVE
--     AC_LANG_C
--     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
--     AC_LANG_RESTORE])
--  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
--    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
--    CFLAGS="$SAVE_CFLAGS"
--  fi
--  ;;
-+if test -n "$RANLIB"; then
-+  case $host_os in
-+  openbsd*)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-+    ;;
-+  *)
-+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-+    ;;
-+  esac
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-+fi
- 
--ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL],
--[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
--  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
--  AC_CHECK_TOOL(AS, as, false)
--  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+_LT_CC_BASENAME([$compiler])
- 
--  # recent cygwin and mingw systems supply a stub DllMain which the user
--  # can override, but on older systems we have to supply one
--  AC_CACHE_CHECK([if libtool should supply DllMain function], lt_cv_need_dllmain,
--    [AC_TRY_LINK([],
--      [extern int __attribute__((__stdcall__)) DllMain(void*, int, void*);
--      DllMain (0, 0, 0);],
--      [lt_cv_need_dllmain=no],[lt_cv_need_dllmain=yes])])
+ $(PACKAGE)-$(VERSION).tar.gz: dist
+@@ -771,7 +747,6 @@
+ 	rm -Rf $(PACKAGE)-$(VERSION)/init.d/CVS
+ 	tar -czvf $(PACKAGE)-$(VERSION)_ML1.0.0-beta3.mlz $(PACKAGE)-$(VERSION)
+ 	rm -Rf $(PACKAGE)-$(VERSION)
 -
--  case $host/$CC in
--  *-*-cygwin*/gcc*-mno-cygwin*|*-*-mingw*)
--    # old mingw systems require "-dll" to link a DLL, while more recent ones
--    # require "-mdll"
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$CFLAGS -mdll"
--    AC_CACHE_CHECK([how to link DLLs], lt_cv_cc_dll_switch,
--      [AC_TRY_LINK([], [], [lt_cv_cc_dll_switch=-mdll],[lt_cv_cc_dll_switch=-dll])])
--    CFLAGS="$SAVE_CFLAGS" ;;
--  *-*-cygwin* | *-*-pw32*)
--    # cygwin systems need to pass --dll to the linker, and not link
--    # crt.o which will require a WinMain at 16 definition.
--    lt_cv_cc_dll_switch="-Wl,--dll -nostartfiles" ;;
--  esac
-+# Only perform the check for file, if the check method requires it
-+case $deplibs_check_method in
-+file_magic*)
-+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-+    AC_PATH_MAGIC
-+  fi
-   ;;
--  ])
- esac
- 
--_LT_AC_LTCONFIG_HACK
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-+enable_win32_dll=yes, enable_win32_dll=no)
- 
--])
-+AC_ARG_ENABLE([libtool-lock],
-+    [AC_HELP_STRING([--disable-libtool-lock],
-+	[avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
--# AC_LIBTOOL_HEADER_ASSERT
--# ------------------------
--AC_DEFUN([AC_LIBTOOL_HEADER_ASSERT],
--[AC_CACHE_CHECK([whether $CC supports assert without backlinking],
--    [lt_cv_func_assert_works],
--    [case $host in
--    *-*-solaris*)
--      if test "$GCC" = yes && test "$with_gnu_ld" != yes; then
--        case `$CC --version 2>/dev/null` in
--        [[12]].*) lt_cv_func_assert_works=no ;;
--        *)        lt_cv_func_assert_works=yes ;;
--        esac
--      fi
--      ;;
--    esac])
-+AC_ARG_WITH([pic],
-+    [AC_HELP_STRING([--with-pic],
-+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-+    [pic_mode="$withval"],
-+    [pic_mode=default])
-+test -z "$pic_mode" && pic_mode=default
- 
--if test "x$lt_cv_func_assert_works" = xyes; then
--  AC_CHECK_HEADERS(assert.h)
--fi
--])# AC_LIBTOOL_HEADER_ASSERT
-+# Use C for the default configuration in the libtool script
-+tagname=
-+AC_LIBTOOL_LANG_C_CONFIG
-+_LT_AC_TAGCONFIG
-+])# AC_LIBTOOL_SETUP
- 
--# _LT_AC_CHECK_DLFCN
--# --------------------
--AC_DEFUN([_LT_AC_CHECK_DLFCN],
--[AC_CHECK_HEADERS(dlfcn.h)
--])# _LT_AC_CHECK_DLFCN
- 
--# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--# ---------------------------------
--AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
--[AC_REQUIRE([AC_CANONICAL_HOST])
--AC_REQUIRE([AC_PROG_NM])
--AC_REQUIRE([AC_OBJEXT])
--# Check for command to grab the raw symbol name followed by C symbol from nm.
--AC_MSG_CHECKING([command to parse $NM output])
--AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], [dnl
-+# _LT_AC_SYS_COMPILER
-+# -------------------
-+AC_DEFUN([_LT_AC_SYS_COMPILER],
-+[AC_REQUIRE([AC_PROG_CC])dnl
- 
--# These are sane defaults that work on at least a few old systems.
--# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-+# If no C compiler was specified, use CC.
-+LTCC=${LTCC-"$CC"}
- 
--# Character class describing NM global symbol codes.
--symcode='[[BCDEGRST]]'
-+# If no C compiler flags were specified, use CFLAGS.
-+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
- 
--# Regexp to match symbols that can be accessed directly from C.
--sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-+# Allow CC to be a program name with arguments.
-+compiler=$CC
-+])# _LT_AC_SYS_COMPILER
- 
--# Transform the above into a raw symbol and a C symbol.
--symxfrm='\1 \2\3 \3'
- 
--# Transform an extracted symbol line into a proper C declaration
--lt_cv_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern char \1;/p'"
-+# _LT_CC_BASENAME(CC)
-+# -------------------
-+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
-+AC_DEFUN([_LT_CC_BASENAME],
-+[for cc_temp in $1""; do
-+  case $cc_temp in
-+    compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
-+    distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
-+    \-*) ;;
-+    *) break;;
-+  esac
-+done
-+cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
-+])
- 
--# Transform an extracted symbol line into symbol name and symbol address
--lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
- 
--# Define system-specific variables.
--case $host_os in
--aix*)
--  symcode='[[BCDT]]'
--  ;;
--cygwin* | mingw* | pw32*)
--  symcode='[[ABCDGISTW]]'
--  ;;
--hpux*) # Its linker distinguishes data from code symbols
--  lt_cv_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern char \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
--  lt_cv_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
--  ;;
--irix* | nonstopux*)
--  symcode='[[BCDEGRST]]'
--  ;;
--osf*)
--  symcode='[[BCDEGQRST]]'
--  ;;
--solaris* | sysv5*)
--  symcode='[[BDT]]'
--  ;;
--sysv4)
--  symcode='[[DFNSTU]]'
--  ;;
--esac
--
--# Handle CRLF in mingw tool chain
--opt_cr=
--case $host_os in
--mingw*)
--  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
--  ;;
--esac
--
--# If we're using GNU nm, then use its standard symbol codes.
--if $NM -V 2>&1 | egrep '(GNU|with BFD)' > /dev/null; then
--  symcode='[[ABCDGISTW]]'
--fi
--
--# Try without a prefix undercore, then with it.
--for ac_symprfx in "" "_"; do
--
--  # Write the raw and C identifiers.
--lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
--
--  # Check to see that the pipe works correctly.
--  pipe_works=no
--  rm -f conftest*
--  cat > conftest.$ac_ext <<EOF
--#ifdef __cplusplus
--extern "C" {
--#endif
--char nm_test_var;
--void nm_test_func(){}
--#ifdef __cplusplus
--}
--#endif
--int main(){nm_test_var='a';nm_test_func();return(0);}
--EOF
--
--  if AC_TRY_EVAL(ac_compile); then
--    # Now try to grab the symbols.
--    nlist=conftest.nm
--    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
--      # Try sorting and uniquifying the output.
--      if sort "$nlist" | uniq > "$nlist"T; then
--	mv -f "$nlist"T "$nlist"
--      else
--	rm -f "$nlist"T
--      fi
--
--      # Make sure that we snagged all the symbols we need.
--      if egrep ' nm_test_var$' "$nlist" >/dev/null; then
--	if egrep ' nm_test_func$' "$nlist" >/dev/null; then
--	  cat <<EOF > conftest.$ac_ext
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--EOF
--	  # Now generate the symbol file.
--	  eval "$lt_cv_global_symbol_to_cdecl"' < "$nlist" >> conftest.$ac_ext'
--
--	  cat <<EOF >> conftest.$ac_ext
--#if defined (__STDC__) && __STDC__
--# define lt_ptr void *
--#else
--# define lt_ptr char *
--# define const
--#endif
--
--/* The mapping between symbol names and symbols. */
--const struct {
--  const char *name;
--  lt_ptr address;
--}
--lt_preloaded_symbols[[]] =
--{
--EOF
--	  sed "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr) \&\2},/" < "$nlist" >> conftest.$ac_ext
--	  cat <<\EOF >> conftest.$ac_ext
--  {0, (lt_ptr) 0}
--};
--
--#ifdef __cplusplus
--}
--#endif
--EOF
--	  # Now try linking the two files.
--	  mv conftest.$ac_objext conftstm.$ac_objext
--	  save_LIBS="$LIBS"
--	  save_CFLAGS="$CFLAGS"
--	  LIBS="conftstm.$ac_objext"
--	  CFLAGS="$CFLAGS$no_builtin_flag"
--	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
--	    pipe_works=yes
--	  fi
--	  LIBS="$save_LIBS"
--	  CFLAGS="$save_CFLAGS"
--	else
--	  echo "cannot find nm_test_func in $nlist" >&AC_FD_CC
--	fi
--      else
--	echo "cannot find nm_test_var in $nlist" >&AC_FD_CC
--      fi
--    else
--      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
--    fi
--  else
--    echo "$progname: failed program was:" >&AC_FD_CC
--    cat conftest.$ac_ext >&5
--  fi
--  rm -f conftest* conftst*
--
--  # Do not use the global_symbol_pipe unless it works.
--  if test "$pipe_works" = yes; then
--    break
--  else
--    lt_cv_sys_global_symbol_pipe=
--  fi
--done
--])
--global_symbol_pipe="$lt_cv_sys_global_symbol_pipe"
--if test -z "$lt_cv_sys_global_symbol_pipe"; then
--  global_symbol_to_cdecl=
--  global_symbol_to_c_name_address=
--else
--  global_symbol_to_cdecl="$lt_cv_global_symbol_to_cdecl"
--  global_symbol_to_c_name_address="$lt_cv_global_symbol_to_c_name_address"
--fi
--if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
--then
--  AC_MSG_RESULT(failed)
--else
--  AC_MSG_RESULT(ok)
--fi
--]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
--
--# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
--# ---------------------------------
--AC_DEFUN([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR],
--[# Find the correct PATH separator.  Usually this is `:', but
--# DJGPP uses `;' like DOS.
--if test "X${PATH_SEPARATOR+set}" != Xset; then
--  UNAME=${UNAME-`uname 2>/dev/null`}
--  case X$UNAME in
--    *-DOS) lt_cv_sys_path_separator=';' ;;
--    *)     lt_cv_sys_path_separator=':' ;;
--  esac
--  PATH_SEPARATOR=$lt_cv_sys_path_separator
--fi
--])# _LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
--
--# _LT_AC_PROG_ECHO_BACKSLASH
--# --------------------------
--# Add some code to the start of the generated configure script which
--# will find an echo command which doesn't interpret backslashes.
--AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
--[ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
--			      [AC_DIVERT_PUSH(NOTICE)])
--_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR
--
--# Check that we are running under the correct shell.
--SHELL=${CONFIG_SHELL-/bin/sh}
--
--case X$ECHO in
--X*--fallback-echo)
--  # Remove one level of quotation (which was required for Make).
--  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-+# _LT_COMPILER_BOILERPLATE
-+# ------------------------
-+# Check for compiler boilerplate output or warnings with
-+# the simple compiler test code.
-+AC_DEFUN([_LT_COMPILER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_compile_test_code" >conftest.$ac_ext
-+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_compiler_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_COMPILER_BOILERPLATE
-+
-+
-+# _LT_LINKER_BOILERPLATE
-+# ----------------------
-+# Check for linker boilerplate output or warnings with
-+# the simple link test code.
-+AC_DEFUN([_LT_LINKER_BOILERPLATE],
-+[ac_outfile=conftest.$ac_objext
-+printf "$lt_simple_link_test_code" >conftest.$ac_ext
-+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
-+_lt_linker_boilerplate=`cat conftest.err`
-+$rm conftest*
-+])# _LT_LINKER_BOILERPLATE
-+
-+
-+# _LT_AC_SYS_LIBPATH_AIX
-+# ----------------------
-+# Links a minimal program and checks the executable
-+# for the system default hardcoded library path. In most cases,
-+# this is /usr/lib:/lib, but when the MPI compilers are used
-+# the location of the communication and MPI libs are included too.
-+# If we don't find anything, use the default library path according
-+# to the aix ld manual.
-+AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-+[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`
-+# Check for a 64-bit object if we didn't find anything.
-+if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-+}'`; fi],[])
-+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-+])# _LT_AC_SYS_LIBPATH_AIX
-+
-+
-+# _LT_AC_SHELL_INIT(ARG)
-+# ----------------------
-+AC_DEFUN([_LT_AC_SHELL_INIT],
-+[ifdef([AC_DIVERSION_NOTICE],
-+	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-+	 [AC_DIVERT_PUSH(NOTICE)])
-+$1
-+AC_DIVERT_POP
-+])# _LT_AC_SHELL_INIT
-+
-+
-+# _LT_AC_PROG_ECHO_BACKSLASH
-+# --------------------------
-+# Add some code to the start of the generated configure script which
-+# will find an echo command which doesn't interpret backslashes.
-+AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-+[_LT_AC_SHELL_INIT([
-+# Check that we are running under the correct shell.
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+
-+case X$ECHO in
-+X*--fallback-echo)
-+  # Remove one level of quotation (which was required for Make).
-+  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-   ;;
- esac
- 
-@@ -554,7 +337,7 @@
- elif test "X[$]1" = X--fallback-echo; then
-   # Avoid inline document here, it may be left over
-   :
--elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-   # Yippee, $echo works!
-   :
- else
-@@ -566,22 +349,22 @@
-   # used as fallback echo
-   shift
-   cat <<EOF
--$*
-+[$]*
- EOF
-   exit 0
- fi
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
- # find a string as large as possible, as long as the shell can cope with it
-   for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-     # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
--    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
--       echo_test_string="`eval $cmd`" &&
-+    if (echo_test_string=`eval $cmd`) 2>/dev/null &&
-+       echo_test_string=`eval $cmd` &&
-        (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-     then
-       break
-@@ -600,8 +383,9 @@
-   #
-   # So, first we look for a working echo in the user's PATH.
- 
--  IFS="${IFS= 	}"; save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-   for dir in $PATH /usr/ucb; do
-+    IFS="$lt_save_ifs"
-     if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-        test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-        echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-@@ -610,7 +394,7 @@
-       break
-     fi
-   done
--  IFS="$save_ifs"
-+  IFS="$lt_save_ifs"
- 
-   if test "X$echo" = Xecho; then
-     # We didn't find a better echo, so look for alternatives.
-@@ -683,101 +467,453 @@
- fi
- 
- AC_SUBST(ECHO)
--AC_DIVERT_POP
--])# _LT_AC_PROG_ECHO_BACKSLASH
--
--# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
--#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
--# ------------------------------------------------------------------
--AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
--[if test "$cross_compiling" = yes; then :
--  [$4]
--else
--  AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
--  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
--  lt_status=$lt_dlunknown
--  cat > conftest.$ac_ext <<EOF
--[#line __oline__ "configure"
--#include "confdefs.h"
--
--#if HAVE_DLFCN_H
--#include <dlfcn.h>
--#endif
--
--#include <stdio.h>
--
--#ifdef RTLD_GLOBAL
--#  define LT_DLGLOBAL		RTLD_GLOBAL
--#else
--#  ifdef DL_GLOBAL
--#    define LT_DLGLOBAL		DL_GLOBAL
--#  else
--#    define LT_DLGLOBAL		0
--#  endif
--#endif
--
--/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
--   find out it does not work in some platform. */
--#ifndef LT_DLLAZY_OR_NOW
--#  ifdef RTLD_LAZY
--#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
--#  else
--#    ifdef DL_LAZY
--#      define LT_DLLAZY_OR_NOW		DL_LAZY
--#    else
--#      ifdef RTLD_NOW
--#        define LT_DLLAZY_OR_NOW	RTLD_NOW
--#      else
--#        ifdef DL_NOW
--#          define LT_DLLAZY_OR_NOW	DL_NOW
--#        else
--#          define LT_DLLAZY_OR_NOW	0
--#        endif
--#      endif
--#    endif
--#  endif
--#endif
-+])])# _LT_AC_PROG_ECHO_BACKSLASH
- 
--#ifdef __cplusplus
--extern "C" void exit (int);
--#endif
- 
--void fnord() { int i=42;}
--int main ()
--{
--  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
--  int status = $lt_dlunknown;
-+# _LT_AC_LOCK
-+# -----------
-+AC_DEFUN([_LT_AC_LOCK],
-+[AC_ARG_ENABLE([libtool-lock],
-+    [AC_HELP_STRING([--disable-libtool-lock],
-+	[avoid locking (might break parallel builds)])])
-+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
- 
--  if (self)
--    {
--      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
--      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
--      /* dlclose (self); */
--    }
-+# Some flags need to be propagated to the compiler or linker for good
-+# libtool support.
-+case $host in
-+ia64-*-hpux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *ELF-32*)
-+      HPUX_IA64_MODE="32"
-+      ;;
-+    *ELF-64*)
-+      HPUX_IA64_MODE="64"
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+*-*-irix6*)
-+  # Find out which ABI we are using.
-+  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+   if test "$lt_cv_prog_gnu_ld" = yes; then
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -melf32bsmip"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -melf32bmipn32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -melf64bmip"
-+      ;;
-+    esac
-+   else
-+    case `/usr/bin/file conftest.$ac_objext` in
-+    *32-bit*)
-+      LD="${LD-ld} -32"
-+      ;;
-+    *N32*)
-+      LD="${LD-ld} -n32"
-+      ;;
-+    *64-bit*)
-+      LD="${LD-ld} -64"
-+      ;;
-+    esac
-+   fi
-+  fi
-+  rm -rf conftest*
-+  ;;
- 
--    exit (status);
--}]
--EOF
--  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
--    (./conftest; exit; ) 2>/dev/null
--    lt_status=$?
--    case x$lt_status in
--      x$lt_dlno_uscore) $1 ;;
--      x$lt_dlneed_uscore) $2 ;;
--      x$lt_unknown|x*) $3 ;;
-+x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.o` in
-+    *32-bit*)
-+      case $host in
-+        x86_64-*linux*)
-+          LD="${LD-ld} -m elf_i386"
-+          ;;
-+        ppc64-*linux*|powerpc64-*linux*)
-+          LD="${LD-ld} -m elf32ppclinux"
-+          ;;
-+        s390x-*linux*)
-+          LD="${LD-ld} -m elf_s390"
-+          ;;
-+        sparc64-*linux*)
-+          LD="${LD-ld} -m elf32_sparc"
-+          ;;
-+      esac
-+      ;;
-+    *64-bit*)
-+      case $host in
-+        x86_64-*linux*)
-+          LD="${LD-ld} -m elf_x86_64"
-+          ;;
-+        ppc*-*linux*|powerpc*-*linux*)
-+          LD="${LD-ld} -m elf64ppc"
-+          ;;
-+        s390*-*linux*)
-+          LD="${LD-ld} -m elf64_s390"
-+          ;;
-+        sparc*-*linux*)
-+          LD="${LD-ld} -m elf64_sparc"
-+          ;;
-+      esac
-+      ;;
-     esac
--  else :
--    # compilation failed
--    $3
-   fi
--fi
--rm -fr conftest*
--])# _LT_AC_TRY_DLOPEN_SELF
-+  rm -rf conftest*
-+  ;;
- 
--# AC_LIBTOOL_DLOPEN_SELF
--# -------------------
-+*-*-sco3.2v5*)
-+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-+  SAVE_CFLAGS="$CFLAGS"
-+  CFLAGS="$CFLAGS -belf"
-+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-+    [AC_LANG_PUSH(C)
-+     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-+     AC_LANG_POP])
-+  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-+    CFLAGS="$SAVE_CFLAGS"
-+  fi
-+  ;;
-+sparc*-*solaris*)
-+  # Find out which ABI we are using.
-+  echo 'int i;' > conftest.$ac_ext
-+  if AC_TRY_EVAL(ac_compile); then
-+    case `/usr/bin/file conftest.o` in
-+    *64-bit*)
-+      case $lt_cv_prog_gnu_ld in
-+      yes*) LD="${LD-ld} -m elf64_sparc" ;;
-+      *)    LD="${LD-ld} -64" ;;
-+      esac
-+      ;;
-+    esac
-+  fi
-+  rm -rf conftest*
-+  ;;
-+
-+AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-+[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-+  AC_CHECK_TOOL(AS, as, false)
-+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-+  ;;
-+  ])
-+esac
-+
-+need_locks="$enable_libtool_lock"
-+
-+])# _LT_AC_LOCK
-+
-+
-+# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ----------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-+[AC_REQUIRE([LT_AC_PROG_SED])
-+AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+   lt_compiler_flag="$3"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   # The option is referenced via a variable to avoid confusing sed.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>conftest.err)
-+   ac_status=$?
-+   cat conftest.err >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s "$ac_outfile"; then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings other than the usual output.
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
-+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
-+       $2=yes
-+     fi
-+   fi
-+   $rm conftest*
-+])
-+
-+if test x"[$]$2" = xyes; then
-+    ifelse([$5], , :, [$5])
-+else
-+    ifelse([$6], , :, [$6])
-+fi
-+])# AC_LIBTOOL_COMPILER_OPTION
-+
-+
-+# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-+#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-+# ------------------------------------------------------------
-+# Check whether the given compiler option works
-+AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-+[AC_CACHE_CHECK([$1], [$2],
-+  [$2=no
-+   save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS="$LDFLAGS $3"
-+   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-+     # The linker can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     if test -s conftest.err; then
-+       # Append any errors to the config.log.
-+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-+       $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
-+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
-+       if diff conftest.exp conftest.er2 >/dev/null; then
-+         $2=yes
-+       fi
-+     else
-+       $2=yes
-+     fi
-+   fi
-+   $rm conftest*
-+   LDFLAGS="$save_LDFLAGS"
-+])
-+
-+if test x"[$]$2" = xyes; then
-+    ifelse([$4], , :, [$4])
-+else
-+    ifelse([$5], , :, [$5])
-+fi
-+])# AC_LIBTOOL_LINKER_OPTION
-+
-+
-+# AC_LIBTOOL_SYS_MAX_CMD_LEN
-+# --------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-+[# find the maximum length of command line arguments
-+AC_MSG_CHECKING([the maximum length of command line arguments])
-+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-+  i=0
-+  teststring="ABCD"
-+
-+  case $build_os in
-+  msdosdjgpp*)
-+    # On DJGPP, this test can blow up pretty badly due to problems in libc
-+    # (any single argument exceeding 2000 bytes causes a buffer overrun
-+    # during glob expansion).  Even if it were fixed, the result of this
-+    # check would be larger than it should be.
-+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-+    ;;
-+
-+  gnu*)
-+    # Under GNU Hurd, this test is not required because there is
-+    # no limit to the length of command line arguments.
-+    # Libtool will interpret -1 as no limit whatsoever
-+    lt_cv_sys_max_cmd_len=-1;
-+    ;;
-+
-+  cygwin* | mingw*)
-+    # On Win9x/ME, this test blows up -- it succeeds, but takes
-+    # about 5 minutes as the teststring grows exponentially.
-+    # Worse, since 9x/ME are not pre-emptively multitasking,
-+    # you end up with a "frozen" computer, even though with patience
-+    # the test eventually succeeds (with a max line length of 256k).
-+    # Instead, let's just punt: use the minimum linelength reported by
-+    # all of the supported platforms: 8192 (on NT/2K/XP).
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  amigaos*)
-+    # On AmigaOS with pdksh, this test takes hours, literally.
-+    # So we just punt and use a minimum line length of 8192.
-+    lt_cv_sys_max_cmd_len=8192;
-+    ;;
-+
-+  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
-+    # This has been around since 386BSD, at least.  Likely further.
-+    if test -x /sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
-+    elif test -x /usr/sbin/sysctl; then
-+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
-+    else
-+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
-+    ;;
-+
-+  interix*)
-+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
-+    lt_cv_sys_max_cmd_len=196608
-+    ;;
-+
-+  osf*)
-+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
-+    # nice to cause kernel panics so lets avoid the loop below.
-+    # First set a reasonable default.
-+    lt_cv_sys_max_cmd_len=16384
-+    #
-+    if test -x /sbin/sysconfig; then
-+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
-+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
-+      esac
-+    fi
-+    ;;
-+  sco3.2v5*)
-+    lt_cv_sys_max_cmd_len=102400
-+    ;;
-+  sysv5* | sco5v6* | sysv4.2uw2*)
-+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
-+    if test -n "$kargmax"; then
-+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`
-+    else
-+      lt_cv_sys_max_cmd_len=32768
-+    fi
-+    ;;
-+  *)
-+    # If test is not a shell built-in, we'll probably end up computing a
-+    # maximum length that is only half of the actual maximum length, but
-+    # we can't tell.
-+    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
-+    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-+	       = "XX$teststring") >/dev/null 2>&1 &&
-+	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-+	    lt_cv_sys_max_cmd_len=$new_result &&
-+	    test $i != 17 # 1/2 MB should be enough
-+    do
-+      i=`expr $i + 1`
-+      teststring=$teststring$teststring
-+    done
-+    teststring=
-+    # Add a significant safety factor because C++ compilers can tack on massive
-+    # amounts of additional arguments before passing them to the linker.
-+    # It appears as though 1/2 is a usable value.
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-+    ;;
-+  esac
-+])
-+if test -n $lt_cv_sys_max_cmd_len ; then
-+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-+else
-+  AC_MSG_RESULT(none)
-+fi
-+])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-+
-+
-+# _LT_AC_CHECK_DLFCN
-+# ------------------
-+AC_DEFUN([_LT_AC_CHECK_DLFCN],
-+[AC_CHECK_HEADERS(dlfcn.h)dnl
-+])# _LT_AC_CHECK_DLFCN
-+
-+
-+# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-+#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-+# ---------------------------------------------------------------------
-+AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+if test "$cross_compiling" = yes; then :
-+  [$4]
-+else
-+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-+  lt_status=$lt_dlunknown
-+  cat > conftest.$ac_ext <<EOF
-+[#line __oline__ "configure"
-+#include "confdefs.h"
-+
-+#if HAVE_DLFCN_H
-+#include <dlfcn.h>
-+#endif
-+
-+#include <stdio.h>
-+
-+#ifdef RTLD_GLOBAL
-+#  define LT_DLGLOBAL		RTLD_GLOBAL
-+#else
-+#  ifdef DL_GLOBAL
-+#    define LT_DLGLOBAL		DL_GLOBAL
-+#  else
-+#    define LT_DLGLOBAL		0
-+#  endif
-+#endif
-+
-+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-+   find out it does not work in some platform. */
-+#ifndef LT_DLLAZY_OR_NOW
-+#  ifdef RTLD_LAZY
-+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-+#  else
-+#    ifdef DL_LAZY
-+#      define LT_DLLAZY_OR_NOW		DL_LAZY
-+#    else
-+#      ifdef RTLD_NOW
-+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-+#      else
-+#        ifdef DL_NOW
-+#          define LT_DLLAZY_OR_NOW	DL_NOW
-+#        else
-+#          define LT_DLLAZY_OR_NOW	0
-+#        endif
-+#      endif
-+#    endif
-+#  endif
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" void exit (int);
-+#endif
-+
-+void fnord() { int i=42;}
-+int main ()
-+{
-+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-+  int status = $lt_dlunknown;
-+
-+  if (self)
-+    {
-+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-+      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-+      /* dlclose (self); */
-+    }
-+  else
-+    puts (dlerror ());
-+
-+    exit (status);
-+}]
-+EOF
-+  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
-+    lt_status=$?
-+    case x$lt_status in
-+      x$lt_dlno_uscore) $1 ;;
-+      x$lt_dlneed_uscore) $2 ;;
-+      x$lt_dlunknown|x*) $3 ;;
-+    esac
-+  else :
-+    # compilation failed
-+    $3
-+  fi
-+fi
-+rm -fr conftest*
-+])# _LT_AC_TRY_DLOPEN_SELF
-+
-+
-+# AC_LIBTOOL_DLOPEN_SELF
-+# ----------------------
- AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
--[if test "x$enable_dlopen" != xyes; then
-+[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-+if test "x$enable_dlopen" != xyes; then
-   enable_dlopen=unknown
-   enable_dlopen_self=unknown
-   enable_dlopen_self_static=unknown
-@@ -792,24 +928,39 @@
-     lt_cv_dlopen_self=yes
-     ;;
- 
--  cygwin* | mingw* | pw32*)
-+  mingw* | pw32*)
-     lt_cv_dlopen="LoadLibrary"
-     lt_cv_dlopen_libs=
-    ;;
- 
-+  cygwin*)
-+    lt_cv_dlopen="dlopen"
-+    lt_cv_dlopen_libs=
-+   ;;
-+
-+  darwin*)
-+  # if libdl is installed we need to link against it
-+    AC_CHECK_LIB([dl], [dlopen],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-+    lt_cv_dlopen="dyld"
-+    lt_cv_dlopen_libs=
-+    lt_cv_dlopen_self=yes
-+    ])
-+   ;;
-+
-   *)
-     AC_CHECK_FUNC([shl_load],
--          [lt_cv_dlopen="shl_load"],
-+	  [lt_cv_dlopen="shl_load"],
-       [AC_CHECK_LIB([dld], [shl_load],
--            [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-+	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
- 	[AC_CHECK_FUNC([dlopen],
- 	      [lt_cv_dlopen="dlopen"],
- 	  [AC_CHECK_LIB([dl], [dlopen],
--	        [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-+		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
- 	    [AC_CHECK_LIB([svld], [dlopen],
--	          [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-+		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
- 	      [AC_CHECK_LIB([dld], [dld_link],
--	            [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-+		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
- 	      ])
- 	    ])
- 	  ])
-@@ -827,11 +978,10 @@
-   case $lt_cv_dlopen in
-   dlopen)
-     save_CPPFLAGS="$CPPFLAGS"
--    AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-     test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- 
-     save_LDFLAGS="$LDFLAGS"
--    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- 
-     save_LIBS="$LIBS"
-     LIBS="$lt_cv_dlopen_libs $LIBS"
-@@ -844,7 +994,7 @@
-     ])
- 
-     if test "x$lt_cv_dlopen_self" = xyes; then
--      LDFLAGS="$LDFLAGS $link_static_flag"
-+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
-       AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-     	  lt_cv_dlopen_self_static, [dnl
- 	  _LT_AC_TRY_DLOPEN_SELF(
-@@ -871,1599 +1021,2917 @@
- fi
- ])# AC_LIBTOOL_DLOPEN_SELF
- 
--AC_DEFUN([_LT_AC_LTCONFIG_HACK],
--[AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])dnl
--# Sed substitution that helps us do robust quoting.  It backslashifies
--# metacharacters that are still active within double-quoted strings.
--Xsed='sed -e s/^X//'
--sed_quote_subst='s/\([[\\"\\`$\\\\]]\)/\\\1/g'
--
--# Same as above, but do not quote variable references.
--double_quote_subst='s/\([[\\"\\`\\\\]]\)/\\\1/g'
--
--# Sed substitution to delay expansion of an escaped shell variable in a
--# double_quote_subst'ed string.
--delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
- 
--# Constants:
--rm="rm -f"
-+# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-+# ---------------------------------
-+# Check to see if options -c and -o are simultaneously supported by compiler
-+AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-+  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-+   $rm -r conftest 2>/dev/null
-+   mkdir conftest
-+   cd conftest
-+   mkdir out
-+   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+   lt_compiler_flag="-o out/conftest2.$ac_objext"
-+   # Insert the option either (1) after the last *FLAGS variable, or
-+   # (2) before a word containing "conftest.", or (3) at the end.
-+   # Note that $ac_compile itself does not contain backslashes and begins
-+   # with a dollar sign (not a hyphen), so the echo should work correctly.
-+   lt_compile=`echo "$ac_compile" | $SED \
-+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-+   -e 's:$: $lt_compiler_flag:'`
-+   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-+   (eval "$lt_compile" 2>out/conftest.err)
-+   ac_status=$?
-+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-+   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-+   then
-+     # The compiler can only warn and ignore the option if not recognized
-+     # So say no if there are warnings
-+     $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
-+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
-+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
-+       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+     fi
-+   fi
-+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
-+   $rm conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+   $rm out/* && rmdir out
-+   cd ..
-+   rmdir conftest
-+   $rm conftest*
-+])
-+])# AC_LIBTOOL_PROG_CC_C_O
- 
--# Global variables:
--default_ofile=libtool
--can_build_shared=yes
- 
--# All known linkers require a `.a' archive for static linking (except M$VC,
--# which needs '.lib').
--libext=a
--ltmain="$ac_aux_dir/ltmain.sh"
--ofile="$default_ofile"
--with_gnu_ld="$lt_cv_prog_gnu_ld"
--need_locks="$enable_libtool_lock"
-+# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-+# -----------------------------------------
-+# Check to see if we can do hard links to lock some files if needed
-+AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-+[AC_REQUIRE([_LT_AC_LOCK])dnl
- 
--old_CC="$CC"
--old_CFLAGS="$CFLAGS"
-+hard_links="nottested"
-+if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-+  # do not overwrite the value of need_locks provided by the user
-+  AC_MSG_CHECKING([if we can lock with hard links])
-+  hard_links=yes
-+  $rm conftest*
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  touch conftest.a
-+  ln conftest.a conftest.b 2>&5 || hard_links=no
-+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-+  AC_MSG_RESULT([$hard_links])
-+  if test "$hard_links" = no; then
-+    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-+    need_locks=warn
-+  fi
-+else
-+  need_locks=no
-+fi
-+])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
- 
--# Set sane defaults for various variables
--test -z "$AR" && AR=ar
--test -z "$AR_FLAGS" && AR_FLAGS=cru
--test -z "$AS" && AS=as
--test -z "$CC" && CC=cc
--test -z "$DLLTOOL" && DLLTOOL=dlltool
--test -z "$LD" && LD=ld
--test -z "$LN_S" && LN_S="ln -s"
--test -z "$MAGIC_CMD" && MAGIC_CMD=file
--test -z "$NM" && NM=nm
--test -z "$OBJDUMP" && OBJDUMP=objdump
--test -z "$RANLIB" && RANLIB=:
--test -z "$STRIP" && STRIP=:
--test -z "$ac_objext" && ac_objext=o
- 
--if test x"$host" != x"$build"; then
--  ac_tool_prefix=${host_alias}-
-+# AC_LIBTOOL_OBJDIR
-+# -----------------
-+AC_DEFUN([AC_LIBTOOL_OBJDIR],
-+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-+[rm -f .libs 2>/dev/null
-+mkdir .libs 2>/dev/null
-+if test -d .libs; then
-+  lt_cv_objdir=.libs
- else
--  ac_tool_prefix=
-+  # MS-DOS does not allow filenames that begin with a dot.
-+  lt_cv_objdir=_libs
- fi
-+rmdir .libs 2>/dev/null])
-+objdir=$lt_cv_objdir
-+])# AC_LIBTOOL_OBJDIR
- 
--# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
--case $host_os in
--linux-gnu*) ;;
--linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
--esac
--
--case $host_os in
--aix3*)
--  # AIX sometimes has problems with the GCC collect2 program.  For some
--  # reason, if we set the COLLECT_NAMES environment variable, the problems
--  # vanish in a puff of smoke.
--  if test "X${COLLECT_NAMES+set}" != Xset; then
--    COLLECT_NAMES=
--    export COLLECT_NAMES
--  fi
--  ;;
--esac
- 
--# Determine commands to create old-style static archives.
--old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
--old_postinstall_cmds='chmod 644 $oldlib'
--old_postuninstall_cmds=
-+# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-+# ----------------------------------------------
-+# Check hardcoding attributes.
-+AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-+[AC_MSG_CHECKING([how to hardcode library paths into programs])
-+_LT_AC_TAGVAR(hardcode_action, $1)=
-+if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-+   test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
-+   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
- 
--if test -n "$RANLIB"; then
-+  # We can hardcode non-existant directories.
-+  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != 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, $1)" != no &&
-+     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-+fi
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-+
-+if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-+  # Fast installation is not supported
-+  enable_fast_install=no
-+elif test "$shlibpath_overrides_runpath" = yes ||
-+     test "$enable_shared" = no; then
-+  # Fast installation is not necessary
-+  enable_fast_install=needless
-+fi
-+])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-+
-+
-+# AC_LIBTOOL_SYS_LIB_STRIP
-+# ------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-+[striplib=
-+old_striplib=
-+AC_MSG_CHECKING([whether stripping libraries is possible])
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  AC_MSG_RESULT([yes])
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-   case $host_os in
--  openbsd*)
--    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
--    ;;
--  *)
--    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-+   darwin*)
-+       if test -n "$STRIP" ; then
-+         striplib="$STRIP -x"
-+         AC_MSG_RESULT([yes])
-+       else
-+  AC_MSG_RESULT([no])
-+fi
-+       ;;
-+   *)
-+  AC_MSG_RESULT([no])
-     ;;
-   esac
--  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
-+])# AC_LIBTOOL_SYS_LIB_STRIP
- 
--# Allow CC to be a program name with arguments.
--set dummy $CC
--compiler="[$]2"
- 
--AC_MSG_CHECKING([for objdir])
--rm -f .libs 2>/dev/null
--mkdir .libs 2>/dev/null
--if test -d .libs; then
--  objdir=.libs
-+# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-+# -----------------------------
-+# PORTME Fill in your ld.so characteristics
-+AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-+[AC_MSG_CHECKING([dynamic linker characteristics])
-+library_names_spec=
-+libname_spec='lib$name'
-+soname_spec=
-+shrext_cmds=".so"
-+postinstall_cmds=
-+postuninstall_cmds=
-+finish_cmds=
-+finish_eval=
-+shlibpath_var=
-+shlibpath_overrides_runpath=unknown
-+version_type=none
-+dynamic_linker="$host_os ld.so"
-+sys_lib_dlsearch_path_spec="/lib /usr/lib"
-+if test "$GCC" = yes; then
-+  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-+    # if the path contains ";" then we assume it to be the separator
-+    # otherwise default to the standard path separator (i.e. ":") - it is
-+    # assumed that no part of a normal pathname contains ";" but that should
-+    # okay in the real world where ";" in dirpaths is itself problematic.
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+  else
-+    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-+  fi
- else
--  # MS-DOS does not allow filenames that begin with a dot.
--  objdir=_libs
-+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- fi
--rmdir .libs 2>/dev/null
--AC_MSG_RESULT($objdir)
--
-+need_lib_prefix=unknown
-+hardcode_into_libs=no
- 
--AC_ARG_WITH(pic,
--[  --with-pic              try to use only PIC/non-PIC objects [default=use both]],
--pic_mode="$withval", pic_mode=default)
--test -z "$pic_mode" && pic_mode=default
-+# when you set need_version to no, make sure it does not cause -set_version
-+# flags to be left without arguments
-+need_version=unknown
- 
--# We assume here that the value for lt_cv_prog_cc_pic will not be cached
--# in isolation, and that seeing it set (from the cache) indicates that
--# the associated values are set (in the cache) correctly too.
--AC_MSG_CHECKING([for $compiler option to produce PIC])
--AC_CACHE_VAL(lt_cv_prog_cc_pic,
--[ lt_cv_prog_cc_pic=
--  lt_cv_prog_cc_shlib=
--  lt_cv_prog_cc_wl=
--  lt_cv_prog_cc_static=
--  lt_cv_prog_cc_no_builtin=
--  lt_cv_prog_cc_can_build_shared=$can_build_shared
-+case $host_os in
-+aix3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-+  shlibpath_var=LIBPATH
- 
--  if test "$GCC" = yes; then
--    lt_cv_prog_cc_wl='-Wl,'
--    lt_cv_prog_cc_static='-static'
-+  # AIX 3 has no versioning support, so we append a major version to the name.
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  ;;
- 
--    case $host_os in
--    aix*)
--      # Below there is a dirty hack to force normal static linking with -ldl
--      # The problem is because libdl dynamically linked with both libc and
--      # libC (AIX C++ library), which obviously doesn't included in libraries
--      # list by gcc. This cause undefined symbols with -static flags.
--      # This hack allows C programs to be linked with "-static -ldl", but
--      # not sure about C++ programs.
--      lt_cv_prog_cc_static="$lt_cv_prog_cc_static ${lt_cv_prog_cc_wl}-lC"
--      ;;
--    amigaos*)
--      # FIXME: we need at least 68020 code to build shared libraries, but
--      # adding the `-m68020' flag to GCC prevents building anything better,
--      # like `-m68040'.
--      lt_cv_prog_cc_pic='-m68020 -resident32 -malways-restore-a4'
--      ;;
--    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
--      # PIC is the default for these OSes.
--      ;;
--    darwin* | rhapsody*)
--      # PIC is the default on this platform
--      # Common symbols not allowed in MH_DYLIB files
--      lt_cv_prog_cc_pic='-fno-common'
--      ;;
--    cygwin* | mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_cv_prog_cc_pic='-DDLL_EXPORT'
--      ;;
--    sysv4*MP*)
--      if test -d /usr/nec; then
--	 lt_cv_prog_cc_pic=-Kconform_pic
--      fi
--      ;;
--    *)
--      lt_cv_prog_cc_pic='-fPIC'
--      ;;
--    esac
-+aix4* | aix5*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  hardcode_into_libs=yes
-+  if test "$host_cpu" = ia64; then
-+    # AIX 5 supports IA64
-+    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-+    shlibpath_var=LD_LIBRARY_PATH
-   else
--    # PORTME Check for PIC flags for the system compiler.
-+    # With GCC up to 2.95.x, collect2 would create an import file
-+    # for dependence libraries.  The import file would start with
-+    # the line `#! .'.  This would cause the generated library to
-+    # depend on `.', always an invalid library.  This was fixed in
-+    # development snapshots of GCC prior to 3.0.
-     case $host_os in
--    aix3* | aix4* | aix5*)
--      lt_cv_prog_cc_wl='-Wl,'
--      # All AIX code is PIC.
--      if test "$host_cpu" = ia64; then
--	# AIX 5 now supports IA64 processor
--	lt_cv_prog_cc_static='-Bstatic'
-+      aix4 | aix4.[[01]] | aix4.[[01]].*)
-+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-+	   echo ' yes '
-+	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-+	:
-       else
--	lt_cv_prog_cc_static='-bnso -bI:/lib/syscalls.exp'
-+	can_build_shared=no
-       fi
-       ;;
-+    esac
-+    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-+    # soname into executable. Probably we can add versioning support to
-+    # collect2, so additional links can be useful in future.
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-+      # instead of lib<name>.a to let people know that these are not
-+      # typical AIX shared libraries.
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    else
-+      # We preserve .a as extension for shared libraries through AIX4.2
-+      # and later when we are not doing run time linking.
-+      library_names_spec='${libname}${release}.a $libname.a'
-+      soname_spec='${libname}${release}${shared_ext}$major'
-+    fi
-+    shlibpath_var=LIBPATH
-+  fi
-+  ;;
- 
--    hpux9* | hpux10* | hpux11*)
--      # Is there a better lt_cv_prog_cc_static that works with the bundled CC?
--      lt_cv_prog_cc_wl='-Wl,'
--      lt_cv_prog_cc_static="${lt_cv_prog_cc_wl}-a ${lt_cv_prog_cc_wl}archive"
--      lt_cv_prog_cc_pic='+Z'
--      ;;
--
--    irix5* | irix6* | nonstopux*)
--      lt_cv_prog_cc_wl='-Wl,'
--      lt_cv_prog_cc_static='-non_shared'
--      # PIC (with -KPIC) is the default.
--      ;;
--
--    cygwin* | mingw* | pw32* | os2*)
--      # This hack is so that the source file can tell whether it is being
--      # built for inclusion in a dll (and should export symbols for example).
--      lt_cv_prog_cc_pic='-DDLL_EXPORT'
--      ;;
--
--    newsos6)
--      lt_cv_prog_cc_pic='-KPIC'
--      lt_cv_prog_cc_static='-Bstatic'
--      ;;
--
--    osf3* | osf4* | osf5*)
--      # All OSF/1 code is PIC.
--      lt_cv_prog_cc_wl='-Wl,'
--      lt_cv_prog_cc_static='-non_shared'
--      ;;
-+amigaos*)
-+  library_names_spec='$libname.ixlibrary $libname.a'
-+  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-+  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-+  ;;
- 
--    sco3.2v5*)
--      lt_cv_prog_cc_pic='-Kpic'
--      lt_cv_prog_cc_static='-dn'
--      lt_cv_prog_cc_shlib='-belf'
--      ;;
-+beos*)
-+  library_names_spec='${libname}${shared_ext}'
-+  dynamic_linker="$host_os ld.so"
-+  shlibpath_var=LIBRARY_PATH
-+  ;;
- 
--    solaris*)
--      lt_cv_prog_cc_pic='-KPIC'
--      lt_cv_prog_cc_static='-Bstatic'
--      lt_cv_prog_cc_wl='-Wl,'
--      ;;
-+bsdi[[45]]*)
-+  version_type=linux
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-+  # the default ld.so.conf also contains /usr/contrib/lib and
-+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-+  # libtool to hard-code these into programs
-+  ;;
- 
--    sunos4*)
--      lt_cv_prog_cc_pic='-PIC'
--      lt_cv_prog_cc_static='-Bstatic'
--      lt_cv_prog_cc_wl='-Qoption ld '
--      ;;
-+cygwin* | mingw* | pw32*)
-+  version_type=windows
-+  shrext_cmds=".dll"
-+  need_version=no
-+  need_lib_prefix=no
- 
--    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--      lt_cv_prog_cc_pic='-KPIC'
--      lt_cv_prog_cc_static='-Bstatic'
--      lt_cv_prog_cc_wl='-Wl,'
--      ;;
-+  case $GCC,$host_os in
-+  yes,cygwin* | yes,mingw* | yes,pw32*)
-+    library_names_spec='$libname.dll.a'
-+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-+    postinstall_cmds='base_file=`basename \${file}`~
-+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-+      dldir=$destdir/`dirname \$dlpath`~
-+      test -d \$dldir || mkdir -p \$dldir~
-+      $install_prog $dir/$dlname \$dldir/$dlname~
-+      chmod a+x \$dldir/$dlname'
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-+       $rm \$dlpath'
-+    shlibpath_overrides_runpath=yes
- 
--    uts4*)
--      lt_cv_prog_cc_pic='-pic'
--      lt_cv_prog_cc_static='-Bstatic'
-+    case $host_os in
-+    cygwin*)
-+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-+      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
--
--    sysv4*MP*)
--      if test -d /usr/nec ;then
--	lt_cv_prog_cc_pic='-Kconform_pic'
--	lt_cv_prog_cc_static='-Bstatic'
-+    mingw*)
-+      # MinGW DLLs use traditional 'lib' prefix
-+      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-+      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-+      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-+        # It is most probably a Windows format PATH printed by
-+        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-+        # path with ; separators, and with drive letters. We can handle the
-+        # drive letters (cygwin fileutils understands them), so leave them,
-+        # especially as we might pass files found there to a mingw objdump,
-+        # which wouldn't understand a cygwinified path. Ahh.
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-+      else
-+        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-       fi
-       ;;
--
--    *)
--      lt_cv_prog_cc_can_build_shared=no
-+    pw32*)
-+      # pw32 DLLs use 'pw' prefix rather than 'lib'
-+      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-       ;;
-     esac
--  fi
--])
--if test -z "$lt_cv_prog_cc_pic"; then
--  AC_MSG_RESULT([none])
--else
--  AC_MSG_RESULT([$lt_cv_prog_cc_pic])
--
--  # Check to make sure the pic_flag actually works.
--  AC_MSG_CHECKING([if $compiler PIC flag $lt_cv_prog_cc_pic works])
--  AC_CACHE_VAL(lt_cv_prog_cc_pic_works, [dnl
--    save_CFLAGS="$CFLAGS"
--    CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
--    AC_TRY_COMPILE([], [], [dnl
--      case $host_os in
--      hpux9* | hpux10* | hpux11*)
--	# On HP-UX, both CC and GCC only warn that PIC is supported... then
--	# they create non-PIC objects.  So, if there were any warnings, we
--	# assume that PIC is not supported.
--	if test -s conftest.err; then
--	  lt_cv_prog_cc_pic_works=no
--	else
--	  lt_cv_prog_cc_pic_works=yes
--	fi
--	;;
--      *)
--	lt_cv_prog_cc_pic_works=yes
--	;;
--      esac
--    ], [dnl
--      lt_cv_prog_cc_pic_works=no
--    ])
--    CFLAGS="$save_CFLAGS"
--  ])
--
--  if test "X$lt_cv_prog_cc_pic_works" = Xno; then
--    lt_cv_prog_cc_pic=
--    lt_cv_prog_cc_can_build_shared=no
--  else
--    lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
--  fi
--
--  AC_MSG_RESULT([$lt_cv_prog_cc_pic_works])
--fi
--
--# Check for any special shared library compilation flags.
--if test -n "$lt_cv_prog_cc_shlib"; then
--  AC_MSG_WARN([\`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries])
--  if echo "$old_CC $old_CFLAGS " | egrep -e "[[ 	]]$lt_cv_prog_cc_shlib[[ 	]]" >/dev/null; then :
--  else
--   AC_MSG_WARN([add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure])
--    lt_cv_prog_cc_can_build_shared=no
--  fi
--fi
--
--AC_MSG_CHECKING([if $compiler static flag $lt_cv_prog_cc_static works])
--AC_CACHE_VAL([lt_cv_prog_cc_static_works], [dnl
--  lt_cv_prog_cc_static_works=no
--  save_LDFLAGS="$LDFLAGS"
--  LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
--  AC_TRY_LINK([], [], [lt_cv_prog_cc_static_works=yes])
--  LDFLAGS="$save_LDFLAGS"
--])
--
--# Belt *and* braces to stop my trousers falling down:
--test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
--AC_MSG_RESULT([$lt_cv_prog_cc_static_works])
--
--pic_flag="$lt_cv_prog_cc_pic"
--special_shlib_compile_flags="$lt_cv_prog_cc_shlib"
--wl="$lt_cv_prog_cc_wl"
--link_static_flag="$lt_cv_prog_cc_static"
--no_builtin_flag="$lt_cv_prog_cc_no_builtin"
--can_build_shared="$lt_cv_prog_cc_can_build_shared"
--
--
--# Check to see if options -o and -c are simultaneously supported by compiler
--AC_MSG_CHECKING([if $compiler supports -c -o file.$ac_objext])
--AC_CACHE_VAL([lt_cv_compiler_c_o], [
--$rm -r conftest 2>/dev/null
--mkdir conftest
--cd conftest
--echo "int some_variable = 0;" > conftest.$ac_ext
--mkdir out
--# According to Tom Tromey, Ian Lance Taylor reported there are C compilers
--# that will create temporary files in the current directory regardless of
--# the output directory.  Thus, making CWD read-only will cause this test
--# to fail, enabling locking or at least warning the user not to do parallel
--# builds.
--chmod -w .
--save_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
--compiler_c_o=no
--if { (eval echo configure:__oline__: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
--  # The compiler can only warn and ignore the option if not recognized
--  # So say no if there are warnings
--  if test -s out/conftest.err; then
--    lt_cv_compiler_c_o=no
--  else
--    lt_cv_compiler_c_o=yes
--  fi
--else
--  # Append any errors to the config.log.
--  cat out/conftest.err 1>&AC_FD_CC
--  lt_cv_compiler_c_o=no
--fi
--CFLAGS="$save_CFLAGS"
--chmod u+w .
--$rm conftest* out/*
--rmdir out
--cd ..
--rmdir conftest
--$rm -r conftest 2>/dev/null
--])
--compiler_c_o=$lt_cv_compiler_c_o
--AC_MSG_RESULT([$compiler_c_o])
--
--if test x"$compiler_c_o" = x"yes"; then
--  # Check to see if we can write to a .lo
--  AC_MSG_CHECKING([if $compiler supports -c -o file.lo])
--  AC_CACHE_VAL([lt_cv_compiler_o_lo], [
--  lt_cv_compiler_o_lo=no
--  save_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -c -o conftest.lo"
--  save_objext="$ac_objext"
--  ac_objext=lo
--  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
--    # The compiler can only warn and ignore the option if not recognized
--    # So say no if there are warnings
--    if test -s conftest.err; then
--      lt_cv_compiler_o_lo=no
--    else
--      lt_cv_compiler_o_lo=yes
--    fi
--  ])
--  ac_objext="$save_objext"
--  CFLAGS="$save_CFLAGS"
--  ])
--  compiler_o_lo=$lt_cv_compiler_o_lo
--  AC_MSG_RESULT([$compiler_o_lo])
--else
--  compiler_o_lo=no
--fi
--
--# Check to see if we can do hard links to lock some files if needed
--hard_links="nottested"
--if test "$compiler_c_o" = no && test "$need_locks" != no; then
--  # do not overwrite the value of need_locks provided by the user
--  AC_MSG_CHECKING([if we can lock with hard links])
--  hard_links=yes
--  $rm conftest*
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  touch conftest.a
--  ln conftest.a conftest.b 2>&5 || hard_links=no
--  ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  AC_MSG_RESULT([$hard_links])
--  if test "$hard_links" = no; then
--    AC_MSG_WARN([\`$CC' does not support \`-c -o', so \`make -j' may be unsafe])
--    need_locks=warn
--  fi
--else
--  need_locks=no
--fi
-+    ;;
- 
--if test "$GCC" = yes; then
--  # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
--  AC_MSG_CHECKING([if $compiler supports -fno-rtti -fno-exceptions])
--  echo "int some_variable = 0;" > conftest.$ac_ext
--  save_CFLAGS="$CFLAGS"
--  CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
--  compiler_rtti_exceptions=no
--  AC_TRY_COMPILE([], [int some_variable = 0;], [dnl
--    # The compiler can only warn and ignore the option if not recognized
--    # So say no if there are warnings
--    if test -s conftest.err; then
--      compiler_rtti_exceptions=no
--    else
--      compiler_rtti_exceptions=yes
--    fi
--  ])
--  CFLAGS="$save_CFLAGS"
--  AC_MSG_RESULT([$compiler_rtti_exceptions])
-+  *)
-+    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-+    ;;
-+  esac
-+  dynamic_linker='Win32 ld.exe'
-+  # FIXME: first we should search . and the directory the executable is in
-+  shlibpath_var=PATH
-+  ;;
- 
--  if test "$compiler_rtti_exceptions" = "yes"; then
--    no_builtin_flag=' -fno-builtin -fno-rtti -fno-exceptions'
-+darwin* | rhapsody*)
-+  dynamic_linker="$host_os dyld"
-+  version_type=darwin
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-+  soname_spec='${libname}${release}${major}$shared_ext'
-+  shlibpath_overrides_runpath=yes
-+  shlibpath_var=DYLD_LIBRARY_PATH
-+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
-+  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-+  if test "$GCC" = yes; then
-+    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-   else
--    no_builtin_flag=' -fno-builtin'
-+    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-   fi
--fi
--
--# See if the linker supports building shared libraries.
--AC_MSG_CHECKING([whether the linker ($LD) supports shared libraries])
-+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-+  ;;
- 
--allow_undefined_flag=
--no_undefined_flag=
--need_lib_prefix=unknown
--need_version=unknown
--# when you set need_version to no, make sure it does not cause -set_version
--# flags to be left without arguments
--archive_cmds=
--archive_expsym_cmds=
--old_archive_from_new_cmds=
--old_archive_from_expsyms_cmds=
--export_dynamic_flag_spec=
--whole_archive_flag_spec=
--thread_safe_flag_spec=
--hardcode_into_libs=no
--hardcode_libdir_flag_spec=
--hardcode_libdir_separator=
--hardcode_direct=no
--hardcode_minus_L=no
--hardcode_shlibpath_var=unsupported
--runpath_var=
--link_all_deplibs=unknown
--always_export_symbols=no
--export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | sed '\''s/.* //'\'' | sort | uniq > $export_symbols'
--# include_expsyms should be a list of space-separated symbols to be *always*
--# included in the symbol list
--include_expsyms=
--# exclude_expsyms can be an egrep regular expression of symbols to exclude
--# it will be wrapped by ` (' and `)$', so one must not match beginning or
--# end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
--# as well as any symbol that contains `d'.
--exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
--# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
--# platforms (ab)use it in PIC code, but their linkers get confused if
--# the symbol is explicitly referenced.  Since portable code cannot
--# rely on this symbol name, it's probably fine to never include it in
--# preloaded symbol tables.
--extract_expsyms_cmds=
--
--case $host_os in
--cygwin* | mingw* | pw32*)
--  # FIXME: the MSVC++ port hasn't been tested in a loooong time
--  # When not using gcc, we currently assume that we are using
--  # Microsoft Visual C++.
--  if test "$GCC" != yes; then
--    with_gnu_ld=no
--  fi
--  ;;
--openbsd*)
--  with_gnu_ld=no
-+dgux*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-   ;;
--esac
- 
--ld_shlibs=yes
--if test "$with_gnu_ld" = yes; then
--  # If archive_cmds runs LD, not CC, wlarc should be empty
--  wlarc='${wl}'
-+freebsd1*)
-+  dynamic_linker=no
-+  ;;
- 
--  # See if GNU ld supports shared libraries.
-+freebsd* | dragonfly*)
-+  # DragonFly does not have aout.  When/if they implement a new
-+  # versioning mechanism, adjust this.
-+  if test -x /usr/bin/objformat; then
-+    objformat=`/usr/bin/objformat`
-+  else
-+    case $host_os in
-+    freebsd[[123]]*) objformat=aout ;;
-+    *) objformat=elf ;;
-+    esac
-+  fi
-+  version_type=freebsd-$objformat
-+  case $version_type in
-+    freebsd-elf*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+      need_version=no
-+      need_lib_prefix=no
-+      ;;
-+    freebsd-*)
-+      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-+      need_version=yes
-+      ;;
-+  esac
-+  shlibpath_var=LD_LIBRARY_PATH
-   case $host_os in
--  aix3* | aix4* | aix5*)
--    # On AIX, the GNU linker is very broken
--    # Note:Check GNU linker on AIX 5-IA64 when/if it becomes available.
--    ld_shlibs=no
--    cat <<EOF 1>&2
--
--*** Warning: the GNU linker, at least up to release 2.9.1, is reported
--*** to be unable to reliably create shared libraries on AIX.
--*** Therefore, libtool is disabling shared libraries support.  If you
--*** really care for shared libraries, you may want to modify your PATH
--*** so that a non-GNU linker is found, and then restart.
--
--EOF
-+  freebsd2*)
-+    shlibpath_overrides_runpath=yes
-     ;;
--
--  amigaos*)
--    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_minus_L=yes
--
--    # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
--    # that the semantics of dynamic libraries on AmigaOS, at least up
--    # to version 4, is to share data among multiple programs linked
--    # with the same dynamic library.  Since this doesn't match the
--    # behavior of shared libraries on other platforms, we can use
--    # them.
--    ld_shlibs=no
-+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-     ;;
--
--  beos*)
--    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--      allow_undefined_flag=unsupported
--      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
--      # support --undefined.  This deserves some investigation.  FIXME
--      archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--    else
--      ld_shlibs=no
--    fi
-+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
-+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
-+    shlibpath_overrides_runpath=no
-+    hardcode_into_libs=yes
-+    ;;
-+  freebsd*) # from 4.6 on
-+    shlibpath_overrides_runpath=yes
-+    hardcode_into_libs=yes
-     ;;
-+  esac
-+  ;;
- 
--  cygwin* | mingw* | pw32*)
--    # hardcode_libdir_flag_spec is actually meaningless, as there is
--    # no search path for DLLs.
--    hardcode_libdir_flag_spec='-L$libdir'
--    allow_undefined_flag=unsupported
--    always_export_symbols=yes
--
--    extract_expsyms_cmds='test -f $output_objdir/impgen.c || \
--      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //;s/^# *$//; p; }" -e d < $''0 > $output_objdir/impgen.c~
--      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
--      if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
--      else $CC -o impgen impgen.c ; fi)~
--      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
--
--    old_archive_from_expsyms_cmds='$DLLTOOL --as=$AS --dllname $soname --def $output_objdir/$soname-def --output-lib $output_objdir/$newlib'
--
--    # cygwin and mingw dlls have different entry points and sets of symbols
--    # to exclude.
--    # FIXME: what about values for MSVC?
--    dll_entry=__cygwin_dll_entry at 12
--    dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12~
--    case $host_os in
--    mingw*)
--      # mingw values
--      dll_entry=_DllMainCRTStartup at 12
--      dll_exclude_symbols=DllMain at 12,DllMainCRTStartup at 12,DllEntryPoint at 12~
--      ;;
--    esac
-+gnu*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  ;;
- 
--    # mingw and cygwin differ, and it's simplest to just exclude the union
--    # of the two symbol sets.
--    dll_exclude_symbols=DllMain at 12,_cygwin_dll_entry at 12,_cygwin_noncygwin_dll_entry at 12,DllMainCRTStartup at 12,DllEntryPoint at 12
--
--    # recent cygwin and mingw systems supply a stub DllMain which the user
--    # can override, but on older systems we have to supply one (in ltdll.c)
--    if test "x$lt_cv_need_dllmain" = "xyes"; then
--      ltdll_obj='$output_objdir/$soname-ltdll.'"$ac_objext "
--      ltdll_cmds='test -f $output_objdir/$soname-ltdll.c || sed -e "/^# \/\* ltdll\.c starts here \*\//,/^# \/\* ltdll.c ends here \*\// { s/^# //; p; }" -e d < $''0 > $output_objdir/$soname-ltdll.c~
--	test -f $output_objdir/$soname-ltdll.$ac_objext || (cd $output_objdir && $CC -c $soname-ltdll.c)~'
-+hpux9* | hpux10* | hpux11*)
-+  # Give a soname corresponding to the major version so that dld.sl refuses to
-+  # link against other versions.
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  case $host_cpu in
-+  ia64*)
-+    shrext_cmds='.so'
-+    hardcode_into_libs=yes
-+    dynamic_linker="$host_os dld.so"
-+    shlibpath_var=LD_LIBRARY_PATH
-+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    if test "X$HPUX_IA64_MODE" = X32; then
-+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-     else
--      ltdll_obj=
--      ltdll_cmds=
-+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-     fi
--
--    # Extract the symbol export list from an `--export-all' def file,
--    # then regenerate the def file from the symbol export list, so that
--    # the compiled dll only exports the symbol export list.
--    # Be careful not to strip the DATA tag left be newer dlltools.
--    export_symbols_cmds="$ltdll_cmds"'
--      $DLLTOOL --export-all --exclude-symbols '$dll_exclude_symbols' --output-def $output_objdir/$soname-def '$ltdll_obj'$libobjs $convenience~
--      sed -e "1,/EXPORTS/d" -e "s/ @ [[0-9]]*//" -e "s/ *;.*$//" < $output_objdir/$soname-def > $export_symbols'
--
--    # If the export-symbols file already is a .def file (1st line
--    # is EXPORTS), use it as is.
--    # If DATA tags from a recent dlltool are present, honour them!
--    archive_expsym_cmds='if test "x`sed 1q $export_symbols`" = xEXPORTS; then
--	cp $export_symbols $output_objdir/$soname-def;
--      else
--	echo EXPORTS > $output_objdir/$soname-def;
--	_lt_hint=1;
--	cat $export_symbols | while read symbol; do
--	 set dummy \$symbol;
--	 case \[$]# in
--	   2) echo "   \[$]2 @ \$_lt_hint ; " >> $output_objdir/$soname-def;;
--	   4) echo "   \[$]2 \[$]3 \[$]4 ; " >> $output_objdir/$soname-def; _lt_hint=`expr \$_lt_hint - 1`;;
--	   *) echo "     \[$]2 @ \$_lt_hint \[$]3 ; " >> $output_objdir/$soname-def;;
--	 esac;
--	 _lt_hint=`expr 1 + \$_lt_hint`;
--	done;
--      fi~
--      '"$ltdll_cmds"'
--      $CC -Wl,--base-file,$output_objdir/$soname-base '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
--      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp~
--      $CC -Wl,--base-file,$output_objdir/$soname-base $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags~
--      $DLLTOOL --as=$AS --dllname $soname --exclude-symbols '$dll_exclude_symbols' --def $output_objdir/$soname-def --base-file $output_objdir/$soname-base --output-exp $output_objdir/$soname-exp --output-lib $output_objdir/$libname.dll.a~
--      $CC $output_objdir/$soname-exp '$lt_cv_cc_dll_switch' -Wl,-e,'$dll_entry' -o $output_objdir/$soname '$ltdll_obj'$libobjs $deplibs $compiler_flags'
-+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
--
--  netbsd*)
--    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--      archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
--      wlarc=
--    else
--      archive_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared -nodefaultlibs $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--    fi
-+   hppa*64*)
-+     shrext_cmds='.sl'
-+     hardcode_into_libs=yes
-+     dynamic_linker="$host_os dld.sl"
-+     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-+     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-+     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+     soname_spec='${libname}${release}${shared_ext}$major'
-+     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-+     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-+     ;;
-+   *)
-+    shrext_cmds='.sl'
-+    dynamic_linker="$host_os dld.sl"
-+    shlibpath_var=SHLIB_PATH
-+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-     ;;
-+  esac
-+  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-+  postinstall_cmds='chmod 555 $lib'
-+  ;;
- 
--  solaris* | sysv5*)
--    if $LD -v 2>&1 | egrep 'BFD 2\.8' > /dev/null; then
--      ld_shlibs=no
--      cat <<EOF 1>&2
--
--*** Warning: The releases 2.8.* of the GNU linker cannot reliably
--*** create shared libraries on Solaris systems.  Therefore, libtool
--*** is disabling shared libraries support.  We urge you to upgrade GNU
--*** binutils to release 2.9.1 or newer.  Another option is to modify
--*** your PATH or compiler configuration so that the native linker is
--*** used, and then restart.
--
--EOF
--    elif $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--    else
--      ld_shlibs=no
--    fi
--    ;;
-+interix3*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  ;;
- 
--  sunos4*)
--    archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--    wlarc=
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
-+irix5* | irix6* | nonstopux*)
-+  case $host_os in
-+    nonstopux*) version_type=nonstopux ;;
-+    *)
-+	if test "$lt_cv_prog_gnu_ld" = yes; then
-+		version_type=linux
-+	else
-+		version_type=irix
-+	fi ;;
-+  esac
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  case $host_os in
-+  irix5* | nonstopux*)
-+    libsuff= shlibsuff=
-     ;;
--
-   *)
--    if $LD --help 2>&1 | egrep ': supported targets:.* elf' > /dev/null; then
--      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
--      archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
--    else
--      ld_shlibs=no
--    fi
-+    case $LD in # libtool.m4 will add one of these switches to LD
-+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-+      libsuff= shlibsuff= libmagic=32-bit;;
-+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-+      libsuff=32 shlibsuff=N32 libmagic=N32;;
-+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-+    *) libsuff= shlibsuff= libmagic=never-match;;
-+    esac
-     ;;
-   esac
-+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-+  shlibpath_overrides_runpath=no
-+  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-+  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-+  hardcode_into_libs=yes
-+  ;;
- 
--  if test "$ld_shlibs" = yes; then
--    runpath_var=LD_RUN_PATH
--    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
--    export_dynamic_flag_spec='${wl}--export-dynamic'
--    case $host_os in
--    cygwin* | mingw* | pw32*)
--      # dlltool doesn't understand --whole-archive et. al.
--      whole_archive_flag_spec=
--      ;;
--    *)
--      # ancient GNU ld didn't support --whole-archive et. al.
--      if $LD --help 2>&1 | egrep 'no-whole-archive' > /dev/null; then
--	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
--      else
--	whole_archive_flag_spec=
--      fi
--      ;;
--    esac
--  fi
--else
--  # PORTME fill in a description of your system's linker (not GNU ld)
--  case $host_os in
--  aix3*)
--    allow_undefined_flag=unsupported
--    always_export_symbols=yes
--    archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
--    # Note: this linker hardcodes the directories in LIBPATH if there
--    # are no directories specified by -L.
--    hardcode_minus_L=yes
--    if test "$GCC" = yes && test -z "$link_static_flag"; then
--      # Neither direct hardcoding nor static linking is supported with a
--      # broken collect2.
--      hardcode_direct=unsupported
--    fi
--    ;;
-+# No shared lib support for Linux oldld, aout, or coff.
-+linux*oldld* | linux*aout* | linux*coff*)
-+  dynamic_linker=no
-+  ;;
- 
--  aix4* | aix5*)
--    if test "$host_cpu" = ia64; then
--      # On IA64, the linker does run time linking by default, so we don't
--      # have to do anything special.
--      aix_use_runtimelinking=no
--      exp_sym_flag='-Bexport'
--      no_entry_flag=""
--    else
--      aix_use_runtimelinking=no
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  # This implies no fast_install, which is unacceptable.
-+  # Some rework will be needed to allow for fast_install
-+  # before this can be enabled.
-+  hardcode_into_libs=yes
- 
--      # Test if we are trying to use run time linking or normal
--      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
--      # need to do runtime linking.
--      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
--	for ld_flag in $LDFLAGS; do
--	  case $ld_flag in
--	  *-brtl*)
--	    aix_use_runtimelinking=yes
--	    break
--	  ;;
--	  esac
--	done
--      esac
-+  # Append ld.so.conf contents to the search path
-+  if test -f /etc/ld.so.conf; then
-+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-+  fi
- 
--      exp_sym_flag='-bexport'
--      no_entry_flag='-bnoentry'
--    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,
-+  # most powerpc-linux boxes support dynamic linking these days and
-+  # people can always --disable-shared, the test was removed, and we
-+  # assume the GNU/Linux dynamic linker is in use.
-+  dynamic_linker='GNU/Linux ld.so'
-+  ;;
- 
--    # When large executables or shared objects are built, AIX ld can
--    # have problems creating the table of contents.  If linking a library
--    # or program results in "error TOC overflow" add -mminimal-toc to
--    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
--    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
- 
--    hardcode_direct=yes
--    archive_cmds=''
--    hardcode_libdir_separator=':'
--    if test "$GCC" = yes; then
--      case $host_os in aix4.[[012]]|aix4.[[012]].*)
--	collect2name=`${CC} -print-prog-name=collect2`
--	if test -f "$collect2name" && \
--	  strings "$collect2name" | grep resolve_lib_name >/dev/null
--	then
--	  # We have reworked collect2
--	  hardcode_direct=yes
--	else
--	  # We have old collect2
--	  hardcode_direct=unsupported
--	  # It fails to find uninstalled libraries when the uninstalled
--	  # path is not listed in the libpath.  Setting hardcode_minus_L
--	  # to unsupported forces relinking
--	  hardcode_minus_L=yes
--	  hardcode_libdir_flag_spec='-L$libdir'
--	  hardcode_libdir_separator=
--	fi
--      esac
-+netbsd*)
-+  version_type=sunos
-+  need_lib_prefix=no
-+  need_version=no
-+  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+    dynamic_linker='NetBSD (a.out) ld.so'
-+  else
-+    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+    soname_spec='${libname}${release}${shared_ext}$major'
-+    dynamic_linker='NetBSD ld.elf_so'
-+  fi
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  ;;
- 
--      shared_flag='-shared'
--    else
--      # not using gcc
--      if test "$host_cpu" = ia64; then
--	shared_flag='${wl}-G'
--      else
--	if test "$aix_use_runtimelinking" = yes; then
--	  shared_flag='${wl}-G'
--	else
--	  shared_flag='${wl}-bM:SRE'
--	fi
--      fi
--    fi
-+newsos6)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
- 
--    # It seems that -bexpall can do strange things, so it is better to
--    # generate a list of symbols to export.
--    always_export_symbols=yes
--    if test "$aix_use_runtimelinking" = yes; then
--      # Warning - without using the other runtime loading flags (-brtl),
--      # -berok will link without error, but may produce a broken library.
--      allow_undefined_flag='-berok'
--      hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:/usr/lib:/lib'
--      archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
--    else
--      if test "$host_cpu" = ia64; then
--	hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
--	allow_undefined_flag="-z nodefs"
--	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname ${wl}-h$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
--      else
--	hardcode_libdir_flag_spec='${wl}-bnolibpath ${wl}-blibpath:$libdir:/usr/lib:/lib'
--	# Warning - without using the other run time loading flags,
--	# -berok will link without error, but may produce a broken library.
--	allow_undefined_flag='${wl}-berok'
--	# This is a bit strange, but is similar to how AIX traditionally builds
--	# it's shared libraries.
--	archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"' ~$AR -crlo $objdir/$libname$release.a $objdir/$soname'
--      fi
--    fi
--    ;;
-+nto-qnx*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  ;;
- 
--  amigaos*)
--    archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_minus_L=yes
--    # see comment about different semantics on the GNU ld section
--    ld_shlibs=no
--    ;;
-+openbsd*)
-+  version_type=sunos
-+  sys_lib_dlsearch_path_spec="/usr/lib"
-+  need_lib_prefix=no
-+  # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
-+  case $host_os in
-+    openbsd3.3 | openbsd3.3.*) need_version=yes ;;
-+    *)                         need_version=no  ;;
-+  esac
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    case $host_os in
-+      openbsd2.[[89]] | openbsd2.[[89]].*)
-+	shlibpath_overrides_runpath=no
-+	;;
-+      *)
-+	shlibpath_overrides_runpath=yes
-+	;;
-+      esac
-+  else
-+    shlibpath_overrides_runpath=yes
-+  fi
-+  ;;
- 
--  cygwin* | mingw* | pw32*)
--    # When not using gcc, we currently assume that we are using
--    # Microsoft Visual C++.
--    # hardcode_libdir_flag_spec is actually meaningless, as there is
--    # no search path for DLLs.
--    hardcode_libdir_flag_spec=' '
--    allow_undefined_flag=unsupported
--    # Tell ltmain to make .lib files, not .a files.
--    libext=lib
--    # FIXME: Setting linknames here is a bad hack.
--    archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | sed -e '\''s/ -lc$//'\''` -link -dll~linknames='
--    # The linker will automatically build a .lib file if we build a DLL.
--    old_archive_from_new_cmds='true'
--    # FIXME: Should let the user specify the lib program.
--    old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
--    fix_srcfile_path='`cygpath -w "$srcfile"`'
--    ;;
--
--  darwin* | rhapsody*)
--    case "$host_os" in
--    rhapsody* | darwin1.[[012]])
--      allow_undefined_flag='-undefined suppress'
--      ;;
--    *) # Darwin 1.3 on
--      allow_undefined_flag='-flat_namespace -undefined suppress'
--      ;;
--    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!
--    archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
--    # We need to add '_' to the symbols in $export_symbols first
--    #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    whole_archive_flag_spec='-all_load $convenience'
--    ;;
--
--  freebsd1*)
--    ld_shlibs=no
--    ;;
--
--  # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
--  # support.  Future versions do this automatically, but an explicit c++rt0.o
--  # does not break anything, and helps significantly (at the cost of a little
--  # extra space).
--  freebsd2.2*)
--    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    ;;
-+os2*)
-+  libname_spec='$name'
-+  shrext_cmds=".dll"
-+  need_lib_prefix=no
-+  library_names_spec='$libname${shared_ext} $libname.a'
-+  dynamic_linker='OS/2 ld.exe'
-+  shlibpath_var=LIBPATH
-+  ;;
- 
--  # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--  freebsd2*)
--    archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_direct=yes
--    hardcode_minus_L=yes
--    hardcode_shlibpath_var=no
--    ;;
-+osf3* | osf4* | osf5*)
-+  version_type=osf
-+  need_lib_prefix=no
-+  need_version=no
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-+  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-+  ;;
- 
--  # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--  freebsd*)
--    archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    ;;
-+solaris*)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  hardcode_into_libs=yes
-+  # ldd complains unless libraries are executable
-+  postinstall_cmds='chmod +x $lib'
-+  ;;
-+
-+sunos4*)
-+  version_type=sunos
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=yes
-+  if test "$with_gnu_ld" = yes; then
-+    need_lib_prefix=no
-+  fi
-+  need_version=yes
-+  ;;
-+
-+sysv4 | sysv4.3*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  case $host_vendor in
-+    sni)
-+      shlibpath_overrides_runpath=no
-+      need_lib_prefix=no
-+      export_dynamic_flag_spec='${wl}-Blargedynsym'
-+      runpath_var=LD_RUN_PATH
-+      ;;
-+    siemens)
-+      need_lib_prefix=no
-+      ;;
-+    motorola)
-+      need_lib_prefix=no
-+      need_version=no
-+      shlibpath_overrides_runpath=no
-+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-+      ;;
-+  esac
-+  ;;
-+
-+sysv4*MP*)
-+  if test -d /usr/nec ;then
-+    version_type=linux
-+    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-+    soname_spec='$libname${shared_ext}.$major'
-+    shlibpath_var=LD_LIBRARY_PATH
-+  fi
-+  ;;
- 
--  hpux9* | hpux10* | hpux11*)
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  version_type=freebsd-elf
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  hardcode_into_libs=yes
-+  if test "$with_gnu_ld" = yes; then
-+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
-+    shlibpath_overrides_runpath=no
-+  else
-+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
-+    shlibpath_overrides_runpath=yes
-     case $host_os in
--    hpux9*) archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
--    *) archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ;;
-+      sco3.2v5*)
-+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
-+	;;
-     esac
--    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
--    hardcode_libdir_separator=:
--    hardcode_direct=yes
--    hardcode_minus_L=yes # Not in the search PATH, but as the default
--			 # location of the library.
--    export_dynamic_flag_spec='${wl}-E'
--    ;;
-+  fi
-+  sys_lib_dlsearch_path_spec='/usr/lib'
-+  ;;
- 
--  irix5* | irix6* | nonstopux*)
--    if test "$GCC" = yes; then
--      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--    else
--      archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--      hardcode_libdir_flag_spec='-rpath $libdir'
--    fi
--    hardcode_libdir_separator=:
--    link_all_deplibs=yes
--    ;;
-+uts4*)
-+  version_type=linux
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  ;;
- 
--  netbsd*)
--    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
--    else
--      archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
--    fi
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    ;;
-+*)
-+  dynamic_linker=no
-+  ;;
-+esac
-+AC_MSG_RESULT([$dynamic_linker])
-+test "$dynamic_linker" = no && can_build_shared=no
- 
--  newsos6)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_direct=yes
--    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--    hardcode_libdir_separator=:
--    hardcode_shlibpath_var=no
--    ;;
-+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-+if test "$GCC" = yes; then
-+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-+fi
-+])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
- 
--  openbsd*)
--    hardcode_direct=yes
--    hardcode_shlibpath_var=no
--    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
--      export_dynamic_flag_spec='${wl}-E'
--    else
--      case "$host_os" in
--      openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
--	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
--	hardcode_libdir_flag_spec='-R$libdir'
--        ;;
--      *)
--        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
--        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
--        ;;
--      esac
--    fi
--    ;;
- 
--  os2*)
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_minus_L=yes
--    allow_undefined_flag=unsupported
--    archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
--    old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
--    ;;
-+# _LT_AC_TAGCONFIG
-+# ----------------
-+AC_DEFUN([_LT_AC_TAGCONFIG],
-+[AC_ARG_WITH([tags],
-+    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-+        [include additional configurations @<:@automatic@:>@])],
-+    [tagnames="$withval"])
-+
-+if test -f "$ltmain" && test -n "$tagnames"; then
-+  if test ! -f "${ofile}"; then
-+    AC_MSG_WARN([output file `$ofile' does not exist])
-+  fi
- 
--  osf3*)
--    if test "$GCC" = yes; then
--      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+  if test -z "$LTCC"; then
-+    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-+    if test -z "$LTCC"; then
-+      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-     else
--      allow_undefined_flag=' -expect_unresolved \*'
--      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-     fi
--    hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--    hardcode_libdir_separator=:
--    ;;
-+  fi
-+  if test -z "$LTCFLAGS"; then
-+    eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
-+  fi
- 
--  osf4* | osf5*)	# as osf3* with the addition of -msym flag
--    if test "$GCC" = yes; then
--      allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
--      archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
--      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--    else
--      allow_undefined_flag=' -expect_unresolved \*'
--      archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
--      archive_expsym_cmds='for i in `cat $export_symbols`; do printf "-exported_symbol " >> $lib.exp; echo "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
--      $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-+  # Extract list of available tagged configurations in $ofile.
-+  # Note that this assumes the entire list is on one line.
-+  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-+
-+  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+  for tagname in $tagnames; do
-+    IFS="$lt_save_ifs"
-+    # Check whether tagname contains only valid characters
-+    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-+    "") ;;
-+    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-+	;;
-+    esac
- 
--      #Both c and cxx compiler support -rpath directly
--      hardcode_libdir_flag_spec='-rpath $libdir'
-+    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-+    then
-+      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-     fi
--    hardcode_libdir_separator=:
--    ;;
- 
--  sco3.2v5*)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_shlibpath_var=no
--    runpath_var=LD_RUN_PATH
--    hardcode_runpath_var=yes
--    export_dynamic_flag_spec='${wl}-Bexport'
--    ;;
-+    # Update the list of available tags.
-+    if test -n "$tagname"; then
-+      echo appending configuration tag \"$tagname\" to $ofile
-+
-+      case $tagname in
-+      CXX)
-+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+	    (test "X$CXX" != "Xg++"))) ; then
-+	  AC_LIBTOOL_LANG_CXX_CONFIG
-+	else
-+	  tagname=""
-+	fi
-+	;;
- 
--  solaris*)
--    # gcc --version < 3.0 without binutils cannot create self contained
--    # shared libraries reliably, requiring libgcc.a to resolve some of
--    # the object symbols generated in some cases.  Libraries that use
--    # assert need libgcc.a to resolve __eprintf, for example.  Linking
--    # a copy of libgcc.a into every shared library to guarantee resolving
--    # such symbols causes other problems:  According to Tim Van Holder
--    # <tim.van.holder at pandora.be>, C++ libraries end up with a separate
--    # (to the application) exception stack for one thing.
--    no_undefined_flag=' -z defs'
--    if test "$GCC" = yes; then
--      case `$CC --version 2>/dev/null` in
--      [[12]].*)
--	cat <<EOF 1>&2
-+      F77)
-+	if test -n "$F77" && test "X$F77" != "Xno"; then
-+	  AC_LIBTOOL_LANG_F77_CONFIG
-+	else
-+	  tagname=""
-+	fi
-+	;;
-+
-+      GCJ)
-+	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-+	  AC_LIBTOOL_LANG_GCJ_CONFIG
-+	else
-+	  tagname=""
-+	fi
-+	;;
- 
--*** Warning: Releases of GCC earlier than version 3.0 cannot reliably
--*** create self contained shared libraries on Solaris systems, without
--*** introducing a dependency on libgcc.a.  Therefore, libtool is disabling
--*** -no-undefined support, which will at least allow you to build shared
--*** libraries.  However, you may find that when you link such libraries
--*** into an application without using GCC, you have to manually add
--*** \`gcc --print-libgcc-file-name\` to the link command.  We urge you to
--*** upgrade to a newer version of GCC.  Another option is to rebuild your
--*** current GCC to use the GNU linker from GNU binutils 2.9.1 or newer.
-+      RC)
-+	AC_LIBTOOL_LANG_RC_CONFIG
-+	;;
- 
--EOF
--        no_undefined_flag=
-+      *)
-+	AC_MSG_ERROR([Unsupported tag name: $tagname])
- 	;;
-       esac
--    fi
--    # $CC -shared without GNU ld will not create a library from C++
--    # object files and a static libstdc++, better avoid it by now
--    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
--    hardcode_libdir_flag_spec='-R$libdir'
--    hardcode_shlibpath_var=no
--    case $host_os in
--    solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
--    *) # Supported since Solaris 2.6 (maybe 2.5.1?)
--      whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
--    esac
--    link_all_deplibs=yes
--    ;;
- 
--  sunos4*)
--    if test "x$host_vendor" = xsequent; then
--      # Use $CC to link under sequent, because it throws in some extra .o
--      # files that make .init and .fini sections work.
--      archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
--    else
--      archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      # Append the new tag name to the list of available tags.
-+      if test -n "$tagname" ; then
-+      available_tags="$available_tags $tagname"
-     fi
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_direct=yes
--    hardcode_minus_L=yes
--    hardcode_shlibpath_var=no
--    ;;
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
- 
--  sysv4)
--    case $host_vendor in
--      sni)
--        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--        hardcode_direct=yes # is this really true???
--        ;;
--      siemens)
--        ## LD is ld it makes a PLAMLIB
--        ## CC just makes a GrossModule.
--        archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--        reload_cmds='$CC -r -o $output$reload_objs'
--        hardcode_direct=no
--        ;;
--      motorola)
--        archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--        hardcode_direct=no #Motorola manual says yes, but my tests say they lie
--        ;;
--    esac
--    runpath_var='LD_RUN_PATH'
--    hardcode_shlibpath_var=no
--    ;;
-+  # Now substitute the updated list of available tags.
-+  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-+    mv "${ofile}T" "$ofile"
-+    chmod +x "$ofile"
-+  else
-+    rm -f "${ofile}T"
-+    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-+  fi
-+fi
-+])# _LT_AC_TAGCONFIG
- 
--  sysv4.3*)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_shlibpath_var=no
--    export_dynamic_flag_spec='-Bexport'
--    ;;
--
--  sysv5*)
--    no_undefined_flag=' -z text'
--    # $CC -shared without GNU ld will not create a library from C++
--    # object files and a static libstdc++, better avoid it by now
--    archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
--		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
--    hardcode_libdir_flag_spec=
--    hardcode_shlibpath_var=no
--    runpath_var='LD_RUN_PATH'
--    ;;
- 
--  uts4*)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_shlibpath_var=no
--    ;;
-+# AC_LIBTOOL_DLOPEN
-+# -----------------
-+# enable checks for dlopen support
-+AC_DEFUN([AC_LIBTOOL_DLOPEN],
-+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_DLOPEN
- 
--  dgux*)
--    archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_libdir_flag_spec='-L$libdir'
--    hardcode_shlibpath_var=no
--    ;;
- 
--  sysv4*MP*)
--    if test -d /usr/nec; then
--      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_shlibpath_var=no
--      runpath_var=LD_RUN_PATH
--      hardcode_runpath_var=yes
--      ld_shlibs=yes
--    fi
--    ;;
-+# AC_LIBTOOL_WIN32_DLL
-+# --------------------
-+# declare package support for building win32 DLLs
-+AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-+[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-+])# AC_LIBTOOL_WIN32_DLL
- 
--  sysv4.2uw2*)
--    archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
--    hardcode_direct=yes
--    hardcode_minus_L=no
--    hardcode_shlibpath_var=no
--    hardcode_runpath_var=yes
--    runpath_var=LD_RUN_PATH
--    ;;
- 
--  sysv5uw7* | unixware7*)
--    no_undefined_flag='${wl}-z ${wl}text'
--    if test "$GCC" = yes; then
--      archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--    else
--      archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--    fi
--    runpath_var='LD_RUN_PATH'
--    hardcode_shlibpath_var=no
--    ;;
-+# AC_ENABLE_SHARED([DEFAULT])
-+# ---------------------------
-+# implement the --enable-shared flag
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_SHARED],
-+[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([shared],
-+    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-+	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_shared=yes ;;
-+    no) enable_shared=no ;;
-+    *)
-+      enable_shared=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_shared=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-+])# AC_ENABLE_SHARED
- 
--  *)
--    ld_shlibs=no
--    ;;
--  esac
--fi
--AC_MSG_RESULT([$ld_shlibs])
--test "$ld_shlibs" = no && can_build_shared=no
- 
--# Check hardcoding attributes.
--AC_MSG_CHECKING([how to hardcode library paths into programs])
--hardcode_action=
--if test -n "$hardcode_libdir_flag_spec" || \
--   test -n "$runpath_var"; then
-+# AC_DISABLE_SHARED
-+# -----------------
-+# set the default shared flag to --disable-shared
-+AC_DEFUN([AC_DISABLE_SHARED],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_SHARED(no)
-+])# AC_DISABLE_SHARED
- 
--  # We can hardcode non-existant directories.
--  if test "$hardcode_direct" != 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 "$hardcode_shlibpath_var" != no &&
--     test "$hardcode_minus_L" != no; then
--    # Linking always hardcodes the temporary library directory.
--    hardcode_action=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    hardcode_action=immediate
--  fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  hardcode_action=unsupported
--fi
--AC_MSG_RESULT([$hardcode_action])
- 
--striplib=
--old_striplib=
--AC_MSG_CHECKING([whether stripping libraries is possible])
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  AC_MSG_RESULT([yes])
--else
--  AC_MSG_RESULT([no])
--fi
-+# AC_ENABLE_STATIC([DEFAULT])
-+# ---------------------------
-+# implement the --enable-static flag
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_STATIC],
-+[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([static],
-+    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-+	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_static=yes ;;
-+    no) enable_static=no ;;
-+    *)
-+     enable_static=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_static=yes
-+	fi
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-+])# AC_ENABLE_STATIC
- 
--reload_cmds='$LD$reload_flag -o $output$reload_objs'
--test -z "$deplibs_check_method" && deplibs_check_method=unknown
--
--# PORTME Fill in your ld.so characteristics
--AC_MSG_CHECKING([dynamic linker characteristics])
--library_names_spec=
--libname_spec='lib$name'
--soname_spec=
--postinstall_cmds=
--postuninstall_cmds=
--finish_cmds=
--finish_eval=
--shlibpath_var=
--shlibpath_overrides_runpath=unknown
--version_type=none
--dynamic_linker="$host_os ld.so"
--sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib"
--sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib /usr/X11R6/lib"
- 
--case $host_os in
--aix3*)
--  version_type=linux
--  library_names_spec='${libname}${release}.so$versuffix $libname.a'
--  shlibpath_var=LIBPATH
-+# AC_DISABLE_STATIC
-+# -----------------
-+# set the default static flag to --disable-static
-+AC_DEFUN([AC_DISABLE_STATIC],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_STATIC(no)
-+])# AC_DISABLE_STATIC
- 
--  # AIX has no versioning support, so we append a major version to the name.
--  soname_spec='${libname}${release}.so$major'
--  ;;
- 
--aix4* | aix5*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  hardcode_into_libs=yes
--  if test "$host_cpu" = ia64; then
--    # AIX 5 supports IA64
--    library_names_spec='${libname}${release}.so$major ${libname}${release}.so$versuffix $libname.so'
--    shlibpath_var=LD_LIBRARY_PATH
--  else
--    # With GCC up to 2.95.x, collect2 would create an import file
--    # for dependence libraries.  The import file would start with
--    # the line `#! .'.  This would cause the generated library to
--    # depend on `.', always an invalid library.  This was fixed in
--    # development snapshots of GCC prior to 3.0.
--    case $host_os in
--      aix4 | aix4.[[01]] | aix4.[[01]].*)
--	if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
--	     echo ' yes '
--	     echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
--	  :
--	else
--	  can_build_shared=no
-+# AC_ENABLE_FAST_INSTALL([DEFAULT])
-+# ---------------------------------
-+# implement the --enable-fast-install flag
-+# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-+AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-+[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-+AC_ARG_ENABLE([fast-install],
-+    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-+    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-+    [p=${PACKAGE-default}
-+    case $enableval in
-+    yes) enable_fast_install=yes ;;
-+    no) enable_fast_install=no ;;
-+    *)
-+      enable_fast_install=no
-+      # Look at the argument we got.  We use all the common list separators.
-+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-+      for pkg in $enableval; do
-+	IFS="$lt_save_ifs"
-+	if test "X$pkg" = "X$p"; then
-+	  enable_fast_install=yes
- 	fi
--	;;
--    esac
--    # AIX (on Power*) has no versioning support, so currently we can
--    # not hardcode correct soname into executable. Probably we can
--    # add versioning support to collect2, so additional links can
--    # be useful in future.
--    if test "$aix_use_runtimelinking" = yes; then
--      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
--      # instead of lib<name>.a to let people know that these are not
--      # typical AIX shared libraries.
--      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--    else
--      # We preserve .a as extension for shared libraries through AIX4.2
--      # and later when we are not doing run time linking.
--      library_names_spec='${libname}${release}.a $libname.a'
--      soname_spec='${libname}${release}.so$major'
--    fi
--    shlibpath_var=LIBPATH
--  fi
--  hardcode_into_libs=yes
--  ;;
-+      done
-+      IFS="$lt_save_ifs"
-+      ;;
-+    esac],
-+    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-+])# AC_ENABLE_FAST_INSTALL
- 
--amigaos*)
--  library_names_spec='$libname.ixlibrary $libname.a'
--  # Create ${libname}_ixlibrary.a entries in /sys/libs.
--  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
--  ;;
- 
--beos*)
--  library_names_spec='${libname}.so'
--  dynamic_linker="$host_os ld.so"
--  shlibpath_var=LIBRARY_PATH
--  ;;
-+# AC_DISABLE_FAST_INSTALL
-+# -----------------------
-+# set the default to --disable-fast-install
-+AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+AC_ENABLE_FAST_INSTALL(no)
-+])# AC_DISABLE_FAST_INSTALL
- 
--bsdi4*)
--  version_type=linux
--  need_version=no
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
--  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
--  export_dynamic_flag_spec=-rdynamic
--  # the default ld.so.conf also contains /usr/contrib/lib and
--  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
--  # libtool to hard-code these into programs
--  ;;
- 
--cygwin* | mingw* | pw32*)
--  version_type=windows
--  need_version=no
--  need_lib_prefix=no
--  case $GCC,$host_os in
--  yes,cygwin*)
--    library_names_spec='$libname.dll.a'
--    soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
--    postinstall_cmds='dlpath=`bash 2>&1 -c '\''. $dir/${file}i;echo \$dlname'\''`~
--      dldir=$destdir/`dirname \$dlpath`~
--      test -d \$dldir || mkdir -p \$dldir~
--      $install_prog .libs/$dlname \$dldir/$dlname'
--    postuninstall_cmds='dldll=`bash 2>&1 -c '\''. $file; echo \$dlname'\''`~
--      dlpath=$dir/\$dldll~
--       $rm \$dlpath'
--    ;;
--  yes,mingw*)
--    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll'
--    sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | sed -e "s/^libraries://" -e "s/;/ /g" -e "s,=/,/,g"`
--    ;;
--  yes,pw32*)
--    library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | sed -e 's/[.]/-/g'`${versuffix}.dll'
--    ;;
--  *)
--    library_names_spec='${libname}`echo ${release} | sed -e 's/[[.]]/-/g'`${versuffix}.dll $libname.lib'
--    ;;
--  esac
--  dynamic_linker='Win32 ld.exe'
--  # FIXME: first we should search . and the directory the executable is in
--  shlibpath_var=PATH
--  ;;
-+# AC_LIBTOOL_PICMODE([MODE])
-+# --------------------------
-+# implement the --with-pic flag
-+# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-+AC_DEFUN([AC_LIBTOOL_PICMODE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+pic_mode=ifelse($#,1,$1,default)
-+])# AC_LIBTOOL_PICMODE
- 
--darwin* | rhapsody*)
--  dynamic_linker="$host_os dyld"
--  version_type=darwin
--  need_lib_prefix=no
--  need_version=no
--  # 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='${libname}${release}${versuffix}.$(test .$module = .yes && echo so || echo dylib) ${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib) ${libname}.$(test .$module = .yes && echo so || echo dylib)'
--  soname_spec='${libname}${release}${major}.$(test .$module = .yes && echo so || echo dylib)'
--  shlibpath_overrides_runpath=yes
--  shlibpath_var=DYLD_LIBRARY_PATH
--  ;;
- 
--freebsd1*)
--  dynamic_linker=no
--  ;;
-+# AC_PROG_EGREP
-+# -------------
-+# This is predefined starting with Autoconf 2.54, so this conditional
-+# definition can be removed once we require Autoconf 2.54 or later.
-+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-+[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-+   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-+    then ac_cv_prog_egrep='grep -E'
-+    else ac_cv_prog_egrep='egrep'
-+    fi])
-+ EGREP=$ac_cv_prog_egrep
-+ AC_SUBST([EGREP])
-+])])
- 
--freebsd*)
--  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
--  version_type=freebsd-$objformat
--  case $version_type in
--    freebsd-elf*)
--      library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so $libname.so'
--      need_version=no
--      need_lib_prefix=no
--      ;;
--    freebsd-*)
--      library_names_spec='${libname}${release}.so$versuffix $libname.so$versuffix'
--      need_version=yes
--      ;;
--  esac
--  shlibpath_var=LD_LIBRARY_PATH
--  case $host_os in
--  freebsd2*)
--    shlibpath_overrides_runpath=yes
--    ;;
--  *)
--    shlibpath_overrides_runpath=no
--    hardcode_into_libs=yes
--    ;;
--  esac
--  ;;
- 
--gnu*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so${major} ${libname}.so'
--  soname_spec='${libname}${release}.so$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  hardcode_into_libs=yes
-+# AC_PATH_TOOL_PREFIX
-+# -------------------
-+# find a file program which can recognise shared library
-+AC_DEFUN([AC_PATH_TOOL_PREFIX],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_MSG_CHECKING([for $1])
-+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-+[case $MAGIC_CMD in
-+[[\\/*] |  ?:[\\/]*])
-+  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-   ;;
-+*)
-+  lt_save_MAGIC_CMD="$MAGIC_CMD"
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+dnl $ac_dummy forces splitting on constant user-supplied paths.
-+dnl POSIX.2 word splitting is done only on the output of word expansions,
-+dnl not every word.  This closes a longstanding sh security hole.
-+  ac_dummy="ifelse([$2], , $PATH, [$2])"
-+  for ac_dir in $ac_dummy; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$1; then
-+      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-+      if test -n "$file_magic_test_file"; then
-+	case $deplibs_check_method in
-+	"file_magic "*)
-+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
-+	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-+	    $EGREP "$file_magic_regex" > /dev/null; then
-+	    :
-+	  else
-+	    cat <<EOF 1>&2
- 
--hpux9* | hpux10* | hpux11*)
--  # Give a soname corresponding to the major version so that dld.sl refuses to
--  # link against other versions.
--  dynamic_linker="$host_os dld.sl"
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  shlibpath_var=SHLIB_PATH
--  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
--  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
--  soname_spec='${libname}${release}.sl$major'
--  # HP-UX runs *really* slowly unless shared libraries are mode 555.
--  postinstall_cmds='chmod 555 $lib'
-+*** Warning: the command libtool uses to detect shared libraries,
-+*** $file_magic_cmd, produces output that libtool cannot recognize.
-+*** The result is that libtool may fail to recognize shared libraries
-+*** as such.  This will affect the creation of libtool libraries that
-+*** depend on shared libraries, but programs linked with such libtool
-+*** libraries will work regardless of this problem.  Nevertheless, you
-+*** may want to report the problem to your system manager and/or to
-+*** bug-libtool at gnu.org
-+
-+EOF
-+	  fi ;;
-+	esac
-+      fi
-+      break
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+  MAGIC_CMD="$lt_save_MAGIC_CMD"
-   ;;
-+esac])
-+MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-+if test -n "$MAGIC_CMD"; then
-+  AC_MSG_RESULT($MAGIC_CMD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+])# AC_PATH_TOOL_PREFIX
- 
--irix5* | irix6* | nonstopux*)
--  case $host_os in
--    nonstopux*) version_type=nonstopux ;;
--    *)          version_type=irix ;;
-+
-+# AC_PATH_MAGIC
-+# -------------
-+# find a file program which can recognise a shared library
-+AC_DEFUN([AC_PATH_MAGIC],
-+[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-+if test -z "$lt_cv_path_MAGIC_CMD"; then
-+  if test -n "$ac_tool_prefix"; then
-+    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-+  else
-+    MAGIC_CMD=:
-+  fi
-+fi
-+])# AC_PATH_MAGIC
-+
-+
-+# AC_PROG_LD
-+# ----------
-+# 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],
-+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-+    [test "$withval" = no || with_gnu_ld=yes],
-+    [with_gnu_ld=no])
-+AC_REQUIRE([LT_AC_PROG_SED])dnl
-+AC_REQUIRE([AC_PROG_CC])dnl
-+AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-+ac_prog=ld
-+if test "$GCC" = yes; then
-+  # Check if gcc -print-prog-name=ld gives a path.
-+  AC_MSG_CHECKING([for ld used by $CC])
-+  case $host in
-+  *-*-mingw*)
-+    # gcc leaves a trailing carriage return which upsets mingw
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-+  *)
-+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-   esac
--  need_lib_prefix=no
--  need_version=no
--  soname_spec='${libname}${release}.so$major'
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so $libname.so'
--  case $host_os in
--  irix5* | nonstopux*)
--    libsuff= shlibsuff=
-+  case $ac_prog in
-+    # Accept absolute paths.
-+    [[\\/]]* | ?:[[\\/]]*)
-+      re_direlt='/[[^/]][[^/]]*/\.\./'
-+      # Canonicalize the pathname of ld
-+      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-+      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-+	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-+      done
-+      test -z "$LD" && LD="$ac_prog"
-+      ;;
-+  "")
-+    # If it fails, then pretend we aren't using GCC.
-+    ac_prog=ld
-     ;;
-   *)
--    case $LD in # libtool.m4 will add one of these switches to LD
--    *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
--    *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
--    *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
--    *) libsuff= shlibsuff= libmagic=never-match;;
--    esac
-+    # If it is relative, then search for the first ld in PATH.
-+    with_gnu_ld=unknown
-     ;;
-   esac
--  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
--  shlibpath_overrides_runpath=no
--  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
--  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
--  ;;
--
--# No shared lib support for Linux oldld, aout, or coff.
--linux-gnuoldld* | linux-gnuaout* | linux-gnucoff*)
--  dynamic_linker=no
--  ;;
--
--# This must be Linux ELF.
--linux-gnu*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=no
--  # This implies no fast_install, which is unacceptable.
--  # Some rework will be needed to allow for fast_install
--  # before this can be enabled.
--  hardcode_into_libs=yes
-+elif test "$with_gnu_ld" = yes; then
-+  AC_MSG_CHECKING([for GNU ld])
-+else
-+  AC_MSG_CHECKING([for non-GNU ld])
-+fi
-+AC_CACHE_VAL(lt_cv_path_LD,
-+[if test -z "$LD"; then
-+  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+  for ac_dir in $PATH; do
-+    IFS="$lt_save_ifs"
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-+      lt_cv_path_LD="$ac_dir/$ac_prog"
-+      # Check to see if the program is GNU ld.  I'd rather use --version,
-+      # but apparently some variants of GNU ld only accept -v.
-+      # Break only if it was the GNU/non-GNU ld that we prefer.
-+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-+      *GNU* | *'with BFD'*)
-+	test "$with_gnu_ld" != no && break
-+	;;
-+      *)
-+	test "$with_gnu_ld" != yes && break
-+	;;
-+      esac
-+    fi
-+  done
-+  IFS="$lt_save_ifs"
-+else
-+  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-+fi])
-+LD="$lt_cv_path_LD"
-+if test -n "$LD"; then
-+  AC_MSG_RESULT($LD)
-+else
-+  AC_MSG_RESULT(no)
-+fi
-+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-+AC_PROG_LD_GNU
-+])# AC_PROG_LD
-+
-+
-+# AC_PROG_LD_GNU
-+# --------------
-+AC_DEFUN([AC_PROG_LD_GNU],
-+[AC_REQUIRE([AC_PROG_EGREP])dnl
-+AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
-+case `$LD -v 2>&1 </dev/null` in
-+*GNU* | *'with BFD'*)
-+  lt_cv_prog_gnu_ld=yes
-+  ;;
-+*)
-+  lt_cv_prog_gnu_ld=no
-+  ;;
-+esac])
-+with_gnu_ld=$lt_cv_prog_gnu_ld
-+])# AC_PROG_LD_GNU
-+
- 
--  case $host_cpu:$lt_cv_cc_64bit_output in
--  powerpc64:yes | s390x:yes | sparc64:yes | x86_64:yes)
--    sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /usr/X11R6/lib64"
--    sys_lib_search_path_spec="/lib64 /usr/lib64 /usr/local/lib64 /usr/X11R6/lib64"
-+# AC_PROG_LD_RELOAD_FLAG
-+# ----------------------
-+# find reload flag for linker
-+#   -- PORTME Some linkers may need a different reload flag.
-+AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-+[AC_CACHE_CHECK([for $LD option to reload object files],
-+  lt_cv_ld_reload_flag,
-+  [lt_cv_ld_reload_flag='-r'])
-+reload_flag=$lt_cv_ld_reload_flag
-+case $reload_flag in
-+"" | " "*) ;;
-+*) reload_flag=" $reload_flag" ;;
-+esac
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-     ;;
--  esac
-+esac
-+])# AC_PROG_LD_RELOAD_FLAG
- 
--  # 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,
--  # most powerpc-linux boxes support dynamic linking these days and
--  # people can always --disable-shared, the test was removed, and we
--  # assume the GNU/Linux dynamic linker is in use.
--  dynamic_linker='GNU/Linux ld.so'
-+
-+# AC_DEPLIBS_CHECK_METHOD
-+# -----------------------
-+# how to check for library dependencies
-+#  -- PORTME fill in with the dynamic library characteristics
-+AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-+[AC_CACHE_CHECK([how to recognise dependent libraries],
-+lt_cv_deplibs_check_method,
-+[lt_cv_file_magic_cmd='$MAGIC_CMD'
-+lt_cv_file_magic_test_file=
-+lt_cv_deplibs_check_method='unknown'
-+# Need to set the preceding variable on all platforms that support
-+# interlibrary dependencies.
-+# 'none' -- dependencies not supported.
-+# `unknown' -- same as none, but documents that we really don't know.
-+# 'pass_all' -- all dependencies passed with no checks.
-+# 'test_compile' -- check by making test program.
-+# 'file_magic [[regex]]' -- check by looking for files in library path
-+# which responds to the $file_magic_cmd with a given extended regex.
-+# If you have `file' or equivalent on your system and you're not sure
-+# whether `pass_all' will *always* work, you probably want this one.
-+
-+case $host_os in
-+aix4* | aix5*)
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
--    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
--    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--    dynamic_linker='NetBSD (a.out) ld.so'
--  else
--    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major ${libname}${release}.so ${libname}.so'
--    soname_spec='${libname}${release}.so$major'
--    dynamic_linker='NetBSD ld.elf_so'
--  fi
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
-+beos*)
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--newsos6)
--  version_type=linux
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
-+bsdi[[45]]*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-+  lt_cv_file_magic_cmd='/usr/bin/file -L'
-+  lt_cv_file_magic_test_file=/shlib/libc.so
-   ;;
- 
--openbsd*)
--  version_type=sunos
--  need_lib_prefix=no
--  need_version=no
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    case "$host_os" in
--    openbsd2.[[89]] | openbsd2.[[89]].*)
--      shlibpath_overrides_runpath=no
--      ;;
--    *)
--      shlibpath_overrides_runpath=yes
-+cygwin*)
-+  # func_win32_libid is a shell function defined in ltmain.sh
-+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-+  lt_cv_file_magic_cmd='func_win32_libid'
-+  ;;
-+
-+mingw* | pw32*)
-+  # Base MSYS/MinGW do not provide the 'file' command needed by
-+  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-+  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-+  lt_cv_file_magic_cmd='$OBJDUMP -f'
-+  ;;
-+
-+darwin* | rhapsody*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+freebsd* | dragonfly*)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    case $host_cpu in
-+    i*86 )
-+      # Not sure whether the presence of OpenBSD here was a mistake.
-+      # Let's accept both of them until this is cleared up.
-+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
-+      lt_cv_file_magic_cmd=/usr/bin/file
-+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-       ;;
-     esac
-   else
--    shlibpath_overrides_runpath=yes
-+    lt_cv_deplibs_check_method=pass_all
-   fi
--  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
--  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--os2*)
--  libname_spec='$name'
--  need_lib_prefix=no
--  library_names_spec='$libname.dll $libname.a'
--  dynamic_linker='OS/2 ld.exe'
--  shlibpath_var=LIBPATH
-+gnu*)
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--osf3* | osf4* | osf5*)
--  version_type=osf
--  need_version=no
--  soname_spec='${libname}${release}.so$major'
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  shlibpath_var=LD_LIBRARY_PATH
--  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
--  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
--  hardcode_into_libs=yes
-+hpux10.20* | hpux11*)
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  case $host_cpu in
-+  ia64*)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-+    ;;
-+  hppa*64*)
-+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-+    ;;
-+  *)
-+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-+    ;;
-+  esac
-   ;;
- 
--sco3.2v5*)
--  version_type=osf
--  soname_spec='${libname}${release}.so$major'
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  shlibpath_var=LD_LIBRARY_PATH
-+interix3*)
-+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
-+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
-   ;;
- 
--solaris*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  hardcode_into_libs=yes
--  # ldd complains unless libraries are executable
--  postinstall_cmds='chmod +x $lib'
-+irix5* | irix6* | nonstopux*)
-+  case $LD in
-+  *-32|*"-32 ") libmagic=32-bit;;
-+  *-n32|*"-n32 ") libmagic=N32;;
-+  *-64|*"-64 ") libmagic=64-bit;;
-+  *) libmagic=never-match;;
-+  esac
-+  lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--sunos4*)
--  version_type=sunos
--  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
--  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
--  shlibpath_var=LD_LIBRARY_PATH
--  shlibpath_overrides_runpath=yes
--  if test "$with_gnu_ld" = yes; then
--    need_lib_prefix=no
-+# This must be Linux ELF.
-+linux* | k*bsd*-gnu)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+netbsd* | netbsdelf*-gnu)
-+  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-   fi
--  need_version=yes
-   ;;
- 
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--  version_type=linux
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
--  shlibpath_var=LD_LIBRARY_PATH
-+newos6*)
-+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-+  lt_cv_file_magic_cmd=/usr/bin/file
-+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-+  ;;
-+
-+nto-qnx*)
-+  lt_cv_deplibs_check_method=unknown
-+  ;;
-+
-+openbsd*)
-+  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
-+  else
-+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-+  fi
-+  ;;
-+
-+osf3* | osf4* | osf5*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+solaris*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+sysv4 | sysv4.3*)
-   case $host_vendor in
--    sni)
--      shlibpath_overrides_runpath=no
--      need_lib_prefix=no
--      export_dynamic_flag_spec='${wl}-Blargedynsym'
--      runpath_var=LD_RUN_PATH
--      ;;
--    siemens)
--      need_lib_prefix=no
--      ;;
--    motorola)
--      need_lib_prefix=no
--      need_version=no
--      shlibpath_overrides_runpath=no
--      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
--      ;;
-+  motorola)
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-+    ;;
-+  ncr)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  sequent)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-+    ;;
-+  sni)
-+    lt_cv_file_magic_cmd='/bin/file'
-+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-+    lt_cv_file_magic_test_file=/lib/libc.so
-+    ;;
-+  siemens)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-+  pc)
-+    lt_cv_deplibs_check_method=pass_all
-+    ;;
-   esac
-   ;;
- 
--uts4*)
--  version_type=linux
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
-+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
-+  lt_cv_deplibs_check_method=pass_all
-+  ;;
-+esac
-+])
-+file_magic_cmd=$lt_cv_file_magic_cmd
-+deplibs_check_method=$lt_cv_deplibs_check_method
-+test -z "$deplibs_check_method" && deplibs_check_method=unknown
-+])# AC_DEPLIBS_CHECK_METHOD
-+
-+
-+# AC_PROG_NM
-+# ----------
-+# 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
-+  # Let the user override the test.
-+  lt_cv_path_NM="$NM"
-+else
-+  lt_nm_to_check="${ac_tool_prefix}nm"
-+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then 
-+    lt_nm_to_check="$lt_nm_to_check nm"
-+  fi
-+  for lt_tmp_nm in $lt_nm_to_check; do
-+    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
-+      IFS="$lt_save_ifs"
-+      test -z "$ac_dir" && ac_dir=.
-+      tmp_nm="$ac_dir/$lt_tmp_nm"
-+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-+	# Check to see if the nm accepts a BSD-compat flag.
-+	# Adding the `sed 1q' prevents false positives on HP-UX, which says:
-+	#   nm: unknown option "B" ignored
-+	# Tru64's nm complains that /dev/null is an invalid object file
-+	case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-+	*/dev/null* | *'Invalid file or object type'*)
-+	  lt_cv_path_NM="$tmp_nm -B"
-+	  break
-+	  ;;
-+	*)
-+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-+	  */dev/null*)
-+	    lt_cv_path_NM="$tmp_nm -p"
-+	    break
-+	    ;;
-+	  *)
-+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-+	    continue # so that we can try to find one that supports BSD flags
-+	    ;;
-+	  esac
-+	  ;;
-+	esac
-+      fi
-+    done
-+    IFS="$lt_save_ifs"
-+  done
-+  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-+fi])
-+NM="$lt_cv_path_NM"
-+])# AC_PROG_NM
-+
-+
-+# AC_CHECK_LIBM
-+# -------------
-+# check for math library
-+AC_DEFUN([AC_CHECK_LIBM],
-+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-+LIBM=
-+case $host in
-+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-+  # These system don't have libm, or don't need it
-+  ;;
-+*-ncr-sysv4.3*)
-+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-+  ;;
-+*)
-+  AC_CHECK_LIB(m, cos, LIBM="-lm")
-+  ;;
-+esac
-+])# AC_CHECK_LIBM
-+
-+
-+# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-+# -----------------------------------
-+# sets LIBLTDL to the link flags for the libltdl convenience library and
-+# LTDLINCL to the include flags for the libltdl header and adds
-+# --enable-ltdl-convenience to the configure arguments.  Note that
-+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-+# it is assumed to be `libltdl'.  LIBLTDL will be prefixed with
-+# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
-+# (note the single quotes!).  If your package is not flat and you're not
-+# using automake, define top_builddir and top_srcdir appropriately in
-+# the Makefiles.
-+AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  case $enable_ltdl_convenience in
-+  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-+  "") enable_ltdl_convenience=yes
-+      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-+  esac
-+  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-+  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
-+])# AC_LIBLTDL_CONVENIENCE
-+
-+
-+# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-+# -----------------------------------
-+# sets LIBLTDL to the link flags for the libltdl installable library and
-+# LTDLINCL to the include flags for the libltdl header and adds
-+# --enable-ltdl-install to the configure arguments.  Note that
-+# AC_CONFIG_SUBDIRS is not called here.  If DIRECTORY is not provided,
-+# and an installed libltdl is not found, it is assumed to be `libltdl'.
-+# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
-+# '${top_srcdir}/' (note the single quotes!).  If your package is not
-+# flat and you're not using automake, define top_builddir and top_srcdir
-+# appropriately in the Makefiles.
-+# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-+AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-+[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-+  AC_CHECK_LIB(ltdl, lt_dlinit,
-+  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-+  [if test x"$enable_ltdl_install" = xno; then
-+     AC_MSG_WARN([libltdl not installed, but installation disabled])
-+   else
-+     enable_ltdl_install=yes
-+   fi
-+  ])
-+  if test x"$enable_ltdl_install" = x"yes"; then
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-+    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-+    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-+  else
-+    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-+    LIBLTDL="-lltdl"
-+    LTDLINCL=
-+  fi
-+  # For backwards non-gettext consistent compatibility...
-+  INCLTDL="$LTDLINCL"
-+])# AC_LIBLTDL_INSTALLABLE
-+
-+
-+# AC_LIBTOOL_CXX
-+# --------------
-+# enable support for C++ libraries
-+AC_DEFUN([AC_LIBTOOL_CXX],
-+[AC_REQUIRE([_LT_AC_LANG_CXX])
-+])# AC_LIBTOOL_CXX
-+
-+
-+# _LT_AC_LANG_CXX
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_CXX],
-+[AC_REQUIRE([AC_PROG_CXX])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-+])# _LT_AC_LANG_CXX
-+
-+# _LT_AC_PROG_CXXCPP
-+# ------------------
-+AC_DEFUN([_LT_AC_PROG_CXXCPP],
-+[
-+AC_REQUIRE([AC_PROG_CXX])
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  AC_PROG_CXXCPP
-+fi
-+])# _LT_AC_PROG_CXXCPP
-+
-+# AC_LIBTOOL_F77
-+# --------------
-+# enable support for Fortran 77 libraries
-+AC_DEFUN([AC_LIBTOOL_F77],
-+[AC_REQUIRE([_LT_AC_LANG_F77])
-+])# AC_LIBTOOL_F77
-+
-+
-+# _LT_AC_LANG_F77
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_F77],
-+[AC_REQUIRE([AC_PROG_F77])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-+])# _LT_AC_LANG_F77
-+
-+
-+# AC_LIBTOOL_GCJ
-+# --------------
-+# enable support for GCJ libraries
-+AC_DEFUN([AC_LIBTOOL_GCJ],
-+[AC_REQUIRE([_LT_AC_LANG_GCJ])
-+])# AC_LIBTOOL_GCJ
-+
-+
-+# _LT_AC_LANG_GCJ
-+# ---------------
-+AC_DEFUN([_LT_AC_LANG_GCJ],
-+[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-+    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-+      [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=${tagnames+${tagnames},}GCJ])
-+])# _LT_AC_LANG_GCJ
-+
-+
-+# AC_LIBTOOL_RC
-+# -------------
-+# enable support for Windows resource files
-+AC_DEFUN([AC_LIBTOOL_RC],
-+[AC_REQUIRE([LT_AC_PROG_RC])
-+_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-+])# AC_LIBTOOL_RC
-+
-+
-+# AC_LIBTOOL_LANG_C_CONFIG
-+# ------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-+AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-+[lt_save_CC="$CC"
-+AC_LANG_PUSH(C)
-+
-+# Source file extension for C test sources.
-+ac_ext=c
-+
-+# Object file extension for compiled C test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(){return(0);}\n'
-+
-+_LT_AC_SYS_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+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_DLOPEN_SELF
-+
-+# Report which library types will actually be built
-+AC_MSG_CHECKING([if libtool supports shared libraries])
-+AC_MSG_RESULT([$can_build_shared])
-+
-+AC_MSG_CHECKING([whether to build shared libraries])
-+test "$can_build_shared" = "no" && enable_shared=no
-+
-+# On AIX, shared libraries and static libraries use the same namespace, and
-+# are all built from PIC.
-+case $host_os in
-+aix3*)
-+  test "$enable_shared" = yes && enable_static=no
-+  if test -n "$RANLIB"; then
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-+    postinstall_cmds='$RANLIB $lib'
-+  fi
-+  ;;
-+
-+aix4* | aix5*)
-+  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-+    test "$enable_shared" = yes && enable_static=no
-+  fi
-+    ;;
-+esac
-+AC_MSG_RESULT([$enable_shared])
-+
-+AC_MSG_CHECKING([whether to build static libraries])
-+# Make sure either enable_shared or enable_static is yes.
-+test "$enable_shared" = yes || enable_static=yes
-+AC_MSG_RESULT([$enable_static])
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_C_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_CXX_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-+AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-+[AC_LANG_PUSH(C++)
-+AC_REQUIRE([AC_PROG_CXX])
-+AC_REQUIRE([_LT_AC_PROG_CXXCPP])
-+
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+_LT_AC_TAGVAR(always_export_symbols, $1)=no
-+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_direct, $1)=no
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+_LT_AC_TAGVAR(module_cmds, $1)=
-+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_AC_TAGVAR(no_undefined_flag, $1)=
-+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Dependencies to place before and after the object being linked:
-+_LT_AC_TAGVAR(predep_objects, $1)=
-+_LT_AC_TAGVAR(postdep_objects, $1)=
-+_LT_AC_TAGVAR(predeps, $1)=
-+_LT_AC_TAGVAR(postdeps, $1)=
-+_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-+
-+# Source file extension for C++ test sources.
-+ac_ext=cpp
-+
-+# Object file extension for compiled C++ test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="int some_variable = 0;\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC=$CC
-+lt_save_LD=$LD
-+lt_save_GCC=$GCC
-+GCC=$GXX
-+lt_save_with_gnu_ld=$with_gnu_ld
-+lt_save_path_LD=$lt_cv_path_LD
-+if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-+  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-+else
-+  $as_unset lt_cv_prog_gnu_ld
-+fi
-+if test -n "${lt_cv_path_LDCXX+set}"; then
-+  lt_cv_path_LD=$lt_cv_path_LDCXX
-+else
-+  $as_unset lt_cv_path_LD
-+fi
-+test -z "${LDCXX+set}" || LD=$LDCXX
-+CC=${CXX-"c++"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+
-+# We don't want -fno-exception wen compiling C++ code, so set the
-+# no_builtin_flag separately
-+if test "$GXX" = yes; then
-+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-+else
-+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-+fi
-+
-+if test "$GXX" = yes; then
-+  # Set up default GNU C++ configuration
-+
-+  AC_PROG_LD
-+
-+  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-+  # archiving commands below assume that GNU ld is being used.
-+  if test "$with_gnu_ld" = yes; then
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-+    #     investigate it a little bit more. (MM)
-+    wlarc='${wl}'
-+
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-+	grep 'no-whole-archive' > /dev/null; then
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    else
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+  else
-+    with_gnu_ld=no
-+    wlarc=
-+
-+    # A generic and very simple default shared library creation
-+    # command for GNU C++ for the case where it uses the native
-+    # linker, instead of GNU ld.  If possible, this setting should
-+    # overridden to take advantage of the native linker features on
-+    # the platform it is being used on.
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+  fi
-+
-+  # Commands to make compiler produce verbose output that lists
-+  # what "hidden" libraries, object files and flags are used when
-+  # linking a shared library.
-+  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+else
-+  GXX=no
-+  with_gnu_ld=no
-+  wlarc=
-+fi
-+
-+# PORTME: fill in a description of your system's C++ link characteristics
-+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+case $host_os in
-+  aix3*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  aix4* | aix5*)
-+    if test "$host_cpu" = ia64; then
-+      # On IA64, the linker does run time linking by default, so we don't
-+      # have to do anything special.
-+      aix_use_runtimelinking=no
-+      exp_sym_flag='-Bexport'
-+      no_entry_flag=""
-+    else
-+      aix_use_runtimelinking=no
-+
-+      # Test if we are trying to use run time linking or normal
-+      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+      # need to do runtime linking.
-+      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+	for ld_flag in $LDFLAGS; do
-+	  case $ld_flag in
-+	  *-brtl*)
-+	    aix_use_runtimelinking=yes
-+	    break
-+	    ;;
-+	  esac
-+	done
-+	;;
-+      esac
-+
-+      exp_sym_flag='-bexport'
-+      no_entry_flag='-bnoentry'
-+    fi
-+
-+    # When large executables or shared objects are built, AIX ld can
-+    # have problems creating the table of contents.  If linking a library
-+    # or program results in "error TOC overflow" add -mminimal-toc to
-+    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+    _LT_AC_TAGVAR(archive_cmds, $1)=''
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+    if test "$GXX" = yes; then
-+      case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+      # We only want to do this on AIX 4.2 and lower, the check
-+      # below for broken collect2 doesn't work under 4.3+
-+	collect2name=`${CC} -print-prog-name=collect2`
-+	if test -f "$collect2name" && \
-+	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	then
-+	  # We have reworked collect2
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+	else
-+	  # We have old collect2
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+	  # It fails to find uninstalled libraries when the uninstalled
-+	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+	  # to unsupported forces relinking
-+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+	fi
-+	;;
-+      esac
-+      shared_flag='-shared'
-+      if test "$aix_use_runtimelinking" = yes; then
-+	shared_flag="$shared_flag "'${wl}-G'
-+      fi
-+    else
-+      # not using gcc
-+      if test "$host_cpu" = ia64; then
-+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+	# chokes on -Wl,-G. The following line is correct:
-+	shared_flag='-G'
-+      else
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag='${wl}-G'
-+	else
-+	  shared_flag='${wl}-bM:SRE'
-+	fi
-+      fi
-+    fi
-+
-+    # It seems that -bexpall does not export symbols beginning with
-+    # underscore (_), so it is better to generate a list of symbols to export.
-+    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+    if test "$aix_use_runtimelinking" = yes; then
-+      # Warning - without using the other runtime loading flags (-brtl),
-+      # -berok will link without error, but may produce a broken library.
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-+      # Determine the default libpath from the value encoded in an empty executable.
-+      _LT_AC_SYS_LIBPATH_AIX
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+     else
-+      if test "$host_cpu" = ia64; then
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+      else
-+	# Determine the default libpath from the value encoded in an empty executable.
-+	_LT_AC_SYS_LIBPATH_AIX
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	# Warning - without using the other run time loading flags,
-+	# -berok will link without error, but may produce a broken library.
-+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	# Exported symbols can be pulled into shared objects from archives
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	# This is similar to how AIX traditionally builds its shared libraries.
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+      fi
-+    fi
-+    ;;
-+
-+  beos*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+      # support --undefined.  This deserves some investigation.  FIXME
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+    else
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    fi
-+    ;;
-+
-+  chorus*)
-+    case $cc_basename in
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+
-+  cygwin* | mingw* | pw32*)
-+    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+    # as there is no search path for DLLs.
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+
-+    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      # If the export-symbols file already is a .def file (1st line
-+      # is EXPORTS), use it as is; otherwise, prepend...
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	cp $export_symbols $output_objdir/$soname.def;
-+      else
-+	echo EXPORTS > $output_objdir/$soname.def;
-+	cat $export_symbols >> $output_objdir/$soname.def;
-+      fi~
-+      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+    else
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    fi
-+  ;;
-+      darwin* | rhapsody*)
-+        case $host_os in
-+        rhapsody* | darwin1.[[012]])
-+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[[012]])
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+        esac
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+    if test "$GXX" = yes ; then
-+      lt_int_apple_cc_single_mod=no
-+      output_verbose_link_cmd='echo'
-+      if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
-+       lt_int_apple_cc_single_mod=yes
-+      fi
-+      if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      else
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+        fi
-+        _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+        # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          else
-+            _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          fi
-+            _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+          _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+          _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+          ;;
-+      esac
-+      fi
-+        ;;
-+
-+  dgux*)
-+    case $cc_basename in
-+      ec++*)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      ghcx*)
-+	# Green Hills C++ Compiler
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+  freebsd[[12]]*)
-+    # C++ shared libraries reported to be fairly broken before switch to ELF
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  freebsd-elf*)
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+    ;;
-+  freebsd* | dragonfly*)
-+    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-+    # conventions
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+    ;;
-+  gnu*)
-+    ;;
-+  hpux9*)
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+				# but as the default
-+				# location of the library.
-+
-+    case $cc_basename in
-+    CC*)
-+      # FIXME: insert proper C++ library support
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+    aCC*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      # Commands to make compiler produce verbose output that lists
-+      # what "hidden" libraries, object files and flags are used when
-+      # linking a shared library.
-+      #
-+      # There doesn't appear to be a way to prevent this compiler from
-+      # explicitly linking system object files so we need to strip them
-+      # from the output so that they don't get included in the library
-+      # dependencies.
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      ;;
-+    *)
-+      if test "$GXX" = yes; then
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+        # FIXME: insert proper C++ library support
-+        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+    esac
-+    ;;
-+  hpux10*|hpux11*)
-+    if test $with_gnu_ld = no; then
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+      case $host_cpu in
-+      hppa*64*|ia64*)
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+        ;;
-+      *)
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+        ;;
-+      esac
-+    fi
-+    case $host_cpu in
-+    hppa*64*|ia64*)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+    *)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-+					      # but as the default
-+					      # location of the library.
-+      ;;
-+    esac
-+
-+    case $cc_basename in
-+      CC*)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      aCC*)
-+	case $host_cpu in
-+	hppa*64*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	  ;;
-+	esac
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes; then
-+	  if test $with_gnu_ld = no; then
-+	    case $host_cpu in
-+	    hppa*64*)
-+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      ;;
-+	    ia64*)
-+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      ;;
-+	    *)
-+	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	      ;;
-+	    esac
-+	  fi
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+    esac
-+    ;;
-+  interix3*)
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+    # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+    # Instead, shared libraries are loaded at an image base (0x10000000 by
-+    # default) and relocated if they conflict, which is a slow very memory
-+    # consuming and fragmenting process.  To avoid this, we pick a random,
-+    # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+    # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+    ;;
-+  irix5* | irix6*)
-+    case $cc_basename in
-+      CC*)
-+	# SGI C++
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-+	# necessary to make sure instantiated templates are included
-+	# in the archive.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-+	;;
-+      *)
-+	if test "$GXX" = yes; then
-+	  if test "$with_gnu_ld" = no; then
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	  else
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-+	  fi
-+	fi
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+	;;
-+    esac
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+    ;;
-+  linux* | k*bsd*-gnu)
-+    case $cc_basename in
-+      KCC*)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
-+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+	;;
-+      icpc*)
-+	# Intel C++
-+	with_gnu_ld=yes
-+	# version 8.0 and above of icpc choke on multiply defined symbols
-+	# if we add $predep_objects and $postdep_objects, however 7.1 and
-+	# earlier do not add the objects themselves.
-+	case `$CC -V 2>&1` in
-+	*"Version 7."*)
-+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	*)  # Version 8.0 or newer
-+	  tmp_idyn=
-+	  case $host_cpu in
-+	    ia64*) tmp_idyn=' -i_dynamic';;
-+	  esac
-+  	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	esac
-+	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-+	;;
-+      pgCC*)
-+        # Portland Group C++ compiler
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
-+  	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+        ;;
-+      cxx*)
-+	# Compaq C++
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-+
-+	runpath_var=LD_RUN_PATH
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+    esac
-+    ;;
-+  lynxos*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  m88k*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  mvs*)
-+    case $cc_basename in
-+      cxx*)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+  netbsd* | netbsdelf*-gnu)
-+    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-+      wlarc=
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    fi
-+    # Workaround some broken pre-1.5 toolchains
-+    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-+    ;;
-+  openbsd2*)
-+    # C++ shared libraries are fairly broken
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  openbsd*)
-+    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+    if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+    fi
-+    output_verbose_link_cmd='echo'
-+    ;;
-+  osf3*)
-+    case $cc_basename in
-+      KCC*)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
-+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-+
-+	;;
-+      RCC*)
-+	# Rational C++ 2.4.1
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      cxx*)
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	  # Commands to make compiler produce verbose output that lists
-+	  # what "hidden" libraries, object files and flags are used when
-+	  # linking a shared library.
-+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+    esac
-+    ;;
-+  osf4* | osf5*)
-+    case $cc_basename in
-+      KCC*)
-+	# Kuck and Associates, Inc. (KAI) C++ Compiler
-+
-+	# KCC will only create a shared library if the output file
-+	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-+	# to its proper name (with version) after linking.
-+	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Archives containing C++ object files must be created using
-+	# the KAI C++ compiler.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-+	;;
-+      RCC*)
-+	# Rational C++ 2.4.1
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      cxx*)
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+	  echo "-hidden">> $lib.exp~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry ${output_objdir}/so_locations -o $lib~
-+	  $rm $lib.exp'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	# Commands to make compiler produce verbose output that lists
-+	# what "hidden" libraries, object files and flags are used when
-+	# linking a shared library.
-+	#
-+	# There doesn't appear to be a way to prevent this compiler from
-+	# explicitly linking system object files so we need to strip them
-+	# from the output so that they don't get included in the library
-+	# dependencies.
-+	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+	;;
-+      *)
-+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	  # Commands to make compiler produce verbose output that lists
-+	  # what "hidden" libraries, object files and flags are used when
-+	  # linking a shared library.
-+	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-+
-+	else
-+	  # FIXME: insert proper C++ library support
-+	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	fi
-+	;;
-+    esac
-+    ;;
-+  psos*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  sunos4*)
-+    case $cc_basename in
-+      CC*)
-+	# Sun C++ 4.x
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      lcc*)
-+	# Lucid
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+  solaris*)
-+    case $cc_basename in
-+      CC*)
-+	# Sun C++ 4.2, 5.x and Centerline C++
-+        _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
-+	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag}  -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+	$CC -G${allow_undefined_flag}  ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	case $host_os in
-+	  solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+	  *)
-+	    # The C++ compiler is used as linker so we must use $wl
-+	    # flag to pass the commands to the underlying system
-+	    # linker. We must also pass each convience library through
-+	    # to the system linker between allextract/defaultextract.
-+	    # The C++ compiler will combine linker options so we
-+	    # cannot just pass the convience library names through
-+	    # without $wl.
-+	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-+	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract'
-+	    ;;
-+	esac
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+	output_verbose_link_cmd='echo'
-+
-+	# Archives containing C++ object files must be created using
-+	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-+	# necessary to make sure instantiated templates are included
-+	# in the archive.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-+	;;
-+      gcx*)
-+	# Green Hills C++ Compiler
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+
-+	# The C++ compiler must be used to create the archive.
-+	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-+	;;
-+      *)
-+	# GNU C++ compiler with Solaris linker
-+	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-+	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+	  else
-+	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-+	    # platform.
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-+
-+	    # Commands to make compiler produce verbose output that lists
-+	    # what "hidden" libraries, object files and flags are used when
-+	    # linking a shared library.
-+	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-+	  fi
-+
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-+	fi
-+	;;
-+    esac
-+    ;;
-+  sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
-+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    runpath_var='LD_RUN_PATH'
-+
-+    case $cc_basename in
-+      CC*)
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	;;
-+    esac
-+    ;;
-+  sysv5* | sco3.2v5* | sco5v6*)
-+    # Note: We can NOT use -z defs as we might desire, because we do not
-+    # link with -lc, and that would cause any symbols used from libc to
-+    # always be unresolved, which means just about no library would
-+    # ever link correctly.  If we're not using GNU ld we use -z text
-+    # though, which does catch some bad symbols but isn't as heavy-handed
-+    # as -z defs.
-+    # For security reasons, it is highly recommended that you always
-+    # use absolute paths for naming shared libraries, and exclude the
-+    # DT_RUNPATH tag from executables and libraries.  But doing so
-+    # requires that you compile everything twice, which is a pain.
-+    # So that behaviour is only enabled if SCOABSPATH is set to a
-+    # non-empty value in the environment.  Most likely only useful for
-+    # creating official distributions of packages.
-+    # This is a hack until libtool officially supports absolute path
-+    # names for shared libraries.
-+    _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+    _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+    runpath_var='LD_RUN_PATH'
-+
-+    case $cc_basename in
-+      CC*)
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	;;
-+    esac
-+    ;;
-+  tandem*)
-+    case $cc_basename in
-+      NCC*)
-+	# NonStop-UX NCC 3.20
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+      *)
-+	# FIXME: insert proper C++ library support
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	;;
-+    esac
-+    ;;
-+  vxworks*)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+  *)
-+    # FIXME: insert proper C++ library support
-+    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+    ;;
-+esac
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-+
-+_LT_AC_TAGVAR(GCC, $1)="$GXX"
-+_LT_AC_TAGVAR(LD, $1)="$LD"
-+
-+AC_LIBTOOL_POSTDEP_PREDEP($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+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_CONFIG($1)
-+
-+AC_LANG_POP
-+CC=$lt_save_CC
-+LDCXX=$LD
-+LD=$lt_save_LD
-+GCC=$lt_save_GCC
-+with_gnu_ldcxx=$with_gnu_ld
-+with_gnu_ld=$lt_save_with_gnu_ld
-+lt_cv_path_LDCXX=$lt_cv_path_LD
-+lt_cv_path_LD=$lt_save_path_LD
-+lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-+lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-+])# AC_LIBTOOL_LANG_CXX_CONFIG
-+
-+# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-+# ------------------------------------
-+# Figure out "hidden" library dependencies from verbose
-+# compiler output when linking a shared library.
-+# Parse the compiler output and extract the necessary
-+# objects, libraries and library flags.
-+AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-+dnl we can't use the lt_simple_compile_test_code here,
-+dnl because it contains code intended for an executable,
-+dnl not a library.  It's possible we should let each
-+dnl tag define a new lt_????_link_test_code variable,
-+dnl but it's only used here...
-+ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-+int a;
-+void foo (void) { a = 0; }
-+EOF
-+],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-+class Foo
-+{
-+public:
-+  Foo (void) { a = 0; }
-+private:
-+  int a;
-+};
-+EOF
-+],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-+      subroutine foo
-+      implicit none
-+      integer*4 a
-+      a=0
-+      return
-+      end
-+EOF
-+],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-+public class foo {
-+  private int a;
-+  public void bar (void) {
-+    a = 0;
-+  }
-+};
-+EOF
-+])
-+dnl Parse the compiler output and extract the necessary
-+dnl objects, libraries and library flags.
-+if AC_TRY_EVAL(ac_compile); then
-+  # Parse the compiler output and extract the necessary
-+  # objects, libraries and library flags.
-+
-+  # Sentinel used to keep track of whether or not we are before
-+  # the conftest object file.
-+  pre_test_object_deps_done=no
-+
-+  # The `*' in the case matches for architectures that use `case' in
-+  # $output_verbose_cmd can trigger glob expansion during the loop
-+  # eval without this substitution.
-+  output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
-+
-+  for p in `eval $output_verbose_link_cmd`; do
-+    case $p in
-+
-+    -L* | -R* | -l*)
-+       # Some compilers place space between "-{L,R}" and the path.
-+       # Remove the space.
-+       if test $p = "-L" \
-+	  || test $p = "-R"; then
-+	 prev=$p
-+	 continue
-+       else
-+	 prev=
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 case $p in
-+	 -L* | -R*)
-+	   # Internal compiler library paths should come after those
-+	   # provided the user.  The postdeps already come after the
-+	   # user supplied libs so there is no need to process them.
-+	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-+	   else
-+	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-+	   fi
-+	   ;;
-+	 # The "-l" case would never come before the object being
-+	 # linked, so don't bother handling this case.
-+	 esac
-+       else
-+	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-+	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-+	 else
-+	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-+	 fi
-+       fi
-+       ;;
-+
-+    *.$objext)
-+       # This assumes that the test object file only shows up
-+       # once in the compiler output.
-+       if test "$p" = "conftest.$objext"; then
-+	 pre_test_object_deps_done=yes
-+	 continue
-+       fi
-+
-+       if test "$pre_test_object_deps_done" = no; then
-+	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-+	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-+	 else
-+	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-+	 fi
-+       else
-+	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-+	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-+	 else
-+	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-+	 fi
-+       fi
-+       ;;
-+
-+    *) ;; # Ignore the rest.
- 
--dgux*)
--  version_type=linux
--  need_lib_prefix=no
--  need_version=no
--  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
--  soname_spec='${libname}${release}.so$major'
--  shlibpath_var=LD_LIBRARY_PATH
--  ;;
-+    esac
-+  done
- 
--sysv4*MP*)
--  if test -d /usr/nec ;then
--    version_type=linux
--    library_names_spec='$libname.so.$versuffix $libname.so.$major $libname.so'
--    soname_spec='$libname.so.$major'
--    shlibpath_var=LD_LIBRARY_PATH
--  fi
-+  # Clean up.
-+  rm -f a.out a.exe
-+else
-+  echo "libtool.m4: error: problem compiling $1 test program"
-+fi
-+
-+$rm -f confest.$objext
-+
-+# PORTME: override above test on systems where it is broken
-+ifelse([$1],[CXX],
-+[case $host_os in
-+interix3*)
-+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
-+  # hack all around it, let's just trust "g++" to DTRT.
-+  _LT_AC_TAGVAR(predep_objects,$1)=
-+  _LT_AC_TAGVAR(postdep_objects,$1)=
-+  _LT_AC_TAGVAR(postdeps,$1)=
-   ;;
- 
--*)
--  dynamic_linker=no
-+solaris*)
-+  case $cc_basename in
-+  CC*)
-+    # Adding this requires a known-good setup of shared libraries for
-+    # Sun compiler versions before 5.6, else PIC objects from an old
-+    # archive will be linked into the output, leading to subtle bugs.
-+    _LT_AC_TAGVAR(postdeps,$1)='-lCstd -lCrun'
-+    ;;
-+  esac
-   ;;
- esac
--AC_MSG_RESULT([$dynamic_linker])
--test "$dynamic_linker" = no && can_build_shared=no
-+])
-+
-+case " $_LT_AC_TAGVAR(postdeps, $1) " in
-+*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-+esac
-+])# AC_LIBTOOL_POSTDEP_PREDEP
-+
-+# AC_LIBTOOL_LANG_F77_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-+AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-+[AC_REQUIRE([AC_PROG_F77])
-+AC_LANG_PUSH(Fortran 77)
-+
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+_LT_AC_TAGVAR(always_export_symbols, $1)=no
-+_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_direct, $1)=no
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+_LT_AC_TAGVAR(module_cmds, $1)=
-+_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+_LT_AC_TAGVAR(no_undefined_flag, $1)=
-+_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+
-+# Source file extension for f77 test sources.
-+ac_ext=f
-+
-+# Object file extension for compiled f77 test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="      program t\n      end\n"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${F77-"f77"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
- 
--# Report the final consequences.
- AC_MSG_CHECKING([if libtool supports shared libraries])
- AC_MSG_RESULT([$can_build_shared])
- 
-@@ -2472,7 +3940,7 @@
- 
- # On AIX, shared libraries and static libraries use the same namespace, and
- # are all built from PIC.
--case "$host_os" in
-+case $host_os in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
-@@ -2480,8 +3948,7 @@
-     postinstall_cmds='$RANLIB $lib'
-   fi
-   ;;
--
--aix4*)
-+aix4* | aix5*)
-   if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-     test "$enable_shared" = yes && enable_static=no
-   fi
-@@ -2494,111 +3961,201 @@
- test "$enable_shared" = yes || enable_static=yes
- AC_MSG_RESULT([$enable_static])
- 
--if test "$hardcode_action" = relink; then
--  # Fast installation is not supported
--  enable_fast_install=no
--elif test "$shlibpath_overrides_runpath" = yes ||
--     test "$enable_shared" = no; then
--  # Fast installation is not necessary
--  enable_fast_install=needless
--fi
-+_LT_AC_TAGVAR(GCC, $1)="$G77"
-+_LT_AC_TAGVAR(LD, $1)="$LD"
- 
--variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
--if test "$GCC" = yes; then
--  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
--fi
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+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_DLOPEN_SELF
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_POP
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_F77_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_GCJ_CONFIG
-+# --------------------------
-+# Ensure that the configuration vars for the C compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-+AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-+[AC_LANG_SAVE
-+
-+# Source file extension for Java test sources.
-+ac_ext=java
-+
-+# Object file extension for compiled Java test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code="class foo {}\n"
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }\n'
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${GCJ-"gcj"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+
-+# GCJ did not exist at the time GCC didn't implicitly link libc in.
-+_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+
-+_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-+
-+AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-+AC_LIBTOOL_PROG_COMPILER_PIC($1)
-+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_CONFIG($1)
-+
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_GCJ_CONFIG
-+
-+
-+# AC_LIBTOOL_LANG_RC_CONFIG
-+# -------------------------
-+# Ensure that the configuration vars for the Windows resource compiler are
-+# suitably defined.  Those variables are subsequently used by
-+# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-+AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-+AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-+[AC_LANG_SAVE
-+
-+# Source file extension for RC test sources.
-+ac_ext=rc
-+
-+# Object file extension for compiled RC test sources.
-+objext=o
-+_LT_AC_TAGVAR(objext, $1)=$objext
-+
-+# Code to be used in simple compile tests
-+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-+
-+# Code to be used in simple link tests
-+lt_simple_link_test_code="$lt_simple_compile_test_code"
-+
-+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-+_LT_AC_SYS_COMPILER
-+
-+# save warnings/boilerplate of simple test code
-+_LT_COMPILER_BOILERPLATE
-+_LT_LINKER_BOILERPLATE
-+
-+# Allow CC to be a program name with arguments.
-+lt_save_CC="$CC"
-+CC=${RC-"windres"}
-+compiler=$CC
-+_LT_AC_TAGVAR(compiler, $1)=$CC
-+_LT_CC_BASENAME([$compiler])
-+_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-+
-+AC_LIBTOOL_CONFIG($1)
-+
-+AC_LANG_RESTORE
-+CC="$lt_save_CC"
-+])# AC_LIBTOOL_LANG_RC_CONFIG
- 
--if test "$enable_shared" = yes && test "$GCC" = yes; then
--  case $archive_cmds in
--  *'~'*)
--    # FIXME: we may have to deal with multi-command sequences.
--    ;;
--  '$CC '*)
--    # Test whether the compiler implicitly links with -lc since on some
--    # systems, -lgcc has to come before -lc. If gcc already passes -lc
--    # to ld, don't add -lc before -lgcc.
--    AC_MSG_CHECKING([whether -lc should be explicitly linked in])
--    AC_CACHE_VAL([lt_cv_archive_cmds_need_lc],
--    [$rm conftest*
--    echo 'static int dummy;' > conftest.$ac_ext
--
--    if AC_TRY_EVAL(ac_compile); then
--      soname=conftest
--      lib=conftest
--      libobjs=conftest.$ac_objext
--      deplibs=
--      wl=$lt_cv_prog_cc_wl
--      compiler_flags=-v
--      linker_flags=-v
--      verstring=
--      output_objdir=.
--      libname=conftest
--      save_allow_undefined_flag=$allow_undefined_flag
--      allow_undefined_flag=
--      if AC_TRY_EVAL(archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
--      then
--	lt_cv_archive_cmds_need_lc=no
--      else
--	lt_cv_archive_cmds_need_lc=yes
--      fi
--      allow_undefined_flag=$save_allow_undefined_flag
--    else
--      cat conftest.err 1>&5
--    fi])
--    AC_MSG_RESULT([$lt_cv_archive_cmds_need_lc])
--    ;;
--  esac
--fi
--need_lc=${lt_cv_archive_cmds_need_lc-yes}
- 
--# The second clause should only fire when bootstrapping the
-+# AC_LIBTOOL_CONFIG([TAGNAME])
-+# ----------------------------
-+# If TAGNAME is not passed, then create an initial libtool script
-+# with a default configuration from the untagged config vars.  Otherwise
-+# add code to config.status for appending the configuration named by
-+# TAGNAME from the matching tagged config vars.
-+AC_DEFUN([AC_LIBTOOL_CONFIG],
-+[# The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
- # with your package, and you will get complaints that there are
- # no rules to generate ltmain.sh.
- if test -f "$ltmain"; then
--  :
--else
--  # 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"
--fi
--
--if test -f "$ltmain"; then
--  trap "$rm \"${ofile}T\"; exit 1" 1 2 15
--  $rm -f "${ofile}T"
--
--  echo creating $ofile
--
-+  # See if we are running on zsh, and set the options which allow our commands through
-+  # without removal of \ escapes.
-+  if test -n "${ZSH_VERSION+set}" ; then
-+    setopt NO_GLOB_SUBST
-+  fi
-   # 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 SED \
--    AR AR_FLAGS CC LD LN_S NM SHELL \
--    reload_flag reload_cmds wl \
--    pic_flag link_static_flag no_builtin_flag export_dynamic_flag_spec \
--    thread_safe_flag_spec whole_archive_flag_spec libname_spec \
--    library_names_spec soname_spec \
--    RANLIB old_archive_cmds old_archive_from_new_cmds old_postinstall_cmds \
--    old_postuninstall_cmds archive_cmds archive_expsym_cmds postinstall_cmds \
--    postuninstall_cmds extract_expsyms_cmds old_archive_from_expsyms_cmds \
--    old_striplib striplib file_magic_cmd export_symbols_cmds \
--    deplibs_check_method allow_undefined_flag no_undefined_flag \
--    finish_cmds finish_eval global_symbol_pipe global_symbol_to_cdecl \
--    global_symbol_to_c_name_address \
--    hardcode_libdir_flag_spec hardcode_libdir_separator  \
-+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
-+    SED SHELL STRIP \
-+    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-+    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-+    deplibs_check_method reload_flag reload_cmds need_locks \
-+    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-+    lt_cv_sys_global_symbol_to_c_name_address \
-     sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
--    compiler_c_o compiler_o_lo need_locks exclude_expsyms include_expsyms; do
-+    old_postinstall_cmds old_postuninstall_cmds \
-+    _LT_AC_TAGVAR(compiler, $1) \
-+    _LT_AC_TAGVAR(CC, $1) \
-+    _LT_AC_TAGVAR(LD, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-+    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-+    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-+    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-+    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-+    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-+    _LT_AC_TAGVAR(predep_objects, $1) \
-+    _LT_AC_TAGVAR(postdep_objects, $1) \
-+    _LT_AC_TAGVAR(predeps, $1) \
-+    _LT_AC_TAGVAR(postdeps, $1) \
-+    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-+    _LT_AC_TAGVAR(archive_cmds, $1) \
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-+    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-+    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-+    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-+    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-+    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-+    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-+    _LT_AC_TAGVAR(module_cmds, $1) \
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-+    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-+    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-+    _LT_AC_TAGVAR(include_expsyms, $1); do
- 
-     case $var in
--    reload_cmds | old_archive_cmds | old_archive_from_new_cmds | \
--    old_postinstall_cmds | old_postuninstall_cmds | \
--    export_symbols_cmds | archive_cmds | archive_expsym_cmds | \
--    extract_expsyms_cmds | old_archive_from_expsyms_cmds | \
-+    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-+    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-+    _LT_AC_TAGVAR(archive_cmds, $1) | \
-+    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-+    _LT_AC_TAGVAR(module_cmds, $1) | \
-+    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-+    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-+    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-     postinstall_cmds | postuninstall_cmds | \
--    finish_cmds | sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-+    old_postinstall_cmds | old_postuninstall_cmds | \
-+    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-       # Double-quote double-evaled strings.
-       eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-       ;;
-@@ -2608,14 +4165,31 @@
-     esac
-   done
- 
--  cat <<__EOF__ > "${ofile}T"
--#! $SHELL
-+  case $lt_echo in
-+  *'\[$]0 --fallback-echo"')
-+    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-+    ;;
-+  esac
-+
-+ifelse([$1], [],
-+  [cfgfile="${ofile}T"
-+  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-+  $rm -f "$cfgfile"
-+  AC_MSG_NOTICE([creating $ofile])],
-+  [cfgfile="$ofile"])
-+
-+  cat <<__EOF__ >> "$cfgfile"
-+ifelse([$1], [],
-+[#! $SHELL
- 
--# `$echo "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-+# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
- # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
- #
--# Copyright (C) 1996-2000 Free Software Foundation, Inc.
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Free Software Foundation, Inc.
-+#
-+# This file is part of GNU Libtool:
- # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
- #
- # This program is free software; you can redistribute it and/or modify
-@@ -2630,24 +4204,28 @@
- #
- # You should have received a copy of the GNU General Public License
- # along with this program; if not, write to the Free Software
--# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- #
- # As a special exception to the GNU General Public License, if you
- # distribute this file as part of a program that contains a
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
--# A sed that does not truncate output.
-+# A sed program that does not truncate output.
- SED=$lt_SED
- 
- # Sed that helps us avoid accidentally triggering echo(1) options like -n.
--Xsed="${SED} -e s/^X//"
-+Xsed="$SED -e 1s/^X//"
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
--# ### BEGIN LIBTOOL CONFIG
-+# The names of the tagged configurations supported by this script.
-+available_tags=
-+
-+# ### BEGIN LIBTOOL CONFIG],
-+[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
- 
- # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- 
-@@ -2661,7 +4239,10 @@
- build_old_libs=$enable_static
- 
- # Whether or not to add -lc for building shared libraries.
--build_libtool_need_lc=$need_lc
-+build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-+
-+# Whether or not to disallow shared libs when runtime libs are static
-+allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
- 
- # Whether or not to optimize for fast installation.
- fast_install=$enable_fast_install
-@@ -2669,6 +4250,12 @@
- # The host system.
- host_alias=$host_alias
- host=$host
-+host_os=$host_os
-+
-+# The build system.
-+build_alias=$build_alias
-+build=$build
-+build_os=$build_os
- 
- # An echo program that does not interpret backslashes.
- echo=$lt_echo
-@@ -2677,14 +4264,23 @@
- AR=$lt_AR
- AR_FLAGS=$lt_AR_FLAGS
- 
--# The default C compiler.
--CC=$lt_CC
-+# A C compiler.
-+LTCC=$lt_LTCC
-+
-+# LTCC compiler flags.
-+LTCFLAGS=$lt_LTCFLAGS
-+
-+# A language-specific compiler.
-+CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
- 
- # Is the compiler the GNU C compiler?
--with_gcc=$GCC
-+with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-+
-+# An ERE matcher.
-+EGREP=$lt_EGREP
- 
- # The linker used to build libraries.
--LD=$lt_LD
-+LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
- 
- # Whether we need hard or soft links.
- LN_S=$lt_LN_S
-@@ -2693,7 +4289,7 @@
- NM=$lt_NM
- 
- # A symbol stripping program
--STRIP=$STRIP
-+STRIP=$lt_STRIP
- 
- # Used to examine libraries when file_magic_cmd begins "file"
- MAGIC_CMD=$MAGIC_CMD
-@@ -2710,991 +4306,1996 @@
- # The name of the directory that contains temporary libtool files.
- objdir=$objdir
- 
--# How to create reloadable object files.
--reload_flag=$lt_reload_flag
--reload_cmds=$lt_reload_cmds
-+# How to create reloadable object files.
-+reload_flag=$lt_reload_flag
-+reload_cmds=$lt_reload_cmds
-+
-+# How to pass a linker flag through the compiler.
-+wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-+
-+# Object file suffix (normally "o").
-+objext="$ac_objext"
-+
-+# Old archive suffix (normally "a").
-+libext="$libext"
-+
-+# Shared library suffix (normally ".so").
-+shrext_cmds='$shrext_cmds'
-+
-+# Executable file suffix (normally "").
-+exeext="$exeext"
-+
-+# Additional compiler flags for building library objects.
-+pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-+pic_mode=$pic_mode
-+
-+# What is the maximum length of a command?
-+max_cmd_len=$lt_cv_sys_max_cmd_len
-+
-+# Does compiler simultaneously support -c and -o options?
-+compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-+
-+# Must we lock files when doing compilation?
-+need_locks=$lt_need_locks
-+
-+# Do we need the lib prefix for modules?
-+need_lib_prefix=$need_lib_prefix
-+
-+# Do we need a version for libraries?
-+need_version=$need_version
-+
-+# Whether dlopen is supported.
-+dlopen_support=$enable_dlopen
-+
-+# Whether dlopen of programs is supported.
-+dlopen_self=$enable_dlopen_self
-+
-+# Whether dlopen of statically linked programs is supported.
-+dlopen_self_static=$enable_dlopen_self_static
-+
-+# Compiler flag to prevent dynamic linking.
-+link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-+
-+# Compiler flag to turn off builtin functions.
-+no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-+
-+# Compiler flag to allow reflexive dlopens.
-+export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-+
-+# Compiler flag to generate shared objects directly from archives.
-+whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-+
-+# Compiler flag to generate thread-safe objects.
-+thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-+
-+# Library versioning type.
-+version_type=$version_type
-+
-+# Format of library name prefix.
-+libname_spec=$lt_libname_spec
-+
-+# List of archive names.  First name is the real one, the rest are links.
-+# The last name is the one that the linker finds with -lNAME.
-+library_names_spec=$lt_library_names_spec
-+
-+# The coded name of the library, if different from the real name.
-+soname_spec=$lt_soname_spec
-+
-+# Commands used to build and install an old-style archive.
-+RANLIB=$lt_RANLIB
-+old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-+old_postinstall_cmds=$lt_old_postinstall_cmds
-+old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+
-+# Create an old-style archive from a shared archive.
-+old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-+
-+# Create a temporary old-style archive to link instead of a shared archive.
-+old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-+
-+# Commands used to build and install a shared archive.
-+archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-+archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-+postinstall_cmds=$lt_postinstall_cmds
-+postuninstall_cmds=$lt_postuninstall_cmds
-+
-+# Commands used to build a loadable module (assumed same as above if empty)
-+module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-+module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-+
-+# Commands to strip libraries.
-+old_striplib=$lt_old_striplib
-+striplib=$lt_striplib
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-+
-+# Dependencies to place before the objects being linked to create a
-+# shared library.
-+predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-+
-+# Dependencies to place after the objects being linked to create a
-+# shared library.
-+postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-+
-+# The library search path used internally by the compiler when linking
-+# a shared library.
-+compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-+
-+# Method to check whether dependent libraries are shared objects.
-+deplibs_check_method=$lt_deplibs_check_method
-+
-+# Command to use when deplibs_check_method == file_magic.
-+file_magic_cmd=$lt_file_magic_cmd
-+
-+# Flag that allows shared libraries with undefined symbols to be built.
-+allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-+
-+# Flag that forces no undefined symbols.
-+no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-+
-+# Commands used to finish a libtool library installation in a directory.
-+finish_cmds=$lt_finish_cmds
-+
-+# Same as above, but a single script fragment to be evaled but not shown.
-+finish_eval=$lt_finish_eval
-+
-+# Take the output of nm and produce a listing of raw symbols and C names.
-+global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-+
-+# Transform the output of nm in a proper C declaration
-+global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-+
-+# Transform the output of nm in a C name address pair
-+global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-+
-+# This is the shared library runtime path variable.
-+runpath_var=$runpath_var
-+
-+# This is the shared library path variable.
-+shlibpath_var=$shlibpath_var
-+
-+# Is shlibpath searched before the hard-coded library search path?
-+shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+
-+# How to hardcode a shared library path into an executable.
-+hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-+
-+# Whether we should hardcode library paths into libraries.
-+hardcode_into_libs=$hardcode_into_libs
-+
-+# Flag to hardcode \$libdir into a binary during linking.
-+# This must work even if \$libdir does not exist.
-+hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-+
-+# If ld is used when linking, flag to hardcode \$libdir into
-+# a binary during linking. This must work even if \$libdir does
-+# not exist.
-+hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-+
-+# Whether we need a single -rpath flag with a separated argument.
-+hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-+
-+# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-+
-+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-+# resulting binary.
-+hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-+
-+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-+# the resulting binary.
-+hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-+
-+# Set to yes if building a shared library automatically hardcodes DIR into the library
-+# and all subsequent libraries and executables linked against it.
-+hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-+
-+# Variables whose values should be saved in libtool wrapper scripts and
-+# restored at relink time.
-+variables_saved_for_relink="$variables_saved_for_relink"
-+
-+# Whether libtool must link a program against all its dependency libraries.
-+link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-+
-+# Compile-time system search path for libraries
-+sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+
-+# Run-time system search path for libraries
-+sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+
-+# Fix the shell variable \$srcfile for the compiler.
-+fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-+
-+# Set to yes if exported symbols are required.
-+always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-+
-+# The commands to list exported symbols.
-+export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-+
-+# The commands to extract the exported symbol list from a shared archive.
-+extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+
-+# Symbols that should not be listed in the preloaded symbols.
-+exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-+
-+# Symbols that must always be exported.
-+include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-+
-+ifelse([$1],[],
-+[# ### END LIBTOOL CONFIG],
-+[# ### END LIBTOOL TAG CONFIG: $tagname])
-+
-+__EOF__
-+
-+ifelse([$1],[], [
-+  case $host_os in
-+  aix3*)
-+    cat <<\EOF >> "$cfgfile"
-+
-+# AIX sometimes has problems with the GCC collect2 program.  For some
-+# reason, if we set the COLLECT_NAMES environment variable, the problems
-+# vanish in a puff of smoke.
-+if test "X${COLLECT_NAMES+set}" != Xset; then
-+  COLLECT_NAMES=
-+  export COLLECT_NAMES
-+fi
-+EOF
-+    ;;
-+  esac
-+
-+  # We use sed instead of cat because bash on DJGPP gets confused if
-+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-+  # text mode, it properly converts lines to CR/LF.  This bash problem
-+  # is reportedly fixed, but why not run on old versions too?
-+  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
- 
--# How to pass a linker flag through the compiler.
--wl=$lt_wl
-+  mv -f "$cfgfile" "$ofile" || \
-+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-+  chmod +x "$ofile"
-+])
-+else
-+  # 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.
-+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+  if test -f "$ltmain_in"; then
-+    test -f Makefile && make "$ltmain"
-+  fi
-+fi
-+])# AC_LIBTOOL_CONFIG
- 
--# Object file suffix (normally "o").
--objext="$ac_objext"
- 
--# Old archive suffix (normally "a").
--libext="$libext"
-+# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-+# -------------------------------------------
-+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-+[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
- 
--# Executable file suffix (normally "").
--exeext="$exeext"
-+_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
- 
--# Additional compiler flags for building library objects.
--pic_flag=$lt_pic_flag
--pic_mode=$pic_mode
-+if test "$GCC" = yes; then
-+  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
- 
--# Does compiler simultaneously support -c and -o options?
--compiler_c_o=$lt_compiler_c_o
-+  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-+    lt_cv_prog_compiler_rtti_exceptions,
-+    [-fno-rtti -fno-exceptions], [],
-+    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-+fi
-+])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
- 
--# Can we write directly to a .lo ?
--compiler_o_lo=$lt_compiler_o_lo
- 
--# Must we lock files when doing compilation ?
--need_locks=$lt_need_locks
-+# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-+# ---------------------------------
-+AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-+[AC_REQUIRE([AC_CANONICAL_HOST])
-+AC_REQUIRE([AC_PROG_NM])
-+AC_REQUIRE([AC_OBJEXT])
-+# Check for command to grab the raw symbol name followed by C symbol from nm.
-+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-+[
-+# These are sane defaults that work on at least a few old systems.
-+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
- 
--# Do we need the lib prefix for modules?
--need_lib_prefix=$need_lib_prefix
-+# Character class describing NM global symbol codes.
-+symcode='[[BCDEGRST]]'
- 
--# Do we need a version for libraries?
--need_version=$need_version
-+# Regexp to match symbols that can be accessed directly from C.
-+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
- 
--# Whether dlopen is supported.
--dlopen_support=$enable_dlopen
-+# Transform an extracted symbol line into a proper C declaration
-+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
- 
--# Whether dlopen of programs is supported.
--dlopen_self=$enable_dlopen_self
-+# Transform an extracted symbol line into symbol name and symbol address
-+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
- 
--# Whether dlopen of statically linked programs is supported.
--dlopen_self_static=$enable_dlopen_self_static
-+# Define system-specific variables.
-+case $host_os in
-+aix*)
-+  symcode='[[BCDT]]'
-+  ;;
-+cygwin* | mingw* | pw32*)
-+  symcode='[[ABCDGISTW]]'
-+  ;;
-+hpux*) # Its linker distinguishes data from code symbols
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDEGRST]]'
-+  fi
-+  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  ;;
-+linux* | k*bsd*-gnu)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[[ABCDGIRSTW]]'
-+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  fi
-+  ;;
-+irix* | nonstopux*)
-+  symcode='[[BCDEGRST]]'
-+  ;;
-+osf*)
-+  symcode='[[BCDEGQRST]]'
-+  ;;
-+solaris*)
-+  symcode='[[BDRT]]'
-+  ;;
-+sco3.2v5*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv4.2uw2*)
-+  symcode='[[DT]]'
-+  ;;
-+sysv5* | sco5v6* | unixware* | OpenUNIX*)
-+  symcode='[[ABDT]]'
-+  ;;
-+sysv4)
-+  symcode='[[DFNSTU]]'
-+  ;;
-+esac
- 
--# Compiler flag to prevent dynamic linking.
--link_static_flag=$lt_link_static_flag
-+# Handle CRLF in mingw tool chain
-+opt_cr=
-+case $build_os in
-+mingw*)
-+  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-+  ;;
-+esac
- 
--# Compiler flag to turn off builtin functions.
--no_builtin_flag=$lt_no_builtin_flag
-+# If we're using GNU nm, then use its standard symbol codes.
-+case `$NM -V 2>&1` in
-+*GNU* | *'with BFD'*)
-+  symcode='[[ABCDGIRSTW]]' ;;
-+esac
- 
--# Compiler flag to allow reflexive dlopens.
--export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-+# Try without a prefix undercore, then with it.
-+for ac_symprfx in "" "_"; do
- 
--# Compiler flag to generate shared objects directly from archives.
--whole_archive_flag_spec=$lt_whole_archive_flag_spec
-+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
-+  symxfrm="\\1 $ac_symprfx\\2 \\2"
- 
--# Compiler flag to generate thread-safe objects.
--thread_safe_flag_spec=$lt_thread_safe_flag_spec
-+  # Write the raw and C identifiers.
-+  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
- 
--# Library versioning type.
--version_type=$version_type
-+  # Check to see that the pipe works correctly.
-+  pipe_works=no
- 
--# Format of library name prefix.
--libname_spec=$lt_libname_spec
-+  rm -f conftest*
-+  cat > conftest.$ac_ext <<EOF
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+char nm_test_var;
-+void nm_test_func(){}
-+#ifdef __cplusplus
-+}
-+#endif
-+int main(){nm_test_var='a';nm_test_func();return(0);}
-+EOF
- 
--# List of archive names.  First name is the real one, the rest are links.
--# The last name is the one that the linker finds with -lNAME.
--library_names_spec=$lt_library_names_spec
-+  if AC_TRY_EVAL(ac_compile); then
-+    # Now try to grab the symbols.
-+    nlist=conftest.nm
-+    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-+      # Try sorting and uniquifying the output.
-+      if sort "$nlist" | uniq > "$nlist"T; then
-+	mv -f "$nlist"T "$nlist"
-+      else
-+	rm -f "$nlist"T
-+      fi
- 
--# The coded name of the library, if different from the real name.
--soname_spec=$lt_soname_spec
-+      # Make sure that we snagged all the symbols we need.
-+      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-+	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-+	  cat <<EOF > conftest.$ac_ext
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
- 
--# Commands used to build and install an old-style archive.
--RANLIB=$lt_RANLIB
--old_archive_cmds=$lt_old_archive_cmds
--old_postinstall_cmds=$lt_old_postinstall_cmds
--old_postuninstall_cmds=$lt_old_postuninstall_cmds
-+EOF
-+	  # Now generate the symbol file.
-+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
- 
--# Create an old-style archive from a shared archive.
--old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-+	  cat <<EOF >> conftest.$ac_ext
-+#if defined (__STDC__) && __STDC__
-+# define lt_ptr_t void *
-+#else
-+# define lt_ptr_t char *
-+# define const
-+#endif
- 
--# Create a temporary old-style archive to link instead of a shared archive.
--old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-+/* The mapping between symbol names and symbols. */
-+const struct {
-+  const char *name;
-+  lt_ptr_t address;
-+}
-+lt_preloaded_symbols[[]] =
-+{
-+EOF
-+	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-+	  cat <<\EOF >> conftest.$ac_ext
-+  {0, (lt_ptr_t) 0}
-+};
- 
--# Commands used to build and install a shared archive.
--archive_cmds=$lt_archive_cmds
--archive_expsym_cmds=$lt_archive_expsym_cmds
--postinstall_cmds=$lt_postinstall_cmds
--postuninstall_cmds=$lt_postuninstall_cmds
-+#ifdef __cplusplus
-+}
-+#endif
-+EOF
-+	  # Now try linking the two files.
-+	  mv conftest.$ac_objext conftstm.$ac_objext
-+	  lt_save_LIBS="$LIBS"
-+	  lt_save_CFLAGS="$CFLAGS"
-+	  LIBS="conftstm.$ac_objext"
-+	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-+	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-+	    pipe_works=yes
-+	  fi
-+	  LIBS="$lt_save_LIBS"
-+	  CFLAGS="$lt_save_CFLAGS"
-+	else
-+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-+	fi
-+      else
-+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-+      fi
-+    else
-+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-+    fi
-+  else
-+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-+    cat conftest.$ac_ext >&5
-+  fi
-+  rm -f conftest* conftst*
- 
--# Commands to strip libraries.
--old_striplib=$lt_old_striplib
--striplib=$lt_striplib
-+  # Do not use the global_symbol_pipe unless it works.
-+  if test "$pipe_works" = yes; then
-+    break
-+  else
-+    lt_cv_sys_global_symbol_pipe=
-+  fi
-+done
-+])
-+if test -z "$lt_cv_sys_global_symbol_pipe"; then
-+  lt_cv_sys_global_symbol_to_cdecl=
-+fi
-+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-+  AC_MSG_RESULT(failed)
-+else
-+  AC_MSG_RESULT(ok)
-+fi
-+]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
- 
--# Method to check whether dependent libraries are shared objects.
--deplibs_check_method=$lt_deplibs_check_method
- 
--# Command to use when deplibs_check_method == file_magic.
--file_magic_cmd=$lt_file_magic_cmd
-+# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-+# ---------------------------------------
-+AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-+[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-+_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
- 
--# Flag that allows shared libraries with undefined symbols to be built.
--allow_undefined_flag=$lt_allow_undefined_flag
-+AC_MSG_CHECKING([for $compiler option to produce PIC])
-+ ifelse([$1],[CXX],[
-+  # C++ specific cases for pic, static, wl, etc.
-+  if test "$GXX" = yes; then
-+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 
--# Flag that forces no undefined symbols.
--no_undefined_flag=$lt_no_undefined_flag
-+    case $host_os in
-+    aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+      ;;
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
-+    mingw* | os2* | pw32*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      ;;
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
-+    *djgpp*)
-+      # DJGPP does not support shared libraries at all
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+      ;;
-+    interix3*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
-+    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
-+      case $host_cpu in
-+      hppa*64*|ia64*)
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
-+    *)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+      ;;
-+    esac
-+  else
-+    case $host_os in
-+      aix4* | aix5*)
-+	# All AIX code is PIC.
-+	if test "$host_cpu" = ia64; then
-+	  # AIX 5 now supports IA64 processor
-+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	else
-+	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+	fi
-+	;;
-+      chorus*)
-+	case $cc_basename in
-+	cxch68*)
-+	  # Green Hills C++ Compiler
-+	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-+	  ;;
-+	esac
-+	;;
-+       darwin*)
-+         # PIC is the default on this platform
-+         # Common symbols not allowed in MH_DYLIB files
-+         case $cc_basename in
-+           xlc*)
-+           _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+           _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+           ;;
-+         esac
-+       ;;
-+      dgux*)
-+	case $cc_basename in
-+	  ec++*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
-+	  ghcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      freebsd* | dragonfly*)
-+	# FreeBSD uses GNU C++
-+	;;
-+      hpux9* | hpux10* | hpux11*)
-+	case $cc_basename in
-+	  CC*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+	    if test "$host_cpu" != ia64; then
-+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	    fi
-+	    ;;
-+	  aCC*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+	    case $host_cpu in
-+	    hppa*64*|ia64*)
-+	      # +Z the default
-+	      ;;
-+	    *)
-+	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	      ;;
-+	    esac
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      interix*)
-+	# This is c89, which is MS Visual C++ (no shared libs)
-+	# Anyone wants to do a port?
-+	;;
-+      irix5* | irix6* | nonstopux*)
-+	case $cc_basename in
-+	  CC*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    # CC pic flag -KPIC is the default.
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      linux* | k*bsd*-gnu)
-+	case $cc_basename in
-+	  KCC*)
-+	    # KAI C++ Compiler
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	    ;;
-+	  icpc* | ecpc*)
-+	    # Intel C++
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+	    ;;
-+	  pgCC*)
-+	    # Portland Group C++ compiler.
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  cxx*)
-+	    # Compaq C++
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      lynxos*)
-+	;;
-+      m88k*)
-+	;;
-+      mvs*)
-+	case $cc_basename in
-+	  cxx*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      netbsd* | netbsdelf*-gnu)
-+	;;
-+      osf3* | osf4* | osf5*)
-+	case $cc_basename in
-+	  KCC*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-+	    ;;
-+	  RCC*)
-+	    # Rational C++ 2.4.1
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  cxx*)
-+	    # Digital/Compaq C++
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    # Make sure the PIC flag is empty.  It appears that all Alpha
-+	    # Linux and Compaq Tru64 Unix objects are PIC.
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      psos*)
-+	;;
-+      solaris*)
-+	case $cc_basename in
-+	  CC*)
-+	    # Sun C++ 4.2, 5.x and Centerline C++
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+	    ;;
-+	  gcx*)
-+	    # Green Hills C++ Compiler
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sunos4*)
-+	case $cc_basename in
-+	  CC*)
-+	    # Sun C++ 4.x
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	  lcc*)
-+	    # Lucid
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      tandem*)
-+	case $cc_basename in
-+	  NCC*)
-+	    # NonStop-UX NCC 3.20
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    ;;
-+	  *)
-+	    ;;
-+	esac
-+	;;
-+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+	case $cc_basename in
-+	  CC*)
-+	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+	    ;;
-+	esac
-+	;;
-+      vxworks*)
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+	;;
-+    esac
-+  fi
-+],
-+[
-+  if test "$GCC" = yes; then
-+    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
- 
--# Commands used to finish a libtool library installation in a directory.
--finish_cmds=$lt_finish_cmds
-+    case $host_os in
-+      aix*)
-+      # All AIX code is PIC.
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
- 
--# Same as above, but a single script fragment to be evaled but not shown.
--finish_eval=$lt_finish_eval
-+    amigaos*)
-+      # FIXME: we need at least 68020 code to build shared libraries, but
-+      # adding the `-m68020' flag to GCC prevents building anything better,
-+      # like `-m68040'.
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-+      ;;
- 
--# Take the output of nm and produce a listing of raw symbols and C names.
--global_symbol_pipe=$lt_global_symbol_pipe
-+    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-+      # PIC is the default for these OSes.
-+      ;;
- 
--# Transform the output of nm in a proper C declaration
--global_symbol_to_cdecl=$lt_global_symbol_to_cdecl
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      ;;
- 
--# Transform the output of nm in a C name address pair
--global_symbol_to_c_name_address=$lt_global_symbol_to_c_name_address
-+    darwin* | rhapsody*)
-+      # PIC is the default on this platform
-+      # Common symbols not allowed in MH_DYLIB files
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-+      ;;
- 
--# This is the shared library runtime path variable.
--runpath_var=$runpath_var
-+    interix3*)
-+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
-+      # Instead, we relocate shared libraries at runtime.
-+      ;;
- 
--# This is the shared library path variable.
--shlibpath_var=$shlibpath_var
-+    msdosdjgpp*)
-+      # Just because we use GCC doesn't mean we suddenly get shared libraries
-+      # on systems that don't support them.
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      enable_shared=no
-+      ;;
- 
--# Is shlibpath searched before the hard-coded library search path?
--shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-+      fi
-+      ;;
- 
--# How to hardcode a shared library path into an executable.
--hardcode_action=$hardcode_action
-+    hpux*)
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
-+      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+	;;
-+      esac
-+      ;;
- 
--# Whether we should hardcode library paths into libraries.
--hardcode_into_libs=$hardcode_into_libs
-+    *)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-+      ;;
-+    esac
-+  else
-+    # PORTME Check for flag to pass linker flags through the system compiler.
-+    case $host_os in
-+    aix*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      if test "$host_cpu" = ia64; then
-+	# AIX 5 now supports IA64 processor
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      else
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-+      fi
-+      ;;
-+      darwin*)
-+        # PIC is the default on this platform
-+        # Common symbols not allowed in MH_DYLIB files
-+       case $cc_basename in
-+         xlc*)
-+         _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
-+         _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
--# Flag to hardcode \$libdir into a binary during linking.
--# This must work even if \$libdir does not exist.
--hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-+    mingw* | pw32* | os2*)
-+      # This hack is so that the source file can tell whether it is being
-+      # built for inclusion in a dll (and should export symbols for example).
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-+      ;;
- 
--# Whether we need a single -rpath flag with a separated argument.
--hardcode_libdir_separator=$lt_hardcode_libdir_separator
-+    hpux9* | hpux10* | hpux11*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-+      # not for PA HP-UX.
-+      case $host_cpu in
-+      hppa*64*|ia64*)
-+	# +Z the default
-+	;;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-+	;;
-+      esac
-+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-+      ;;
- 
--# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
--# resulting binary.
--hardcode_direct=$hardcode_direct
-+    irix5* | irix6* | nonstopux*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # PIC (with -KPIC) is the default.
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
- 
--# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
--# resulting binary.
--hardcode_minus_L=$hardcode_minus_L
-+    newsos6)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
- 
--# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
--# the resulting binary.
--hardcode_shlibpath_var=$hardcode_shlibpath_var
-+    linux* | k*bsd*-gnu)
-+      case $cc_basename in
-+      icc* | ecc*)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-+        ;;
-+      pgcc* | pgf77* | pgf90* | pgf95*)
-+        # Portland Group compilers (*not* the Pentium gcc compiler,
-+	# which looks to be a dead project)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+        ;;
-+      ccc*)
-+        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+        # All Alpha code is PIC.
-+        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+        ;;
-+      esac
-+      ;;
- 
--# Variables whose values should be saved in libtool wrapper scripts and
--# restored at relink time.
--variables_saved_for_relink="$variables_saved_for_relink"
-+    osf3* | osf4* | osf5*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      # All OSF/1 code is PIC.
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-+      ;;
- 
--# Whether libtool must link a program against all its dependency libraries.
--link_all_deplibs=$link_all_deplibs
-+    solaris*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      case $cc_basename in
-+      f77* | f90* | f95*)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
-+      *)
-+	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
-+      esac
-+      ;;
- 
--# Compile-time system search path for libraries
--sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-+    sunos4*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
- 
--# Run-time system search path for libraries
--sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-+    sysv4 | sysv4.2uw2* | sysv4.3*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
- 
--# Fix the shell variable \$srcfile for the compiler.
--fix_srcfile_path="$fix_srcfile_path"
-+    sysv4*MP*)
-+      if test -d /usr/nec ;then
-+	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-+	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      fi
-+      ;;
- 
--# Set to yes if exported symbols are required.
--always_export_symbols=$always_export_symbols
-+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
- 
--# The commands to list exported symbols.
--export_symbols_cmds=$lt_export_symbols_cmds
-+    unicos*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
- 
--# The commands to extract the exported symbol list from a shared archive.
--extract_expsyms_cmds=$lt_extract_expsyms_cmds
-+    uts4*)
-+      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-+      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-+      ;;
- 
--# Symbols that should not be listed in the preloaded symbols.
--exclude_expsyms=$lt_exclude_expsyms
-+    *)
-+      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-+      ;;
-+    esac
-+  fi
-+])
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
- 
--# Symbols that must always be exported.
--include_expsyms=$lt_include_expsyms
-+#
-+# Check to make sure the PIC flag actually works.
-+#
-+if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-+  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-+    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-+    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-+     "" | " "*) ;;
-+     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-+     esac],
-+    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-+fi
-+case $host_os in
-+  # For platforms which do not support PIC, -DPIC is meaningless:
-+  *djgpp*)
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-+    ;;
-+  *)
-+    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-+    ;;
-+esac
- 
--# ### END LIBTOOL CONFIG
-+#
-+# Check to make sure the static flag actually works.
-+#
-+wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
-+AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
-+  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-+  $lt_tmp_static_flag,
-+  [],
-+  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-+])
- 
--__EOF__
- 
-+# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-+# ------------------------------------
-+# See if the linker supports building shared libraries.
-+AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-+[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-+ifelse([$1],[CXX],[
-+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   case $host_os in
--  aix3*)
--    cat <<\EOF >> "${ofile}T"
--
--# AIX sometimes has problems with the GCC collect2 program.  For some
--# reason, if we set the COLLECT_NAMES environment variable, the problems
--# vanish in a puff of smoke.
--if test "X${COLLECT_NAMES+set}" != Xset; then
--  COLLECT_NAMES=
--  export COLLECT_NAMES
--fi
--EOF
-+  aix4* | aix5*)
-+    # If we're using GNU nm, then we don't want the "-C" option.
-+    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-+    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+    else
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+    fi
-     ;;
-+  pw32*)
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-+  ;;
-+  cygwin* | mingw*)
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
-+  *)
-+    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  ;;
-   esac
--
-+],[
-+  runpath_var=
-+  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-+  _LT_AC_TAGVAR(archive_cmds, $1)=
-+  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-+  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-+  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-+  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-+  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-+  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-+  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-+  _LT_AC_TAGVAR(module_cmds, $1)=
-+  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-+  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-+  # include_expsyms should be a list of space-separated symbols to be *always*
-+  # included in the symbol list
-+  _LT_AC_TAGVAR(include_expsyms, $1)=
-+  # exclude_expsyms can be an extended regexp of symbols to exclude
-+  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-+  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-+  # as well as any symbol that contains `d'.
-+  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-+  # platforms (ab)use it in PIC code, but their linkers get confused if
-+  # the symbol is explicitly referenced.  Since portable code cannot
-+  # rely on this symbol name, it's probably fine to never include it in
-+  # preloaded symbol tables.
-+  extract_expsyms_cmds=
-+  # Just being paranoid about ensuring that cc_basename is set.
-+  _LT_CC_BASENAME([$compiler])
-   case $host_os in
--  cygwin* | mingw* | pw32* | os2*)
--    cat <<'EOF' >> "${ofile}T"
--      # This is a source program that is used to create dlls on Windows
--      # Don't remove nor modify the starting and closing comments
--# /* ltdll.c starts here */
--# #define WIN32_LEAN_AND_MEAN
--# #include <windows.h>
--# #undef WIN32_LEAN_AND_MEAN
--# #include <stdio.h>
--#
--# #ifndef __CYGWIN__
--# #  ifdef __CYGWIN32__
--# #    define __CYGWIN__ __CYGWIN32__
--# #  endif
--# #endif
--#
--# #ifdef __cplusplus
--# extern "C" {
--# #endif
--# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
--# #ifdef __cplusplus
--# }
--# #endif
--#
--# #ifdef __CYGWIN__
--# #include <cygwin/cygwin_dll.h>
--# DECLARE_CYGWIN_DLL( DllMain );
--# #endif
--# HINSTANCE __hDllInstance_base;
--#
--# BOOL APIENTRY
--# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
--# {
--#   __hDllInstance_base = hInst;
--#   return TRUE;
--# }
--# /* ltdll.c ends here */
--	# This is a source program that is used to create import libraries
--	# on Windows for dlls which lack them. Don't remove nor modify the
--	# starting and closing comments
--# /* impgen.c starts here */
--# /*   Copyright (C) 1999-2000 Free Software Foundation, Inc.
--#
--#  This file is part of GNU libtool.
--#
--#  This program is free software; you can redistribute it and/or modify
--#  it under the terms of the GNU General Public License as published by
--#  the Free Software Foundation; either version 2 of the License, or
--#  (at your option) any later version.
--#
--#  This program is distributed in the hope that it will be useful,
--#  but WITHOUT ANY WARRANTY; without even the implied warranty of
--#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--#  GNU General Public License for more details.
--#
--#  You should have received a copy of the GNU General Public License
--#  along with this program; if not, write to the Free Software
--#  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
--#  */
--#
--# #include <stdio.h>		/* for printf() */
--# #include <unistd.h>		/* for open(), lseek(), read() */
--# #include <fcntl.h>		/* for O_RDONLY, O_BINARY */
--# #include <string.h>		/* for strdup() */
--#
--# /* O_BINARY isn't required (or even defined sometimes) under Unix */
--# #ifndef O_BINARY
--# #define O_BINARY 0
--# #endif
--#
--# static unsigned int
--# pe_get16 (fd, offset)
--#      int fd;
--#      int offset;
--# {
--#   unsigned char b[2];
--#   lseek (fd, offset, SEEK_SET);
--#   read (fd, b, 2);
--#   return b[0] + (b[1]<<8);
--# }
--#
--# static unsigned int
--# pe_get32 (fd, offset)
--#     int fd;
--#     int offset;
--# {
--#   unsigned char b[4];
--#   lseek (fd, offset, SEEK_SET);
--#   read (fd, b, 4);
--#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
--# }
--#
--# static unsigned int
--# pe_as32 (ptr)
--#      void *ptr;
--# {
--#   unsigned char *b = ptr;
--#   return b[0] + (b[1]<<8) + (b[2]<<16) + (b[3]<<24);
--# }
--#
--# int
--# main (argc, argv)
--#     int argc;
--#     char *argv[];
--# {
--#     int dll;
--#     unsigned long pe_header_offset, opthdr_ofs, num_entries, i;
--#     unsigned long export_rva, export_size, nsections, secptr, expptr;
--#     unsigned long name_rvas, nexp;
--#     unsigned char *expdata, *erva;
--#     char *filename, *dll_name;
--#
--#     filename = argv[1];
--#
--#     dll = open(filename, O_RDONLY|O_BINARY);
--#     if (dll < 1)
--# 	return 1;
--#
--#     dll_name = filename;
--#
--#     for (i=0; filename[i]; i++)
--# 	if (filename[i] == '/' || filename[i] == '\\'  || filename[i] == ':')
--# 	    dll_name = filename + i +1;
--#
--#     pe_header_offset = pe_get32 (dll, 0x3c);
--#     opthdr_ofs = pe_header_offset + 4 + 20;
--#     num_entries = pe_get32 (dll, opthdr_ofs + 92);
--#
--#     if (num_entries < 1) /* no exports */
--# 	return 1;
--#
--#     export_rva = pe_get32 (dll, opthdr_ofs + 96);
--#     export_size = pe_get32 (dll, opthdr_ofs + 100);
--#     nsections = pe_get16 (dll, pe_header_offset + 4 +2);
--#     secptr = (pe_header_offset + 4 + 20 +
--# 	      pe_get16 (dll, pe_header_offset + 4 + 16));
--#
--#     expptr = 0;
--#     for (i = 0; i < nsections; i++)
--#     {
--# 	char sname[8];
--# 	unsigned long secptr1 = secptr + 40 * i;
--# 	unsigned long vaddr = pe_get32 (dll, secptr1 + 12);
--# 	unsigned long vsize = pe_get32 (dll, secptr1 + 16);
--# 	unsigned long fptr = pe_get32 (dll, secptr1 + 20);
--# 	lseek(dll, secptr1, SEEK_SET);
--# 	read(dll, sname, 8);
--# 	if (vaddr <= export_rva && vaddr+vsize > export_rva)
--# 	{
--# 	    expptr = fptr + (export_rva - vaddr);
--# 	    if (export_rva + export_size > vaddr + vsize)
--# 		export_size = vsize - (export_rva - vaddr);
--# 	    break;
--# 	}
--#     }
--#
--#     expdata = (unsigned char*)malloc(export_size);
--#     lseek (dll, expptr, SEEK_SET);
--#     read (dll, expdata, export_size);
--#     erva = expdata - export_rva;
--#
--#     nexp = pe_as32 (expdata+24);
--#     name_rvas = pe_as32 (expdata+32);
--#
--#     printf ("EXPORTS\n");
--#     for (i = 0; i<nexp; i++)
--#     {
--# 	unsigned long name_rva = pe_as32 (erva+name_rvas+i*4);
--# 	printf ("\t%s @ %ld ;\n", erva+name_rva, 1+ i);
--#     }
--#
--#     return 0;
--# }
--# /* impgen.c ends here */
-+  cygwin* | mingw* | pw32*)
-+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-+    # When not using gcc, we currently assume that we are using
-+    # Microsoft Visual C++.
-+    if test "$GCC" != yes; then
-+      with_gnu_ld=no
-+    fi
-+    ;;
-+  interix*)
-+    # we just hope/assume this is gcc and not c89 (= MSVC++)
-+    with_gnu_ld=yes
-+    ;;
-+  openbsd*)
-+    with_gnu_ld=no
-+    ;;
-+  esac
-+
-+  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+  if test "$with_gnu_ld" = yes; then
-+    # If archive_cmds runs LD, not CC, wlarc should be empty
-+    wlarc='${wl}'
-+
-+    # Set some defaults for GNU ld with shared library support. These
-+    # are reset later if shared libraries are not supported. Putting them
-+    # here allows them to be overridden if necessary.
-+    runpath_var=LD_RUN_PATH
-+    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-+    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-+    # ancient GNU ld didn't support --whole-archive et. al.
-+    if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
-+	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-+      else
-+  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+    supports_anon_versioning=no
-+    case `$LD -v 2>/dev/null` in
-+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+      *\ 2.11.*) ;; # other 2.11 versions
-+      *) supports_anon_versioning=yes ;;
-+    esac
-+
-+    # See if GNU ld supports shared libraries.
-+    case $host_os in
-+    aix3* | aix4* | aix5*)
-+      # On AIX/PPC, the GNU linker is very broken
-+      if test "$host_cpu" != ia64; then
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	cat <<EOF 1>&2
-+
-+*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-+*** to be unable to reliably create shared libraries on AIX.
-+*** Therefore, libtool is disabling shared libraries support.  If you
-+*** really care for shared libraries, you may want to modify your PATH
-+*** so that a non-GNU linker is found, and then restart.
- 
- EOF
--    ;;
--  esac
-+      fi
-+      ;;
- 
--  # We use sed instead of cat because bash on DJGPP gets confused if
--  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
--  # text mode, it properly converts lines to CR/LF.  This bash problem
--  # is reportedly fixed, but why not run on old versions too?
--  sed '$q' "$ltmain" >> "${ofile}T" || (rm -f "${ofile}T"; exit 1)
-+    amigaos*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+
-+      # Samuel A. Falvo II <kc5tja at dolphin.openprojects.net> reports
-+      # that the semantics of dynamic libraries on AmigaOS, at least up
-+      # to version 4, is to share data among multiple programs linked
-+      # with the same dynamic library.  Since this doesn't match the
-+      # behavior of shared libraries on other platforms, we can't use
-+      # them.
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+
-+    beos*)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
-+	# support --undefined.  This deserves some investigation.  FIXME
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
- 
--  mv -f "${ofile}T" "$ofile" || \
--    (rm -f "$ofile" && cp "${ofile}T" "$ofile" && rm -f "${ofile}T")
--  chmod +x "$ofile"
--fi
-+    cygwin* | mingw* | pw32*)
-+      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-+      # as there is no search path for DLLs.
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-+      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-+
-+      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+	# If the export-symbols file already is a .def file (1st line
-+	# is EXPORTS), use it as is; otherwise, prepend...
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-+	  cp $export_symbols $output_objdir/$soname.def;
-+	else
-+	  echo EXPORTS > $output_objdir/$soname.def;
-+	  cat $export_symbols >> $output_objdir/$soname.def;
-+	fi~
-+	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
- 
--])# _LT_AC_LTCONFIG_HACK
-+    interix3*)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
-+      # Instead, shared libraries are loaded at an image base (0x10000000 by
-+      # default) and relocated if they conflict, which is a slow very memory
-+      # consuming and fragmenting process.  To avoid this, we pick a random,
-+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
-+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-+      ;;
-+
-+    linux* | k*bsd*-gnu)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	tmp_addflag=
-+	case $cc_basename,$host_cpu in
-+	pgcc*)				# Portland Group C compiler
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag'
-+	  ;;
-+	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
-+	  tmp_addflag=' $pic_flag -Mnomain' ;;
-+	ecc*,ia64* | icc*,ia64*)		# Intel C compiler on ia64
-+	  tmp_addflag=' -i_dynamic' ;;
-+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
-+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
-+	ifc* | ifort*)			# Intel Fortran compiler
-+	  tmp_addflag=' -nofor_main' ;;
-+	esac
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- 
--# AC_LIBTOOL_DLOPEN - enable checks for dlopen support
--AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])])
-+	if test $supports_anon_versioning = yes; then
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-+  cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-+  $echo "local: *; };" >> $output_objdir/$libname.ver~
-+	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+	fi
-+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
- 
--# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's
--AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])])
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-+	wlarc=
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      fi
-+      ;;
- 
--# AC_ENABLE_SHARED - implement the --enable-shared flag
--# Usage: AC_ENABLE_SHARED[(DEFAULT)]
--#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
--#   `yes'.
--AC_DEFUN([AC_ENABLE_SHARED],
--[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE(shared,
--changequote(<<, >>)dnl
--<<  --enable-shared[=PKGS]  build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT],
--changequote([, ])dnl
--[p=${PACKAGE-default}
--case $enableval in
--yes) enable_shared=yes ;;
--no) enable_shared=no ;;
--*)
--  enable_shared=no
--  # Look at the argument we got.  We use all the common list separators.
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
--  for pkg in $enableval; do
--    if test "X$pkg" = "X$p"; then
--      enable_shared=yes
--    fi
--  done
--  IFS="$ac_save_ifs"
--  ;;
--esac],
--enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl
--])
-+    solaris*)
-+      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	cat <<EOF 1>&2
- 
--# AC_DISABLE_SHARED - set the default shared flag to --disable-shared
--AC_DEFUN([AC_DISABLE_SHARED],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_SHARED(no)])
-+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-+*** create shared libraries on Solaris systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.9.1 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
- 
--# AC_ENABLE_STATIC - implement the --enable-static flag
--# Usage: AC_ENABLE_STATIC[(DEFAULT)]
--#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
--#   `yes'.
--AC_DEFUN([AC_ENABLE_STATIC],
--[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE(static,
--changequote(<<, >>)dnl
--<<  --enable-static[=PKGS]  build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT],
--changequote([, ])dnl
--[p=${PACKAGE-default}
--case $enableval in
--yes) enable_static=yes ;;
--no) enable_static=no ;;
--*)
--  enable_static=no
--  # Look at the argument we got.  We use all the common list separators.
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
--  for pkg in $enableval; do
--    if test "X$pkg" = "X$p"; then
--      enable_static=yes
--    fi
--  done
--  IFS="$ac_save_ifs"
--  ;;
--esac],
--enable_static=AC_ENABLE_STATIC_DEFAULT)dnl
--])
-+EOF
-+      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
- 
--# AC_DISABLE_STATIC - set the default static flag to --disable-static
--AC_DEFUN([AC_DISABLE_STATIC],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_STATIC(no)])
-+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
-+      case `$LD -v 2>&1` in
-+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) 
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	cat <<_LT_EOF 1>&2
- 
-+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
-+*** reliably create shared libraries on SCO systems.  Therefore, libtool
-+*** is disabling shared libraries support.  We urge you to upgrade GNU
-+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
-+*** your PATH or compiler configuration so that the native linker is
-+*** used, and then restart.
- 
--# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag
--# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)]
--#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
--#   `yes'.
--AC_DEFUN([AC_ENABLE_FAST_INSTALL],
--[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
--AC_ARG_ENABLE(fast-install,
--changequote(<<, >>)dnl
--<<  --enable-fast-install[=PKGS]  optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT],
--changequote([, ])dnl
--[p=${PACKAGE-default}
--case $enableval in
--yes) enable_fast_install=yes ;;
--no) enable_fast_install=no ;;
--*)
--  enable_fast_install=no
--  # Look at the argument we got.  We use all the common list separators.
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
--  for pkg in $enableval; do
--    if test "X$pkg" = "X$p"; then
--      enable_fast_install=yes
--    fi
--  done
--  IFS="$ac_save_ifs"
--  ;;
--esac],
--enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl
--])
-+_LT_EOF
-+	;;
-+	*)
-+	  if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
-+	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
-+	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
-+	  else
-+	    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+	  fi
-+	;;
-+      esac
-+      ;;
- 
--# AC_DISABLE_FAST_INSTALL - set the default to --disable-fast-install
--AC_DEFUN([AC_DISABLE_FAST_INSTALL],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--AC_ENABLE_FAST_INSTALL(no)])
-+    sunos4*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      wlarc=
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
--# AC_LIBTOOL_PICMODE - implement the --with-pic flag
--# Usage: AC_LIBTOOL_PICMODE[(MODE)]
--#   Where MODE is either `yes' or `no'.  If omitted, it defaults to
--#   `both'.
--AC_DEFUN([AC_LIBTOOL_PICMODE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--pic_mode=ifelse($#,1,$1,default)])
-+    *)
-+      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+      else
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      fi
-+      ;;
-+    esac
- 
-+    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
-+      runpath_var=
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-+    fi
-+  else
-+    # PORTME fill in a description of your system's linker (not GNU ld)
-+    case $host_os in
-+    aix3*)
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      # Note: this linker hardcodes the directories in LIBPATH if there
-+      # are no directories specified by -L.
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
-+	# Neither direct hardcoding nor static linking is supported with a
-+	# broken collect2.
-+	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+      fi
-+      ;;
- 
--# AC_PATH_TOOL_PREFIX - find a file program which can recognise shared library
--AC_DEFUN([AC_PATH_TOOL_PREFIX],
--[AC_MSG_CHECKING([for $1])
--AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
--[case $MAGIC_CMD in
--  /*)
--  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
--  ;;
--  ?:/*)
--  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a dos path.
--  ;;
--  *)
--  ac_save_MAGIC_CMD="$MAGIC_CMD"
--  IFS="${IFS=   }"; ac_save_ifs="$IFS"; IFS=":"
--dnl $ac_dummy forces splitting on constant user-supplied paths.
--dnl POSIX.2 word splitting is done only on the output of word expansions,
--dnl not every word.  This closes a longstanding sh security hole.
--  ac_dummy="ifelse([$2], , $PATH, [$2])"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$1; then
--      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
--      if test -n "$file_magic_test_file"; then
--	case $deplibs_check_method in
--	"file_magic "*)
--	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
--	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
--	    egrep "$file_magic_regex" > /dev/null; then
--	    :
--	  else
--	    cat <<EOF 1>&2
-+    aix4* | aix5*)
-+      if test "$host_cpu" = ia64; then
-+	# On IA64, the linker does run time linking by default, so we don't
-+	# have to do anything special.
-+	aix_use_runtimelinking=no
-+	exp_sym_flag='-Bexport'
-+	no_entry_flag=""
-+      else
-+	# If we're using GNU nm, then we don't want the "-C" option.
-+	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-+	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+	else
-+	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-+	fi
-+	aix_use_runtimelinking=no
- 
--*** Warning: the command libtool uses to detect shared libraries,
--*** $file_magic_cmd, produces output that libtool cannot recognize.
--*** The result is that libtool may fail to recognize shared libraries
--*** as such.  This will affect the creation of libtool libraries that
--*** depend on shared libraries, but programs linked with such libtool
--*** libraries will work regardless of this problem.  Nevertheless, you
--*** may want to report the problem to your system manager and/or to
--*** bug-libtool at gnu.org
-+	# Test if we are trying to use run time linking or normal
-+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-+	# need to do runtime linking.
-+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-+	  for ld_flag in $LDFLAGS; do
-+  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-+  	    aix_use_runtimelinking=yes
-+  	    break
-+  	  fi
-+	  done
-+	  ;;
-+	esac
- 
--EOF
--	  fi ;;
-+	exp_sym_flag='-bexport'
-+	no_entry_flag='-bnoentry'
-+      fi
-+
-+      # When large executables or shared objects are built, AIX ld can
-+      # have problems creating the table of contents.  If linking a library
-+      # or program results in "error TOC overflow" add -mminimal-toc to
-+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-+
-+      _LT_AC_TAGVAR(archive_cmds, $1)=''
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+
-+      if test "$GCC" = yes; then
-+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
-+	# We only want to do this on AIX 4.2 and lower, the check
-+	# below for broken collect2 doesn't work under 4.3+
-+	  collect2name=`${CC} -print-prog-name=collect2`
-+	  if test -f "$collect2name" && \
-+  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-+	  then
-+  	  # We have reworked collect2
-+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+	  else
-+  	  # We have old collect2
-+  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-+  	  # It fails to find uninstalled libraries when the uninstalled
-+  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-+  	  # to unsupported forces relinking
-+  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-+	  fi
-+	  ;;
- 	esac
-+	shared_flag='-shared'
-+	if test "$aix_use_runtimelinking" = yes; then
-+	  shared_flag="$shared_flag "'${wl}-G'
-+	fi
-+      else
-+	# not using gcc
-+	if test "$host_cpu" = ia64; then
-+  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-+  	# chokes on -Wl,-G. The following line is correct:
-+	  shared_flag='-G'
-+	else
-+	  if test "$aix_use_runtimelinking" = yes; then
-+	    shared_flag='${wl}-G'
-+	  else
-+	    shared_flag='${wl}-bM:SRE'
-+	  fi
-+	fi
-       fi
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--  MAGIC_CMD="$ac_save_MAGIC_CMD"
--  ;;
--esac])
--MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
--if test -n "$MAGIC_CMD"; then
--  AC_MSG_RESULT($MAGIC_CMD)
--else
--  AC_MSG_RESULT(no)
--fi
--])
- 
-+      # It seems that -bexpall does not export symbols beginning with
-+      # underscore (_), so it is better to generate a list of symbols to export.
-+      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-+      if test "$aix_use_runtimelinking" = yes; then
-+	# Warning - without using the other runtime loading flags (-brtl),
-+	# -berok will link without error, but may produce a broken library.
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-+       # Determine the default libpath from the value encoded in an empty executable.
-+       _LT_AC_SYS_LIBPATH_AIX
-+       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-+       else
-+	if test "$host_cpu" = ia64; then
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
-+	else
-+	 # Determine the default libpath from the value encoded in an empty executable.
-+	 _LT_AC_SYS_LIBPATH_AIX
-+	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-+	  # Warning - without using the other run time loading flags,
-+	  # -berok will link without error, but may produce a broken library.
-+	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-+	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-+	  # Exported symbols can be pulled into shared objects from archives
-+	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
-+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+	  # This is similar to how AIX traditionally builds its shared libraries.
-+	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	fi
-+      fi
-+      ;;
- 
--# AC_PATH_MAGIC - find a file program which can recognise a shared library
--AC_DEFUN([AC_PATH_MAGIC],
--[AC_REQUIRE([AC_CHECK_TOOL_PREFIX])dnl
--AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin:$PATH)
--if test -z "$lt_cv_path_MAGIC_CMD"; then
--  if test -n "$ac_tool_prefix"; then
--    AC_PATH_TOOL_PREFIX(file, /usr/bin:$PATH)
--  else
--    MAGIC_CMD=:
--  fi
--fi
--])
-+    amigaos*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      # see comment about different semantics on the GNU ld section
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
- 
-+    bsdi[[45]]*)
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-+      ;;
- 
--# AC_PROG_LD - find the path to the GNU or non-GNU linker
--AC_DEFUN([AC_PROG_LD],
--[AC_ARG_WITH(gnu-ld,
--[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
--test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
--AC_REQUIRE([AC_PROG_CC])dnl
--AC_REQUIRE([AC_CANONICAL_HOST])dnl
--AC_REQUIRE([AC_CANONICAL_BUILD])dnl
--AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
--ac_prog=ld
--if test "$GCC" = yes; then
--  # Check if gcc -print-prog-name=ld gives a path.
--  AC_MSG_CHECKING([for ld used by GCC])
--  case $host in
--  *-*-mingw*)
--    # gcc leaves a trailing carriage return which upsets mingw
--    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
--  *)
--    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
--  esac
--  case $ac_prog in
--    # Accept absolute paths.
--    [[\\/]]* | [[A-Za-z]]:[[\\/]]*)
--      re_direlt='/[[^/]][[^/]]*/\.\./'
--      # Canonicalize the path of ld
--      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
--      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
--	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
--      done
--      test -z "$LD" && LD="$ac_prog"
-+    cygwin* | mingw* | pw32*)
-+      # When not using gcc, we currently assume that we are using
-+      # Microsoft Visual C++.
-+      # hardcode_libdir_flag_spec is actually meaningless, as there is
-+      # no search path for DLLs.
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      # Tell ltmain to make .lib files, not .a files.
-+      libext=lib
-+      # Tell ltmain to make .dll files, not .so files.
-+      shrext_cmds=".dll"
-+      # FIXME: Setting linknames here is a bad hack.
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-+      # The linker will automatically build a .lib file if we build a DLL.
-+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-+      # FIXME: Should let the user specify the lib program.
-+      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-+      _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-+      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-       ;;
--  "")
--    # If it fails, then pretend we aren't using GCC.
--    ac_prog=ld
--    ;;
--  *)
--    # If it is relative, then search for the first ld in PATH.
--    with_gnu_ld=unknown
--    ;;
--  esac
--elif test "$with_gnu_ld" = yes; then
--  AC_MSG_CHECKING([for GNU ld])
--else
--  AC_MSG_CHECKING([for non-GNU ld])
--fi
--AC_CACHE_VAL(lt_cv_path_LD,
--[if test -z "$LD"; then
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--  for ac_dir in $PATH; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
--      lt_cv_path_LD="$ac_dir/$ac_prog"
--      # Check to see if the program is GNU ld.  I'd rather use --version,
--      # but apparently some GNU ld's only accept -v.
--      # Break only if it was the GNU/non-GNU ld that we prefer.
--      if "$lt_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
--	test "$with_gnu_ld" != no && break
--      else
--	test "$with_gnu_ld" != yes && break
--      fi
-+
-+    darwin* | rhapsody*)
-+      case $host_os in
-+        rhapsody* | darwin1.[[012]])
-+         _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[[012]])
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+      esac
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-+      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+    else
-+      case $cc_basename in
-+        xlc*)
-+         output_verbose_link_cmd='echo'
-+         _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-+          # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
-+         _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          ;;
-+       *)
-+         _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+          ;;
-+      esac
-     fi
--  done
--  IFS="$ac_save_ifs"
--else
--  lt_cv_path_LD="$LD" # Let the user override the test with a path.
--fi])
--LD="$lt_cv_path_LD"
--if test -n "$LD"; then
--  AC_MSG_RESULT($LD)
--else
--  AC_MSG_RESULT(no)
--fi
--test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
--AC_PROG_LD_GNU
--])
-+      ;;
- 
--# AC_PROG_LD_GNU -
--AC_DEFUN([AC_PROG_LD_GNU],
--[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.
--if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
--  lt_cv_prog_gnu_ld=yes
--else
--  lt_cv_prog_gnu_ld=no
--fi])
--with_gnu_ld=$lt_cv_prog_gnu_ld
--])
-+    dgux*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    freebsd1*)
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+
-+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-+    # support.  Future versions do this automatically, but an explicit c++rt0.o
-+    # does not break anything, and helps significantly (at the cost of a little
-+    # extra space).
-+    freebsd2.2*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-+    freebsd2*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-+    freebsd* | dragonfly*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
-+
-+    hpux9*)
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+
-+      # hardcode_minus_L: Not really in the search PATH,
-+      # but as the default location of the library.
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      ;;
- 
--# AC_PROG_LD_RELOAD_FLAG - find reload flag for linker
--#   -- PORTME Some linkers may need a different reload flag.
--AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
--[AC_CACHE_CHECK([for $LD option to reload object files], lt_cv_ld_reload_flag,
--[lt_cv_ld_reload_flag='-r'])
--reload_flag=$lt_cv_ld_reload_flag
--test -n "$reload_flag" && reload_flag=" $reload_flag"
--])
-+    hpux10*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	_LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+
-+	# hardcode_minus_L: Not really in the search PATH,
-+	# but as the default location of the library.
-+	_LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      fi
-+      ;;
- 
--# AC_DEPLIBS_CHECK_METHOD - how to check for library dependencies
--#  -- PORTME fill in with the dynamic library characteristics
--AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
--[AC_CACHE_CHECK([how to recognise dependent libraries],
--lt_cv_deplibs_check_method,
--[lt_cv_file_magic_cmd='$MAGIC_CMD'
--lt_cv_file_magic_test_file=
--lt_cv_deplibs_check_method='unknown'
--# Need to set the preceding variable on all platforms that support
--# interlibrary dependencies.
--# 'none' -- dependencies not supported.
--# `unknown' -- same as none, but documents that we really don't know.
--# 'pass_all' -- all dependencies passed with no checks.
--# 'test_compile' -- check by making test program.
--# 'file_magic [[regex]]' -- check by looking for files in library path
--# which responds to the $file_magic_cmd with a given egrep regex.
--# If you have `file' or equivalent on your system and you're not sure
--# whether `pass_all' will *always* work, you probably want this one.
-+    hpux11*)
-+      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-+	case $host_cpu in
-+	hppa*64*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      else
-+	case $host_cpu in
-+	hppa*64*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	ia64*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	*)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-+	  ;;
-+	esac
-+      fi
-+      if test "$with_gnu_ld" = no; then
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-+	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+
-+	case $host_cpu in
-+	hppa*64*|ia64*)
-+	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	  ;;
-+	*)
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+
-+	  # hardcode_minus_L: Not really in the search PATH,
-+	  # but as the default location of the library.
-+	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+	  ;;
-+	esac
-+      fi
-+      ;;
- 
--case $host_os in
--aix4* | aix5*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+    irix5* | irix6* | nonstopux*)
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
- 
--beos*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+    netbsd* | netbsdelf*-gnu)
-+      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
--bsdi4*)
--  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  lt_cv_file_magic_test_file=/shlib/libc.so
--  ;;
-+    newsos6)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
--cygwin* | mingw* | pw32*)
--  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
--  lt_cv_file_magic_cmd='$OBJDUMP -f'
--  ;;
-+    openbsd*)
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-+      else
-+       case $host_os in
-+	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-+	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+	   ;;
-+	 *)
-+	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-+	   ;;
-+       esac
-+      fi
-+      ;;
- 
--darwin* | rhapsody*)
--  lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
--  lt_cv_file_magic_cmd='/usr/bin/file -L'
--  case "$host_os" in
--  rhapsody* | darwin1.[[012]])
--    lt_cv_file_magic_test_file=`echo /System/Library/Frameworks/System.framework/Versions/*/System | head -1`
--    ;;
--  *) # Darwin 1.3 on
--    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
--    ;;
--  esac
--  ;;
-+    os2*)
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-+      ;;
- 
--freebsd*)
--  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    case $host_cpu in
--    i*86 )
--      # Not sure whether the presence of OpenBSD here was a mistake.
--      # Let's accept both of them until this is cleared up.
--      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
--      lt_cv_file_magic_cmd=/usr/bin/file
--      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-+    osf3*)
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+      else
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-       ;;
--    esac
--  else
--    lt_cv_deplibs_check_method=pass_all
--  fi
--  ;;
- 
--gnu*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-+      else
-+	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
- 
--hpux10.20*|hpux11*)
--  lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=/usr/lib/libc.sl
--  ;;
-+	# Both c and cxx compiler support -rpath directly
-+	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-+      ;;
- 
--irix5* | irix6* | nonstopux*)
--  case $host_os in
--  irix5* | nonstopux*)
--    # this will be overridden with pass_all, but let us keep it just in case
--    lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
--    ;;
--  *)
--    case $LD in
--    *-32|*"-32 ") libmagic=32-bit;;
--    *-n32|*"-n32 ") libmagic=N32;;
--    *-64|*"-64 ") libmagic=64-bit;;
--    *) libmagic=never-match;;
--    esac
--    # this will be overridden with pass_all, but let us keep it just in case
--    lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
--    ;;
--  esac
--  lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+    solaris*)
-+      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-+      if test "$GCC" = yes; then
-+	wlarc='${wl}'
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-+      else
-+	wlarc=''
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      case $host_os in
-+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-+      *)
-+ 	# The compiler driver will combine linker options so we
-+ 	# cannot just pass the convience library names through
-+ 	# without $wl, iff we do not link with $LD.
-+ 	# Luckily, gcc supports the same syntax we need for Sun Studio.
-+ 	# Supported since Solaris 2.6 (maybe 2.5.1?)
-+ 	case $wlarc in
-+ 	'')
-+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-+ 	*)
-+ 	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}-z ${wl}defaultextract' ;;
-+ 	esac ;;
-+      esac
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+      ;;
- 
--# This must be Linux ELF.
--linux-gnu*)
--  case $host_cpu in
--  alpha* | hppa* | i*86 | mips | mipsel | powerpc* | sparc* | ia64* | x86_64*)
--    lt_cv_deplibs_check_method=pass_all ;;
--  *)
--    # glibc up to 2.1.1 does not perform some relocations on ARM
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
--  esac
--  lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
--  ;;
-+    sunos4*)
-+      if test "x$host_vendor" = xsequent; then
-+	# Use $CC to link under sequent, because it throws in some extra .o
-+	# files that make .init and .fini sections work.
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-+      fi
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
--netbsd*)
--  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so\.[[0-9]]+\.[[0-9]]+$'
--  else
--    lt_cv_deplibs_check_method='match_pattern /lib[[^/\.]]+\.so$'
--  fi
--  ;;
-+    sysv4)
-+      case $host_vendor in
-+	sni)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-+	;;
-+	siemens)
-+	  ## LD is ld it makes a PLAMLIB
-+	  ## CC just makes a GrossModule.
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-+        ;;
-+	motorola)
-+	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-+	;;
-+      esac
-+      runpath_var='LD_RUN_PATH'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
--newos6*)
--  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=/usr/lib/libnls.so
--  ;;
-+    sysv4.3*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-+      ;;
- 
--openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
--  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
--  else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
--  fi
--  ;;
-+    sysv4*MP*)
-+      if test -d /usr/nec; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+	runpath_var=LD_RUN_PATH
-+	hardcode_runpath_var=yes
-+	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-+      fi
-+      ;;
- 
--osf3* | osf4* | osf5*)
--  # this will be overridden with pass_all, but let us keep it just in case
--  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
--  lt_cv_file_magic_test_file=/shlib/libc.so
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*)
-+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
- 
--sco3.2v5*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+    sysv5* | sco3.2v5* | sco5v6*)
-+      # Note: We can NOT use -z defs as we might desire, because we do not
-+      # link with -lc, and that would cause any symbols used from libc to
-+      # always be unresolved, which means just about no library would
-+      # ever link correctly.  If we're not using GNU ld we use -z text
-+      # though, which does catch some bad symbols but isn't as heavy-handed
-+      # as -z defs.
-+      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
-+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
-+      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
-+      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-+      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-+      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-+      runpath_var='LD_RUN_PATH'
-+
-+      if test "$GCC" = yes; then
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      else
-+	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
-+      fi
-+      ;;
- 
--solaris*)
--  lt_cv_deplibs_check_method=pass_all
--  lt_cv_file_magic_test_file=/lib/libc.so
--  ;;
-+    uts4*)
-+      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-+      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-+      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-+      ;;
- 
--sysv5uw[[78]]* | sysv4*uw2*)
--  lt_cv_deplibs_check_method=pass_all
--  ;;
-+    *)
-+      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-+      ;;
-+    esac
-+  fi
-+])
-+AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-+test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
- 
--sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
--  case $host_vendor in
--  motorola)
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
--    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
--    ;;
--  ncr)
--    lt_cv_deplibs_check_method=pass_all
--    ;;
--  sequent)
--    lt_cv_file_magic_cmd='/bin/file'
--    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
--    ;;
--  sni)
--    lt_cv_file_magic_cmd='/bin/file'
--    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
--    lt_cv_file_magic_test_file=/lib/libc.so
--    ;;
--  siemens)
--    lt_cv_deplibs_check_method=pass_all
--    ;;
--  esac
-+#
-+# Do we need to explicitly link libc?
-+#
-+case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-+x|xyes)
-+  # Assume -lc should be added
-+  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+
-+  if test "$enable_shared" = yes && test "$GCC" = yes; then
-+    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-+    *'~'*)
-+      # FIXME: we may have to deal with multi-command sequences.
-+      ;;
-+    '$CC '*)
-+      # Test whether the compiler implicitly links with -lc since on some
-+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-+      # to ld, don't add -lc before -lgcc.
-+      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-+      $rm conftest*
-+      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-+
-+      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-+        soname=conftest
-+        lib=conftest
-+        libobjs=conftest.$ac_objext
-+        deplibs=
-+        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-+	pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-+        compiler_flags=-v
-+        linker_flags=-v
-+        verstring=
-+        output_objdir=.
-+        libname=conftest
-+        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-+        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-+        then
-+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-+        else
-+	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-+        fi
-+        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-+      else
-+        cat conftest.err 1>&5
-+      fi
-+      $rm conftest*
-+      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-+      ;;
-+    esac
-+  fi
-   ;;
- esac
--])
--file_magic_cmd=$lt_cv_file_magic_cmd
--deplibs_check_method=$lt_cv_deplibs_check_method
--])
-+])# AC_LIBTOOL_PROG_LD_SHLIBS
- 
- 
--# AC_PROG_NM - find the path to a BSD-compatible name lister
--AC_DEFUN([AC_PROG_NM],
--[AC_REQUIRE([_LT_AC_LIBTOOL_SYS_PATH_SEPARATOR])dnl
--AC_MSG_CHECKING([for BSD-compatible nm])
--AC_CACHE_VAL(lt_cv_path_NM,
--[if test -n "$NM"; then
--  # Let the user override the test.
--  lt_cv_path_NM="$NM"
--else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
--  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
--    test -z "$ac_dir" && ac_dir=.
--    tmp_nm=$ac_dir/${ac_tool_prefix}nm
--    if test -f $tmp_nm || test -f $tmp_nm$ac_exeext ; then
--      # Check to see if the nm accepts a BSD-compat flag.
--      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
--      #   nm: unknown option "B" ignored
--      # Tru64's nm complains that /dev/null is an invalid object file
--      if ($tmp_nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep '(/dev/null|Invalid file or object type)' >/dev/null; then
--	lt_cv_path_NM="$tmp_nm -B"
--	break
--      elif ($tmp_nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
--	lt_cv_path_NM="$tmp_nm -p"
--	break
--      else
--	lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
--	continue # so that we can try to find one that supports BSD flags
--      fi
--    fi
--  done
--  IFS="$ac_save_ifs"
--  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
--fi])
--NM="$lt_cv_path_NM"
--AC_MSG_RESULT([$NM])
--])
-+# _LT_AC_FILE_LTDLL_C
-+# -------------------
-+# Be careful that the start marker always follows a newline.
-+AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-+# /* ltdll.c starts here */
-+# #define WIN32_LEAN_AND_MEAN
-+# #include <windows.h>
-+# #undef WIN32_LEAN_AND_MEAN
-+# #include <stdio.h>
-+#
-+# #ifndef __CYGWIN__
-+# #  ifdef __CYGWIN32__
-+# #    define __CYGWIN__ __CYGWIN32__
-+# #  endif
-+# #endif
-+#
-+# #ifdef __cplusplus
-+# extern "C" {
-+# #endif
-+# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-+# #ifdef __cplusplus
-+# }
-+# #endif
-+#
-+# #ifdef __CYGWIN__
-+# #include <cygwin/cygwin_dll.h>
-+# DECLARE_CYGWIN_DLL( DllMain );
-+# #endif
-+# HINSTANCE __hDllInstance_base;
-+#
-+# BOOL APIENTRY
-+# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-+# {
-+#   __hDllInstance_base = hInst;
-+#   return TRUE;
-+# }
-+# /* ltdll.c ends here */
-+])# _LT_AC_FILE_LTDLL_C
- 
--# AC_CHECK_LIBM - check for math library
--AC_DEFUN([AC_CHECK_LIBM],
--[AC_REQUIRE([AC_CANONICAL_HOST])dnl
--LIBM=
--case $host in
--*-*-beos* | *-*-cygwin* | *-*-pw32*)
--  # These system don't have libm
--  ;;
--*-ncr-sysv4.3*)
--  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
--  AC_CHECK_LIB(m, main, LIBM="$LIBM -lm")
--  ;;
--*)
--  AC_CHECK_LIB(m, main, LIBM="-lm")
--  ;;
--esac
--])
- 
--# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for
--# the libltdl convenience library and LTDLINCL to the include flags for
--# the libltdl header and adds --enable-ltdl-convenience to the
--# configure arguments.  Note that LIBLTDL and LTDLINCL are not
--# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If DIR is not
--# provided, it is assumed to be `libltdl'.  LIBLTDL will be prefixed
--# with '${top_builddir}/' and LTDLINCL will be prefixed with
--# '${top_srcdir}/' (note the single quotes!).  If your package is not
--# flat and you're not using automake, define top_builddir and
--# top_srcdir appropriately in the Makefiles.
--AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--  case $enable_ltdl_convenience in
--  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
--  "") enable_ltdl_convenience=yes
--      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
--  esac
--  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
--  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
--  # For backwards non-gettext consistent compatibility...
--  INCLTDL="$LTDLINCL"
--])
-+# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-+# ---------------------------------
-+AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
- 
--# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for
--# the libltdl installable library and LTDLINCL to the include flags for
--# the libltdl header and adds --enable-ltdl-install to the configure
--# arguments.  Note that LIBLTDL and LTDLINCL are not AC_SUBSTed, nor is
--# AC_CONFIG_SUBDIRS called.  If DIR is not provided and an installed
--# libltdl is not found, it is assumed to be `libltdl'.  LIBLTDL will
--# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed
--# with '${top_srcdir}/' (note the single quotes!).  If your package is
--# not flat and you're not using automake, define top_builddir and
--# top_srcdir appropriately in the Makefiles.
--# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
--AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
--[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
--  AC_CHECK_LIB(ltdl, main,
--  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
--  [if test x"$enable_ltdl_install" = xno; then
--     AC_MSG_WARN([libltdl not installed, but installation disabled])
--   else
--     enable_ltdl_install=yes
--   fi
--  ])
--  if test x"$enable_ltdl_install" = x"yes"; then
--    ac_configure_args="$ac_configure_args --enable-ltdl-install"
--    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
--    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
--  else
--    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
--    LIBLTDL="-lltdl"
--    LTDLINCL=
--  fi
--  # For backwards non-gettext consistent compatibility...
--  INCLTDL="$LTDLINCL"
--])
- 
- # old names
- AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-@@ -3708,6 +6309,16 @@
- # This is just to silence aclocal about the macro not being used
- ifelse([AC_DISABLE_FAST_INSTALL])
- 
-+AC_DEFUN([LT_AC_PROG_GCJ],
-+[AC_CHECK_TOOL(GCJ, gcj, no)
-+  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-+  AC_SUBST(GCJFLAGS)
-+])
-+
-+AC_DEFUN([LT_AC_PROG_RC],
-+[AC_CHECK_TOOL(RC, windres, no)
-+])
-+
- # NOTE: This macro has been submitted for inclusion into   #
- #  GNU Autoconf as AC_PROG_SED.  When it is available in   #
- #  a released version of Autoconf we should remove this    #
-@@ -3721,79 +6332,51 @@
- AC_CACHE_VAL(lt_cv_path_SED,
- [# Loop through the user's path and test for sed and gsed.
- # Then use that list of sed's as ones to test for truncation.
--as_executable_p="test -f"
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in sed gsed; do
-+  for lt_ac_prog in sed gsed; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
--      if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
--        _sed_list="$_sed_list $as_dir/$ac_prog$ac_exec_ext"
-+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-       fi
-     done
-   done
- done
--
--  # Create a temporary directory, and hook for its removal unless debugging.
--$debug ||
--{
--  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
--  trap '{ (exit 1); exit 1; }' 1 2 13 15
--}
--
--# Create a (secure) tmp directory for tmp files.
--: ${TMPDIR=/tmp}
--{
--  tmp=`(umask 077 && mktemp -d -q "$TMPDIR/sedXXXXXX") 2>/dev/null` &&
--  test -n "$tmp" && test -d "$tmp"
--}  ||
--{
--  tmp=$TMPDIR/sed$$-$RANDOM
--  (umask 077 && mkdir $tmp)
--} ||
--{
--   echo "$me: cannot create a temporary directory in $TMPDIR" >&2
--   { (exit 1); exit 1; }
--}
--  _max=0
--  _count=0
--  # Add /usr/xpg4/bin/sed as it is typically found on Solaris
--  # along with /bin/sed that truncates output.
--  for _sed in $_sed_list /usr/xpg4/bin/sed; do
--    test ! -f ${_sed} && break
--    cat /dev/null > "$tmp/sed.in"
--    _count=0
--    echo ${ECHO_N-$ac_n} "0123456789${ECHO_C-$ac_c}" >"$tmp/sed.in"
--    # Check for GNU sed and select it if it is found.
--    if "${_sed}" --version 2>&1 < /dev/null | egrep '(GNU)' > /dev/null; then
--      lt_cv_path_SED=${_sed}
--      break
-+lt_ac_max=0
-+lt_ac_count=0
-+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-+# along with /bin/sed that truncates output.
-+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-+  test ! -f $lt_ac_sed && continue
-+  cat /dev/null > conftest.in
-+  lt_ac_count=0
-+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-+  # Check for GNU sed and select it if it is found.
-+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-+    lt_cv_path_SED=$lt_ac_sed
-+    break
-+  fi
-+  while true; do
-+    cat conftest.in conftest.in >conftest.tmp
-+    mv conftest.tmp conftest.in
-+    cp conftest.in conftest.nl
-+    echo >>conftest.nl
-+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-+    cmp -s conftest.out conftest.nl || break
-+    # 10000 chars as input seems more than enough
-+    test $lt_ac_count -gt 10 && break
-+    lt_ac_count=`expr $lt_ac_count + 1`
-+    if test $lt_ac_count -gt $lt_ac_max; then
-+      lt_ac_max=$lt_ac_count
-+      lt_cv_path_SED=$lt_ac_sed
-     fi
--    while true; do
--      cat "$tmp/sed.in" "$tmp/sed.in" >"$tmp/sed.tmp"
--      mv "$tmp/sed.tmp" "$tmp/sed.in"
--      cp "$tmp/sed.in" "$tmp/sed.nl"
--      echo >>"$tmp/sed.nl"
--      ${_sed} -e 's/a$//' < "$tmp/sed.nl" >"$tmp/sed.out" || break
--      cmp -s "$tmp/sed.out" "$tmp/sed.nl" || break
--      # 40000 chars as input seems more than enough
--      test $_count -gt 10 && break
--      _count=`expr $_count + 1`
--      if test $_count -gt $_max; then
--        _max=$_count
--        lt_cv_path_SED=$_sed
--      fi
--    done
-   done
--  rm -rf "$tmp"
-+done
- ])
--if test "X$SED" != "X"; then
--  lt_cv_path_SED=$SED
--else
--  SED=$lt_cv_path_SED
--fi
-+SED=$lt_cv_path_SED
- AC_MSG_RESULT([$SED])
- ])
- 
-@@ -3807,7 +6390,7 @@
- dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
- dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
- dnl
--AC_DEFUN(AM_PATH_SDL,
-+AC_DEFUN([AM_PATH_SDL],
- [dnl 
- dnl Get the cflags and libraries from the sdl-config script
- dnl
-@@ -3819,20 +6402,21 @@
- 		    , enable_sdltest=yes)
- 
-   if test x$sdl_exec_prefix != x ; then
--     sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
--     if test x${SDL_CONFIG+set} != xset ; then
--        SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
--     fi
-+    sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix"
-+    if test x${SDL_CONFIG+set} != xset ; then
-+      SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
-+    fi
-   fi
-   if test x$sdl_prefix != x ; then
--     sdl_args="$sdl_args --prefix=$sdl_prefix"
--     if test x${SDL_CONFIG+set} != xset ; then
--        SDL_CONFIG=$sdl_prefix/bin/sdl-config
--     fi
-+    sdl_args="$sdl_args --prefix=$sdl_prefix"
-+    if test x${SDL_CONFIG+set} != xset ; then
-+      SDL_CONFIG=$sdl_prefix/bin/sdl-config
-+    fi
-   fi
- 
--  AC_REQUIRE([AC_CANONICAL_TARGET])
--  PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-+  if test "x$prefix" != xNONE; then
-+    PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-+  fi
-   AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
-   min_sdl_version=ifelse([$1], ,0.11.0,$1)
-   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
-@@ -3851,8 +6435,10 @@
-            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-     if test "x$enable_sdltest" = "xyes" ; then
-       ac_save_CFLAGS="$CFLAGS"
-+      ac_save_CXXFLAGS="$CXXFLAGS"
-       ac_save_LIBS="$LIBS"
-       CFLAGS="$CFLAGS $SDL_CFLAGS"
-+      CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-       LIBS="$LIBS $SDL_LIBS"
- dnl
- dnl Now check if the installed SDL is sufficiently new. (Also sanity
-@@ -3918,6 +6504,7 @@
- 
- ],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-        CFLAGS="$ac_save_CFLAGS"
-+       CXXFLAGS="$ac_save_CXXFLAGS"
-        LIBS="$ac_save_LIBS"
-      fi
-   fi
-@@ -3937,6 +6524,7 @@
-        else
-           echo "*** Could not run SDL test program, checking why..."
-           CFLAGS="$CFLAGS $SDL_CFLAGS"
-+          CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-           LIBS="$LIBS $SDL_LIBS"
-           AC_TRY_LINK([
- #include <stdio.h>
-@@ -3961,6 +6549,7 @@
-           echo "*** or that you have moved SDL since it was installed. In the latter case, you"
-           echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ])
-           CFLAGS="$ac_save_CFLAGS"
-+          CXXFLAGS="$ac_save_CXXFLAGS"
-           LIBS="$ac_save_LIBS"
-        fi
-      fi
-@@ -3973,3 +6562,881 @@
-   rm -f conf.sdltest
- ])
- 
-+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-+
-+# AM_SET_CURRENT_AUTOMAKE_VERSION
-+# -------------------------------
-+# 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.9.6])])
-+
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory.  The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run.  This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+#    fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+#    fails if $ac_aux_dir is absolute,
-+#    fails when called from a subdirectory in a VPATH build with
-+#          a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir.  In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+#   MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH.  The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 7
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])
-+AC_SUBST([$1_FALSE])
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 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...
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
-+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-+                   [depcc="$$1"   am_compiler_list=])
-+
-+AC_CACHE_CHECK([dependency style of $depcc],
-+               [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # 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
-+
-+  am_cv_$1_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`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.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    case $depmode in
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    none) break ;;
-+    esac
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-+         >/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
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_$1_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-+
-+
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-+
-+
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])
-+])
-+
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+#serial 3
-+
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[for mf in $CONFIG_FILES; do
-+  # Strip MF so we end up with the name of the file.
-+  mf=`echo "$mf" | sed -e 's/:.*$//'`
-+  # Check whether this is an Automake generated Makefile or not.
-+  # We used to match only the files named `Makefile.in', but
-+  # some people rename them; so instead we look at the file content.
-+  # Grep'ing the first line is not enough: some people post-process
-+  # each Makefile.in and add a new line on top of each file to say so.
-+  # So let's grep whole file.
-+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-+    dirpart=`AS_DIRNAME("$mf")`
-+  else
-+    continue
-+  fi
-+  # Extract the definition of DEPDIR, am__include, and am__quote
-+  # from the Makefile without running `make'.
-+  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+  test -z "$DEPDIR" && continue
-+  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+  test -z "am__include" && continue
-+  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+  # When using ansi2knr, U may be empty or an underscore; expand it
-+  U=`sed -n 's/^U = //p' < "$mf"`
-+  # Find all dependency output files, they are included files with
-+  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+  # simplest approach to changing $(DEPDIR) to its actual value in the
-+  # expansion.
-+  for file in `sed -n "
-+    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+    # Make sure the directory exists.
-+    test -f "$dirpart/$file" && continue
-+    fdir=`AS_DIRNAME(["$file"])`
-+    AS_MKDIR_P([$dirpart/$fdir])
-+    # echo "creating $dirpart/$file"
-+    echo '# dummy' > "$dirpart/$file"
-+  done
-+done
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled.  FIXME.  This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-+
-+# Do all the work for Automake.                             -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 12
-+
-+# 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.
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition.  After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.58])dnl
-+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+# test to see if srcdir already configured
-+if test "`cd $srcdir && pwd`" != "`pwd`" &&
-+   test -f $srcdir/config.status; then
-+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ 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
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AM_PROG_INSTALL_SH
-+AM_PROG_INSTALL_STRIP
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+	      		     [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+                  [_AM_DEPENDENCIES(CC)],
-+                  [define([AC_PROG_CC],
-+                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+                  [_AM_DEPENDENCIES(CXX)],
-+                  [define([AC_PROG_CXX],
-+                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+])
-+])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated.  The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $1 | $1:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+install_sh=${install_sh-"$am_aux_dir/install-sh"}
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# 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=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-+# From Jim Meyering
-+
-+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+AC_DEFUN([AM_MAINTAINER_MODE],
-+[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-+  dnl maintainer-mode is disabled by default
-+  AC_ARG_ENABLE(maintainer-mode,
-+[  --enable-maintainer-mode  enable make rules and dependencies not useful
-+			  (and sometimes confusing) to the casual installer],
-+      USE_MAINTAINER_MODE=$enableval,
-+      USE_MAINTAINER_MODE=no)
-+  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-+  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-+  MAINT=$MAINTAINER_MODE_TRUE
-+  AC_SUBST(MAINT)dnl
-+]
-+)
-+
-+AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-+
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+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])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# We grep out `Entering directory' and `Leaving directory'
-+# messages which can occur if `w' ends up in MAKEFLAGS.
-+# In particular we don't look at `^make:' because GNU make might
-+# be invoked under some other name (usually "gmake"), in which
-+# case it prints its new name instead of `make'.
-+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-+   am__include=include
-+   am__quote=
-+   _am_result=GNU
-+fi
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-+      am__include=.include
-+      am__quote="\""
-+      _am_result=BSD
-+   fi
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-+
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
-+
-+# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-+#
-+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-+# created by `make install' are always world readable, even if the
-+# installer happens to have an overly restrictive umask (e.g. 077).
-+# This was a mistake.  There are at least two reasons why we must not
-+# use `-m 0755':
-+#   - it causes special bits like SGID to be ignored,
-+#   - it may be too restrictive (some setups expect 775 directories).
-+#
-+# Do not use -m 0755 and let people choose whatever they expect by
-+# setting umask.
-+#
-+# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-+# Some implementations (such as Solaris 8's) are not thread-safe: if a
-+# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-+# concurrently, both version can detect that a/ is missing, but only
-+# one can create it and the other will error out.  Consequently we
-+# restrict ourselves to GNU make (using the --version option ensures
-+# this.)
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-+  # We used to keeping the `.' as first argument, in order to
-+  # allow $(mkdir_p) to be used without argument.  As in
-+  #   $(mkdir_p) $(somedir)
-+  # where $(somedir) is conditionally defined.  However this is wrong
-+  # for two reasons:
-+  #  1. if the package is installed by a user who cannot write `.'
-+  #     make install will fail,
-+  #  2. the above comment should most certainly read
-+  #     $(mkdir_p) $(DESTDIR)$(somedir)
-+  #     so it does not work when $(somedir) is undefined and
-+  #     $(DESTDIR) is not.
-+  #  To support the latter case, we have to write
-+  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-+  #  so the `.' trick is pointless.
-+  mkdir_p='mkdir -p --'
-+else
-+  # On NextStep and OpenStep, the `mkdir' command does not
-+  # recognize any option.  It will interpret all options as
-+  # directories to create, and then abort because `.' already
-+  # exists.
-+  for d in ./-p ./--version;
-+  do
-+    test -d $d && rmdir $d
-+  done
-+  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-+  if test -f "$ac_aux_dir/mkinstalldirs"; then
-+    mkdir_p='$(mkinstalldirs)'
-+  else
-+    mkdir_p='$(install_sh) -d'
-+  fi
-+fi
-+AC_SUBST([mkdir_p])])
-+
-+# Helper functions for option handling.                     -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 3
-+
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME.  Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-+   if test "$[*]" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t $srcdir/configure conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$[*]" != "X $srcdir/configure conftest.file" \
-+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "$[2]" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries.  This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+  AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
-+# Check how to create a tarball.                            -*- Autoconf -*-
-+
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+#     tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+#     $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [m4_case([$1], [ustar],, [pax],,
-+              [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+  case $_am_tool in
-+  gnutar)
-+    for _am_tar in tar gnutar gtar;
-+    do
-+      AM_RUN_LOG([$_am_tar --version]) && break
-+    done
-+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+    am__untar="$_am_tar -xf -"
-+    ;;
-+  plaintar)
-+    # Must skip GNU tar: if it does not support --format= it doesn't create
-+    # ustar tarball either.
-+    (tar --version) >/dev/null 2>&1 && continue
-+    am__tar='tar chf - "$$tardir"'
-+    am__tar_='tar chf - "$tardir"'
-+    am__untar='tar xf -'
-+    ;;
-+  pax)
-+    am__tar='pax -L -x $1 -w "$$tardir"'
-+    am__tar_='pax -L -x $1 -w "$tardir"'
-+    am__untar='pax -r'
-+    ;;
-+  cpio)
-+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+    am__untar='cpio -i -H $1 -d'
-+    ;;
-+  none)
-+    am__tar=false
-+    am__tar_=false
-+    am__untar=false
-+    ;;
-+  esac
-+
-+  # If the value was cached, stop now.  We just wanted to have am__tar
-+  # and am__untar set.
-+  test -n "${am_cv_prog_tar_$1}" && break
-+
-+  # tar/untar a dummy directory, and stop if the command works
-+  rm -rf conftest.dir
-+  mkdir conftest.dir
-+  echo GrepMe > conftest.dir/file
-+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+  rm -rf conftest.dir
-+  if test -s conftest.tar; then
-+    AM_RUN_LOG([$am__untar <conftest.tar])
-+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+  fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
-Index: libparagui1.0-1.0.4/depcomp
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ libparagui1.0-1.0.4/depcomp	2006-06-15 22:26:29.000000000 +0200
-@@ -0,0 +1,530 @@
-+#! /bin/sh
-+# depcomp - compile a program generating dependencies as side-effects
-+
-+scriptversion=2005-07-09.11
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# 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., 51 Franklin Street, Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
-+
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-+
-+Run PROGRAMS ARGS to compile a file, generating dependencies
-+as side-effects.
-+
-+Environment variables:
-+  depmode     Dependency tracking mode.
-+  source      Source file read by `PROGRAMS ARGS'.
-+  object      Object file output by `PROGRAMS ARGS'.
-+  DEPDIR      directory where to store dependencies.
-+  depfile     Dependency file to output.
-+  tmpdepfile  Temporary file to use when outputing dependencies.
-+  libtool     Whether libtool is used (yes/no).
-+
-+Report bugs to <bug-automake at gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "depcomp $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
-+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-+  exit 1
-+fi
-+
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-+
-+rm -f "$tmpdepfile"
-+
-+# Some modes work just like other modes, but use different flags.  We
-+# parameterize here, but still list the modes in the big case below,
-+# to make depend.m4 easier to write.  Note that we *cannot* use a case
-+# here, because this file can only contain one case statement.
-+if test "$depmode" = hp; then
-+  # HP compiler uses -M and no extra arg.
-+  gccflag=-M
-+  depmode=gcc
-+fi
-+
-+if test "$depmode" = dashXmstdout; then
-+   # This is just like dashmstdout with a different argument.
-+   dashmflag=-xM
-+   depmode=dashmstdout
-+fi
-+
-+case "$depmode" in
-+gcc3)
-+## gcc 3 implements dependency tracking that does exactly what
-+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-+## it if -MD -MP comes after the -MF stuff.  Hmm.
-+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  mv "$tmpdepfile" "$depfile"
-+  ;;
-+
-+gcc)
-+## There are various ways to get dependency output from gcc.  Here's
-+## why we pick this rather obscure method:
-+## - Don't want to use -MD because we'd like the dependencies to end
-+##   up in a subdir.  Having to rename by hand is ugly.
-+##   (We might end up doing this anyway to support other compilers.)
-+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-+##   -MM, not -M (despite what the docs say).
-+## - Using -M directly means running the compiler twice (even worse
-+##   than renaming).
-+  if test -z "$gccflag"; then
-+    gccflag=-MD,
-+  fi
-+  "$@" -Wp,"$gccflag$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-+## The second -e expression handles DOS-style file names with drive letters.
-+  sed -e 's/^[^:]*: / /' \
-+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-+## This next piece of magic avoids the `deleted header file' problem.
-+## The problem is that when a header file which appears in a .P file
-+## is deleted, the dependency causes make to die (because there is
-+## typically no way to rebuild the header).  We avoid this by adding
-+## dummy dependencies for each header file.  Too bad gcc doesn't do
-+## this for us directly.
-+  tr ' ' '
-+' < "$tmpdepfile" |
-+## Some versions of gcc put a space before the `:'.  On the theory
-+## that the space means something, we add a space to the output as
-+## well.
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+hp)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
-+sgi)
-+  if test "$libtool" = yes; then
-+    "$@" "-Wp,-MDupdate,$tmpdepfile"
-+  else
-+    "$@" -MDupdate "$tmpdepfile"
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+
-+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-+    echo "$object : \\" > "$depfile"
-+
-+    # Clip off the initial element (the dependent).  Don't try to be
-+    # clever and replace this with sed code, as IRIX sed won't handle
-+    # lines with more than a fixed number of characters (4096 in
-+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-+    # the IRIX cc adds comments like `#:fec' to the end of the
-+    # dependency line.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-+    tr '
-+' ' ' >> $depfile
-+    echo >> $depfile
-+
-+    # The second pass generates a dummy entry for each header file.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-+   >> $depfile
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+aix)
-+  # The C for AIX Compiler uses -M and outputs the dependencies
-+  # in a .u file.  In older versions, this file always lives in the
-+  # current directory.  Also, the AIX compiler puts `$object:' at the
-+  # start of each line; $object doesn't have directory information.
-+  # Version 6 uses the directory in both cases.
-+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-+  tmpdepfile="$stripped.u"
-+  if test "$libtool" = yes; then
-+    "$@" -Wc,-M
-+  else
-+    "$@" -M
-+  fi
-+  stat=$?
-+
-+  if test -f "$tmpdepfile"; then :
-+  else
-+    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-+    tmpdepfile="$stripped.u"
-+  fi
-+
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+
-+  if test -f "$tmpdepfile"; then
-+    outname="$stripped.o"
-+    # Each line is of the form `foo.o: dependent.h'.
-+    # Do two passes, one to just change these to
-+    # `$object: dependent.h' and one to simply `dependent.h:'.
-+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+icc)
-+  # Intel's C compiler understands `-MD -MF file'.  However on
-+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-+  # ICC 7.0 will fill foo.d with something like
-+  #    foo.o: sub/foo.c
-+  #    foo.o: sub/foo.h
-+  # which is wrong.  We want:
-+  #    sub/foo.o: sub/foo.c
-+  #    sub/foo.o: sub/foo.h
-+  #    sub/foo.c:
-+  #    sub/foo.h:
-+  # ICC 7.1 will output
-+  #    foo.o: sub/foo.c sub/foo.h
-+  # and will wrap long lines using \ :
-+  #    foo.o: sub/foo.c ... \
-+  #     sub/foo.h ... \
-+  #     ...
-+
-+  "$@" -MD -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  # Each line is of the form `foo.o: dependent.h',
-+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-+  # Do two passes, one to just change these to
-+  # `$object: dependent.h' and one to simply `dependent.h:'.
-+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+  # Some versions of the HPUX 10.20 sed can't process this invocation
-+  # correctly.  Breaking it into two sed invocations is a workaround.
-+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+    sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+tru64)
-+   # The Tru64 compiler uses -MD to generate dependencies as a side
-+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-+   # dependencies in `foo.d' instead, so we check for that too.
-+   # Subdirectories are respected.
-+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+   test "x$dir" = "x$object" && dir=
-+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+
-+   if test "$libtool" = yes; then
-+      # With Tru64 cc, shared objects can also be used to make a
-+      # static library.  This mecanism is used in libtool 1.4 series to
-+      # handle both shared and static libraries in a single compilation.
-+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+      #
-+      # With libtool 1.5 this exception was removed, and libtool now
-+      # generates 2 separate objects for the 2 libraries.  These two
-+      # compilations output dependencies in in $dir.libs/$base.o.d and
-+      # in $dir$base.o.d.  We have to check for both files, because
-+      # one of the two compilations can be disabled.  We should prefer
-+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+      # automatically cleaned when .libs/ is deleted, while ignoring
-+      # the former would cause a distcleancheck panic.
-+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-+      "$@" -Wc,-MD
-+   else
-+      tmpdepfile1=$dir$base.o.d
-+      tmpdepfile2=$dir$base.d
-+      tmpdepfile3=$dir$base.d
-+      tmpdepfile4=$dir$base.d
-+      "$@" -MD
-+   fi
-+
-+   stat=$?
-+   if test $stat -eq 0; then :
-+   else
-+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+      exit $stat
-+   fi
-+
-+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+   do
-+     test -f "$tmpdepfile" && break
-+   done
-+   if test -f "$tmpdepfile"; then
-+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+      # That's a tab and a space in the [].
-+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+   else
-+      echo "#dummy" > "$depfile"
-+   fi
-+   rm -f "$tmpdepfile"
-+   ;;
-+
-+#nosideeffect)
-+  # This comment above is used by automake to tell side-effect
-+  # dependency tracking mechanisms from slower ones.
-+
-+dashmstdout)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  test -z "$dashmflag" && dashmflag=-M
-+  # Require at least two characters before searching for `:'
-+  # in the target name.  This is to cope with DOS-style filenames:
-+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+  "$@" $dashmflag |
-+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  tr ' ' '
-+' < "$tmpdepfile" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+dashXmstdout)
-+  # This case only exists to satisfy depend.m4.  It is never actually
-+  # run, as this mode is specially recognized in the preamble.
-+  exit 1
-+  ;;
-+
-+makedepend)
-+  "$@" || exit $?
-+  # Remove any Libtool call
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+  # X makedepend
-+  shift
-+  cleared=no
-+  for arg in "$@"; do
-+    case $cleared in
-+    no)
-+      set ""; shift
-+      cleared=yes ;;
-+    esac
-+    case "$arg" in
-+    -D*|-I*)
-+      set fnord "$@" "$arg"; shift ;;
-+    # Strip any option that makedepend may not understand.  Remove
-+    # the object too, otherwise makedepend will parse it as a source file.
-+    -*|$object)
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"; shift ;;
-+    esac
-+  done
-+  obj_suffix="`echo $object | sed 's/^.*\././'`"
-+  touch "$tmpdepfile"
-+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  sed '1,2d' "$tmpdepfile" | tr ' ' '
-+' | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile" "$tmpdepfile".bak
-+  ;;
-+
-+cpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test $1 != '--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  "$@" -E |
-+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    sed '$ s: \\$::' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  cat < "$tmpdepfile" >> "$depfile"
-+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+msvisualcpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o,
-+  # because we must use -o when running libtool.
-+  "$@" || exit $?
-+  IFS=" "
-+  for arg
-+  do
-+    case "$arg" in
-+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-+	set fnord "$@"
-+	shift
-+	shift
-+	;;
-+    *)
-+	set fnord "$@" "$arg"
-+	shift
-+	shift
-+	;;
-+    esac
-+  done
-+  "$@" -E |
-+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-+  echo "	" >> "$depfile"
-+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+none)
-+  exec "$@"
-+  ;;
-+
-+*)
-+  echo "Unknown depmode $depmode" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+exit 0
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:

Modified: unstable/libparagui1.0/debian/patches/series
===================================================================
--- unstable/libparagui1.0/debian/patches/series	2007-12-21 21:07:16 UTC (rev 158)
+++ unstable/libparagui1.0/debian/patches/series	2007-12-21 23:27:51 UTC (rev 159)
@@ -1,4 +1,5 @@
 000_freetype_linkage.diff -p1
+001_autotools.diff
 010_rebootstrap.diff
 020_stl_map.diff
 021_pgtimerobject.h.diff -p0

Modified: unstable/libparagui1.0/debian/rules
===================================================================
--- unstable/libparagui1.0/debian/rules	2007-12-21 21:07:16 UTC (rev 158)
+++ unstable/libparagui1.0/debian/rules	2007-12-21 23:27:51 UTC (rev 159)
@@ -41,20 +41,15 @@
 	/usr/bin/docbook-to-man debian/paragui-config.sgml > paragui-config.1
 	touch build-stamp
 
-distclean:
-	# clean subdirs that don't get cleaned automatically by upstream
-	-$(MAKE) -C bindings/ruby distclean
-	-$(MAKE) -C bindings/python distclean
-	-$(MAKE) -C src/expat distclean
-	-$(MAKE) distclean
-
-clean: distclean
+clean:
 	dh_testdir
 	dh_testroot
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f build-stamp 
 	rm -f paragui-config.1
 	rm -f config.sub config.guess
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+	rm -rf .pc/
 	dh_clean
 
 install: build




More information about the pkg-sdl-commits mailing list