rename packages/ to recipes/ per earlier agreement

See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
author: Denys Dmytriyenko <denis@denix.org> 2009-03-17 14:32:59 -0400
committer: Denys Dmytriyenko <denis@denix.org> 2009-03-17 14:32:59 -0400
commit: 709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree: 37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/squeak
parent: fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
download: openembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz
2 files changed, 0 insertions, 24199 deletions
diff --git a/packages/squeak/files/configure-fixes.patch b/packages/squeak/files/configure-fixes.patch
deleted file mode 100644
index 9ed78472d4..0000000000
--- a/packages/squeak/files/configure-fixes.patch
+++ /dev/null
@@ -1,24113 +0,0 @@
-diff --git a/platforms/unix/config/Makefile.in b/platforms/unix/config/Makefile.in
-index e911837..45881bc 100644
---- a/platforms/unix/config/Makefile.in
-+++ b/platforms/unix/config/Makefile.in
-@@ -43,12 +43,7 @@ all : $(squeak) plugins squeak.1 $(npsqueak)
- # VM
- 
- $(squeak) : config.sh $(SQLIBS) version.o
--	$(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] vm/vm.a
--	@echo
--	@size $(squeak)
--	@echo
--	@./$(squeak) -version
--	@echo
-+	$(LINK) $(squeak) vm/vm.a $(SQLIBS) version.o $(LIBS) [plibs]
- 
- version.o : version.c
- 	$(COMPILE) version.o version.c
-diff --git a/platforms/unix/config/Makefile.install b/platforms/unix/config/Makefile.install
-index 447a5f9..ca44bbf 100644
---- a/platforms/unix/config/Makefile.install
-+++ b/platforms/unix/config/Makefile.install
-@@ -16,102 +16,102 @@ uninstall : uninstall-squeak uninstall-plugins uninstall-doc $(uninstall_nps)
- # squeak
- 
- install-squeak : $(squeak)
--	$(MKINSTALLDIRS) $(ROOT)$(plgdir)
--	$(INSTALL_PROG) $(squeak) $(ROOT)$(plgdir)
--	$(MKINSTALLDIRS) $(ROOT)$(bindir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(plgdir)
-+	$(INSTALL_PROG) $(squeak) $(DESTDIR)$(ROOT)$(plgdir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(bindir)
- 	if test -n "$(VM_APP_ICONS)"; then \
--	  $(INSTALL_DATA) $(ICONS) $(ROOT)$(VM_APP_ICONS); \
-+	  $(INSTALL_DATA) $(ICONS) $(DESTDIR)$(ROOT)$(VM_APP_ICONS); \
- 	fi
- 	( path=`$(cfgdir)/relpath $(bindir) $(plgdir)`; \
--	  cd $(ROOT)$(bindir); \
-+	  cd $(DESTDIR)$(ROOT)$(bindir); \
- 	  rm -f $(squeak); \
- 	  $(LN_S) $$path/$(squeak) .; )
- 
- uninstall-squeak : .force
- 	if test -n "$(VM_APP_ICONS)"; then \
--	  $(UNINSTALL) $(ROOT)$(VM_APP_ICONS); \
-+	  $(UNINSTALL) $(DESTDIR)$(ROOT)$(VM_APP_ICONS); \
- 	fi
--	@$(UNINSTALL) $(ROOT)$(plgdir) $(squeak)
--	@$(UNINSTALL) $(ROOT)$(bindir) $(squeak)
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) $(squeak)
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(bindir) $(squeak)
- 
- # plugins
- 
- install-plugins : plugins
--	$(MKINSTALLDIRS) $(ROOT)$(plgdir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(plgdir)
- 	@list='$(PLUGINS_LA)'; for p in $$list; do \
- 	  if test -f */$$p; then \
--	    echo "$(LIBTOOL) --mode=install $(INSTALL_PROG) $$p $(ROOT)$(plgdir)/$$p"; \
--	    $(LIBTOOL) --mode=install $(INSTALL_PROG) */$$p $(ROOT)$(plgdir)/$$p; \
-+	    echo "$(LIBTOOL) --mode=install $(INSTALL_PROG) $$p $(DESTDIR)$(ROOT)$(plgdir)/$$p"; \
-+	    $(LIBTOOL) --mode=install $(INSTALL_PROG) */$$p $(DESTDIR)$(ROOT)$(plgdir)/$$p; \
- 	  else :; fi; \
- 	done
--	-rm $(ROOT)$(plgdir)/*.la
-+	-rm $(DESTDIR)$(ROOT)$(plgdir)/*.la
- 
- uninstall-plugins : .force
- 	@list='$(PLUGINS_LA)'; for p in $$list; do \
--	  filename=$(ROOT)/$(plgdir)/`basename $$p .la`;\
-+	  filename=$(DESTDIR)$(ROOT)/$(plgdir)/`basename $$p .la`;\
- 	  if test -f $$filename; then \
- 	    echo "$(LIBTOOL) --mode=uninstall rm -f $$filename"; \
- 	    $(LIBTOOL) --mode=uninstall rm -f $$filename; \
- 	  else
- 	    echo "$$filename does not exist"; fi; \
- 	done
--	@$(UNINSTALL) $(ROOT)$(plgdir)
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir)
- 
- # doc
- 
- install-doc : squeak.1
--	$(MKINSTALLDIRS) $(ROOT)$(docdir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(docdir)
- 	@list='$(DOCFILES)'; for f in $$list; do \
--	  echo $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \
--	  $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \
-+	  echo $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(DESTDIR)$(ROOT)$(docdir); \
-+	  $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(DESTDIR)$(ROOT)$(docdir); \
- 	done
--	-gzip -f9 $(ROOT)$(docdir)/*
--	$(MKINSTALLDIRS) $(ROOT)$(mandir)/man1
--	$(INSTALL_DATA) squeak.1 $(ROOT)$(mandir)/man1
--	rm -f $(ROOT)$(mandir)/man1/inisqueak.1 $(ROOT)$(mandir)/man1/inisqueak.1.gz
--	if test -f $(ROOT)$(mandir)/man1/squeak.1; then $(LN) $(ROOT)$(mandir)/man1/squeak.1 $(ROOT)$(mandir)/man1/inisqueak.1; fi
--	if test -f $(ROOT)$(mandir)/man1/squeak.1.gz; then $(LN) $(ROOT)$(mandir)/man1/squeak.1.gz $(ROOT)$(mandir)/man1/inisqueak.1.gz; fi
-+	-gzip -f9 $(DESTDIR)$(ROOT)$(docdir)/*
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(mandir)/man1
-+	$(INSTALL_DATA) squeak.1 $(DESTDIR)$(ROOT)$(mandir)/man1
-+	rm -f $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1 $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1.gz
-+	if test -f $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1; then $(LN) $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1 $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1; fi
-+	if test -f $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1.gz; then $(LN) $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1.gz $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1.gz; fi
- 
- uninstall-doc :
- 	@list='$(DOCFILES)'; for f in $$list; do \
--	  rm -fv $(ROOT)$(docdir)/$$f.gz; \
-+	  rm -fv $(DESTDIR)$(ROOT)$(docdir)/$$f.gz; \
- 	done
--	@$(UNINSTALL) $(ROOT)$(docdir) $(DOCFILES)
--	@$(UNINSTALL) $(ROOT)$(mandir)/man1 squeak.1 inisqueak.1
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(docdir) $(DOCFILES)
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(mandir)/man1 squeak.1 inisqueak.1
- 
- # image
- 
- install-image : inisqueak $(topdir)/Squeak$(SQ_VERSION).image.gz $(topdir)/Squeak$(SQ_VERSION).changes.gz
--	$(MKINSTALLDIRS) $(ROOT)$(imgdir)
--	$(INSTALL_PROG) inisqueak $(ROOT)$(imgdir)
--	$(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).image.gz $(ROOT)$(imgdir)
--	$(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).changes.gz $(ROOT)$(imgdir)
--	$(LN_S) Squeak$(SQ_VERSION).image.gz $(ROOT)$(imgdir)/squeak.image.gz
--	$(LN_S) Squeak$(SQ_VERSION).changes.gz $(ROOT)$(imgdir)/squeak.changes.gz
--	$(MKINSTALLDIRS) $(ROOT)$(bindir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(imgdir)
-+	$(INSTALL_PROG) inisqueak $(DESTDIR)$(ROOT)$(imgdir)
-+	$(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).image.gz $(DESTDIR)$(ROOT)$(imgdir)
-+	$(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).changes.gz $(DESTDIR)$(ROOT)$(imgdir)
-+	$(LN_S) Squeak$(SQ_VERSION).image.gz $(DESTDIR)$(ROOT)$(imgdir)/squeak.image.gz
-+	$(LN_S) Squeak$(SQ_VERSION).changes.gz $(DESTDIR)$(ROOT)$(imgdir)/squeak.changes.gz
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(bindir)
- 	( path=`$(cfgdir)/relpath $(bindir) $(imgdir)`; \
--	  cd $(ROOT)$(bindir); \
-+	  cd $(DESTDIR)$(ROOT)$(bindir); \
- 	  rm -f inisqueak; \
- 	  $(LN_S) $$path/inisqueak .; )
- 
- uninstall-image :
--	@$(UNINSTALL) $(ROOT)$(plgdir) Squeak$(SQ_VERSION).image.gz
--	@$(UNINSTALL) $(ROOT)$(plgdir) Squeak$(SQ_VERSION).changes.gz
--	@$(UNINSTALL) $(ROOT)$(plgdir) inisqueak
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) Squeak$(SQ_VERSION).image.gz
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) Squeak$(SQ_VERSION).changes.gz
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) inisqueak
- 
- # sources
- 
- install-sources :
--	$(MKINSTALLDIRS) $(ROOT)$(imgdir)
--	$(INSTALL_DATA) $(topdir)/SqueakV$(SQ_MAJOR).sources $(ROOT)$(imgdir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(imgdir)
-+	$(INSTALL_DATA) $(topdir)/SqueakV$(SQ_MAJOR).sources $(DESTDIR)$(ROOT)$(imgdir)
- 
- uninstall-sources :
--	@$(UNINSTALL) $(ROOT)$(imgdir) SqueakV$(SQ_MAJOR).sources
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(imgdir) SqueakV$(SQ_MAJOR).sources
- 
- # npsqueak
- 
- install-npsqueak : npsqueak .force
--	$(SHELL) -ec 'cd nps; $(MAKE) install ROOT=$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)'
-+	$(SHELL) -ec 'cd nps; $(MAKE) install ROOT=$(DESTDIR)$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)'
- 
- uninstall-npsqueak : npsqueak .force
--	$(SHELL) -ec 'cd nps; $(MAKE) uninstall ROOT=$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)'
-+	$(SHELL) -ec 'cd nps; $(MAKE) uninstall ROOT=$(DESTDIR)$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)'
-diff --git a/platforms/unix/config/acinclude.m4 b/platforms/unix/config/acinclude.m4
-index acaf3c5..a712864 100644
---- a/platforms/unix/config/acinclude.m4
-+++ b/platforms/unix/config/acinclude.m4
-@@ -92,12 +92,12 @@ AC_DEFUN([AC_CHECK_INT64_T],[
-     AC_MSG_ERROR([could not find a 64-bit integer type])
-   fi
-   SQUEAK_INT64_T="$ac_cv_int64_t"
--  AC_DEFINE_UNQUOTED(squeakInt64, $ac_cv_int64_t)])
-+  AC_DEFINE_UNQUOTED(squeakInt64, $ac_cv_int64_t, "64bit type")])
-   
- 
- AC_DEFUN([AC_NEED_SUNOS_H],
- [case "$host" in
--  *-sunos*)	AC_DEFINE(NEED_SUNOS_H, 1)
-+  *-sunos*)	AC_DEFINE(NEED_SUNOS_H, 1, "sunos")
- esac])
- 
- 
-@@ -118,7 +118,7 @@ if test "$GCC" = yes; then
-     ac_optflags="-O3 -funroll-loops -mcpu=750 -mno-fused-madd"
-     ;;
-   esac
--  AC_DEFINE(VM_BUILD_STRING, ["Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__])
-+  AC_DEFINE(VM_BUILD_STRING, ["Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__], "Build string")
- else
-   ac_optflags="-O"
-   ac_vm_build_date="`date`"
-@@ -177,38 +177,38 @@ AC_DEFUN([AC_CHECK_ATEXIT],
-   AC_TRY_COMPILE([#include <stdlib.h>],[on_exit(0);], ac_cv_atexit="on_exit",
-   ac_cv_atexit="no")))
- if test "$ac_cv_atexit" != "no"; then
--  AC_DEFINE_UNQUOTED(AT_EXIT, $ac_cv_atexit)
-+  AC_DEFINE_UNQUOTED(AT_EXIT, $ac_cv_atexit, "atexit or on_exit")
- fi])
- 
- AC_DEFUN([AC_CHECK_SOCKLEN_T],
- [AC_CACHE_CHECK([for socklen_t in sys/socket.h], ac_cv_socklen_t,
-   AC_TRY_COMPILE([#include <sys/socket.h>],[sizeof(socklen_t);],
-     ac_cv_socklen_t="yes", ac_cv_socklen_t="no"))
--test "$ac_cv_socklen_t" != "yes" && AC_DEFINE(socklen_t, int)])
-+test "$ac_cv_socklen_t" != "yes" && AC_DEFINE(socklen_t, int, "socklen type")])
- 
- AC_DEFUN([AC_CHECK_TZSET],
- [AC_CACHE_CHECK([for tzset], ac_cv_tzset,
-   AC_TRY_COMPILE([#include <time.h>],[tzet();],
-     ac_cv_tzset="yes", ac_cv_tzset="no"))
--test "$ac_cv_tzset" != "no" && AC_DEFINE(HAVE_TZSET)])
-+test "$ac_cv_tzset" != "no" && AC_DEFINE(HAVE_TZSET, [1], "tzset")])
- 
- AC_DEFUN([AC_CHECK_GMTOFF],
- [AC_CACHE_CHECK([for gmtoff in struct tm], ac_cv_tm_gmtoff,
-   AC_TRY_COMPILE([#include <time.h>],[struct tm tm; tm.tm_gmtoff;],
-     ac_cv_tm_gmtoff="yes", ac_cv_tm_gmtoff="no"))
--test "$ac_cv_tm_gmtoff" != "no" && AC_DEFINE(HAVE_TM_GMTOFF)])
-+test "$ac_cv_tm_gmtoff" != "no" && AC_DEFINE(HAVE_TM_GMTOFF, [1], "tm")])
- 
- AC_DEFUN([AC_CHECK_TIMEZONE],
- [AC_CACHE_CHECK([for timezone and daylight variables], ac_cv_timezone,
-   AC_TRY_COMPILE([extern long timezone; extern int daylight;],[timezone;daylight;],
-     ac_cv_timezone="yes", ac_cv_timezone="no"))
--test "$ac_cv_timezone" != "no" && AC_DEFINE(HAVE_TIMEZONE)])
-+test "$ac_cv_timezone" != "no" && AC_DEFINE(HAVE_TIMEZONE, [1], "timezone")])
- 
- AC_DEFUN([AC_CHECK_GETHOSTNAME],
- [AC_CACHE_CHECK([for gethostname in unistd.h], ac_cv_gethostname_p,
-   AC_TRY_COMPILE([#include <unistd.h>],[return (int)gethostname;],
-     ac_cv_gethostname_p="yes", ac_cv_gethostname_p="no"))
--test "$ac_cv_gethostname_p" = "no" && AC_DEFINE(NEED_GETHOSTNAME_P)])
-+test "$ac_cv_gethostname_p" = "no" && AC_DEFINE(NEED_GETHOSTNAME_P, [1], "gethostname")])
- 
- 
- if test -x /bin/test; then
-@@ -234,14 +234,14 @@ AC_DEFUN([AC_C_DOUBLE_ALIGNMENT],
-   AC_TRY_RUN([f(int i){*(double *)i=*(double *)(i+4);}
-               int main(){char b[[12]];f(b);return 0;}],
-     ac_cv_double_align="yes", ac_cv_double_align="no"))
--test "$ac_cv_double_align" = "no" && AC_DEFINE(DOUBLE_WORD_ALIGNMENT)])
-+test "$ac_cv_double_align" = "no" && AC_DEFINE(DOUBLE_WORD_ALIGNMENT, [1], "unaligned double access")])
- 
- AC_DEFUN([AC_C_DOUBLE_ORDER],
- [AC_CACHE_CHECK([whether doubles are stored in Squeak order], ac_cv_double_order,
-   AC_TRY_RUN([union { double d; int i[[2]]; } d;
- 	      int main(void) { d.d= 1.0;  return d.i[[0]] == 0; }],
-     ac_cv_double_order="yes", ac_cv_double_order="no"))
--test "$ac_cv_double_order" = "no" && AC_DEFINE(DOUBLE_WORD_ORDER)])
-+test "$ac_cv_double_order" = "no" && AC_DEFINE(DOUBLE_WORD_ORDER, [1], "double word order")])
- 
- # this assumes that libtool has already been configured and built --
- # if not then err on the side of conservatism.
-@@ -252,7 +252,7 @@ if test -x ./libtool &&
- then ac_cv_module_prefix="(none)";
- else ac_cv_module_prefix="lib"
- fi)
--AC_DEFINE_UNQUOTED(VM_MODULE_PREFIX,"$mkfrags_lib_prefix")
-+AC_DEFINE_UNQUOTED(VM_MODULE_PREFIX,"$mkfrags_lib_prefix", "VM module prefix")
- test "$ac_cv_module_prefix" = lib && mkfrags_lib_prefix=lib])
- 
- AC_DEFUN([AC_64BIT_ARCH],
-diff --git a/platforms/unix/config/configure b/platforms/unix/config/configure
-index a59ea90..ad406b2 100755
---- a/platforms/unix/config/configure
-+++ b/platforms/unix/config/configure
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60.
-+# 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.
-@@ -10,7 +10,8 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
--# Be Bourne compatible
-+# 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=:
-@@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   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
-+
-+
- 
- 
- # PATH needs CR
-@@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
- 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=.
-@@ -233,7 +237,6 @@ IFS=$as_save_IFS
- 	 # 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=:
-@@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   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
-@@ -253,7 +258,6 @@ _ASEOF
-   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=:
-@@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   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 () {
-@@ -512,19 +518,28 @@ else
-   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'"
-@@ -571,7 +586,7 @@ 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
-@@ -684,9 +699,9 @@ fi
- 
- 
- 
--tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`
-+tagnames=${tagnames+${tagnames},}CXX
- 
--tagnames=`echo "$tagnames,F77" | sed 's/^,//'`
-+tagnames=${tagnames+${tagnames},}F77
- 
- exec 7<&0 </dev/null 6>&1
- 
-@@ -719,36 +734,36 @@ ac_unique_file="config.h.in"
- # 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"
- 
-@@ -855,15 +870,14 @@ uninstall_nps
- SQ_LIBDIR
- int_modules
- ext_modules
--XMKMF
-+HAVE_LANGINFO_CODESET
-+HAVE_NANOSLEEP
- X_CFLAGS
- X_PRE_LIBS
- X_LIBS
- X_EXTRA_LIBS
- X_CPPFLAGS
- X_INCLUDES
--HAVE_LANGINFO_CODESET
--HAVE_NANOSLEEP
- LIBM_CFLAGS
- FFI_DIR
- FFI_C
-@@ -888,6 +902,7 @@ target_alias
- CC
- CFLAGS
- LDFLAGS
-+LIBS
- CPPFLAGS
- CPP
- CXX
-@@ -895,8 +910,7 @@ CXXFLAGS
- CCC
- CXXCPP
- F77
--FFLAGS
--XMKMF'
-+FFLAGS'
- 
- 
- # Initialize some variables set by options.
-@@ -1002,10 +1016,10 @@ do
-   -disable-* | --disable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    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)
-@@ -1021,10 +1035,10 @@ do
-   -enable-* | --enable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    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 \
-@@ -1218,19 +1232,19 @@ do
-   -with-* | --with-*)
-     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    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=\$ac_optarg ;;
- 
-   -without-* | --without-*)
-     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    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)
-@@ -1494,11 +1508,11 @@ Optional Packages:
-   --with-tags[=TAGS]      include additional configurations [automatic]
-   --without-rfb           disable Remote FrameBuffer support default=enabled
-   --without-npsqueak      disable browser plugin support default=enabled
-+  --with-custom-display   enable custom window support default=disabled
-   --without-quartz        disable MacOSX Window System support default=enabled
-   --without-x             disable X Window System support default=enabled
-   --without-gl            disable OpenGL support default=enabled
-   --with-x                use the X Window System
--  --with-custom-display   enable custom window support default=disabled
-   --with-custom-sound     enable custom sound support default=disabled
-   --with-ffi=ffi          use FFI support default=auto
- 
-@@ -1507,6 +1521,7 @@ Some influential environment variables:
-   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
-@@ -1515,7 +1530,6 @@ Some influential environment variables:
-   CXXCPP      C++ preprocessor
-   F77         Fortran 77 compiler command
-   FFLAGS      Fortran 77 compiler flags
--  XMKMF       Path to xmkmf, Makefile generator for X Window System
- 
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -1581,7 +1595,7 @@ test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
-   cat <<\_ACEOF
- configure
--generated by GNU Autoconf 2.60
-+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.
-@@ -1595,7 +1609,7 @@ This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.60.  Invocation command line was
-+generated by GNU Autoconf 2.61.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -1832,7 +1846,7 @@ _ACEOF
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
- if test -n "$CONFIG_SITE"; then
--  set x "$CONFIG_SITE"
-+  set x $CONFIG_SITE
- elif test "x$prefix" != xNONE; then
-   set x "$prefix/share/config.site" "$prefix/etc/config.site"
- else
-@@ -2007,6 +2021,7 @@ blddir=`pwd`
- 
- SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE}
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define SQ_VERSION "${SQ_VERSION}"
- _ACEOF
-@@ -2019,6 +2034,7 @@ _ACEOF
- 
- VM_VERSION=${VM_MAJOR}.${VM_MINOR}-${VM_RELEASE}
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define VM_VERSION "${VM_VERSION}"
- _ACEOF
-@@ -2038,6 +2054,7 @@ plgdir=`eval echo ${imgdir}/${VM_VERSION}`
- 
- 
- 
-+
- cat >>confdefs.h <<\_ACEOF
- #define OS_TYPE "unix"
- _ACEOF
-@@ -2166,14 +2183,17 @@ host=`echo $host | sed 's,-unknown,,'`
- 
- 
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define VM_HOST "$host"
- _ACEOF
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define VM_HOST_OS "$host_os"
- _ACEOF
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define VM_HOST_CPU "$host_cpu"
- _ACEOF
-@@ -2258,7 +2278,7 @@ 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
-@@ -2298,7 +2318,7 @@ 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="gcc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2355,7 +2375,7 @@ 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}cc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2396,7 +2416,7 @@ 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
-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-        continue
-@@ -2454,7 +2474,7 @@ 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$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2498,7 +2518,7 @@ 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
-@@ -2639,7 +2659,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- # 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
-@@ -2667,6 +2687,12 @@ done
- test "$ac_cv_exeext" = no && ac_cv_exeext=
- 
- 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
- 
-@@ -2678,8 +2704,6 @@ See \`config.log' for more details." >&2;}
- 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.
-@@ -2857,27 +2881,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -2932,27 +2939,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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 "$as_me: failed program was:" >&5
-@@ -2987,27 +2977,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -3043,27 +3016,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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 "$as_me: failed program was:" >&5
-@@ -3179,27 +3135,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -3254,7 +3193,7 @@ 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_AS="as"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3303,7 +3242,7 @@ 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_RANLIB="${ac_tool_prefix}ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3343,7 +3282,7 @@ 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_RANLIB="ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3418,7 +3357,7 @@ case $as_dir/ in
-     # 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 "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
- 	    # AIX install.  It has an incompatible calling convention.
-@@ -3525,7 +3464,7 @@ 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_LN="ln"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3550,236 +3489,6 @@ fi
- # Check size assumptions of basic data types
- 
- 
--
--  { echo "$as_me:$LINENO: checking \"size of int\"" >&5
--echo $ECHO_N "checking \"size of int\"... $ECHO_C" >&6; }
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/types.h>
--	      int main(){return(sizeof(int) == 4)?0:1;}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./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
--  { echo "$as_me:$LINENO: result: \"okay\"" >&5
--echo "${ECHO_T}\"okay\"" >&6; }
--else
--  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 )
--{ echo "$as_me:$LINENO: result: \"bad\"" >&5
--echo "${ECHO_T}\"bad\"" >&6; }
--    { { echo "$as_me:$LINENO: error: \"one or more basic data types has an incompatible size: giving up\"" >&5
--echo "$as_me: error: \"one or more basic data types has an incompatible size: giving up\"" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--
--  { echo "$as_me:$LINENO: checking \"size of double\"" >&5
--echo $ECHO_N "checking \"size of double\"... $ECHO_C" >&6; }
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <sys/types.h>
--	      int main(){return(sizeof(double) == 8)?0:1;}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./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
--  { echo "$as_me:$LINENO: result: \"okay\"" >&5
--echo "${ECHO_T}\"okay\"" >&6; }
--else
--  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 )
--{ echo "$as_me:$LINENO: result: \"bad\"" >&5
--echo "${ECHO_T}\"bad\"" >&6; }
--    { { echo "$as_me:$LINENO: error: \"one or more basic data types has an incompatible size: giving up\"" >&5
--echo "$as_me: error: \"one or more basic data types has an incompatible size: giving up\"" >&2;}
--   { (exit 1); exit 1; }; }
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--
--
--  { echo "$as_me:$LINENO: checking for 64-bit integer type" >&5
--echo $ECHO_N "checking for 64-bit integer type... $ECHO_C" >&6; }
--if test "${ac_cv_int64_t+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--int main(){return(sizeof(long) == 8)?0:1;}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./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
--  ac_cv_int64_t="long"
--else
--  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 )
--if test "$cross_compiling" = yes; then
--  { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&5
--echo "$as_me: error: cannot run test program while cross compiling
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--int main(){return(sizeof(long long) == 8)?0:1;}
--_ACEOF
--rm -f conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && { ac_try='./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
--  ac_cv_int64_t="long long"
--else
--  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_int64_t="no"
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_int64_t" >&5
--echo "${ECHO_T}$ac_cv_int64_t" >&6; }
--  if test "$ac_cv_int64_t" = ""; then
--    { { echo "$as_me:$LINENO: error: could not find a 64-bit integer type" >&5
--echo "$as_me: error: could not find a 64-bit integer type" >&2;}
--   { (exit 1); exit 1; }; }
--  fi
--  SQUEAK_INT64_T="$ac_cv_int64_t"
--  cat >>confdefs.h <<_ACEOF
--#define squeakInt64 $ac_cv_int64_t
--_ACEOF
--
--
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -3832,17 +3541,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3876,17 +3578,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -3951,17 +3646,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3995,17 +3683,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -4060,7 +3741,7 @@ do
-   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
-@@ -4142,7 +3823,7 @@ do
-   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
-@@ -4238,27 +3919,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -4434,27 +4098,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -4515,27 +4162,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_type_int=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -4549,16 +4179,15 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5
- echo "${ECHO_T}$ac_cv_type_int" >&6; }
- 
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
- { echo "$as_me:$LINENO: checking size of int" >&5
- echo $ECHO_N "checking size of int... $ECHO_C" >&6; }
- if test "${ac_cv_sizeof_int+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if test "$ac_cv_type_int" = yes; then
--  # The cast to long int works around a bug in the HP C Compiler
--  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--  # This bug is HP SR number 8606223364.
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -4568,7 +4197,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef int ac__type_sizeof_;
-+   typedef int ac__type_sizeof_;
- int
- main ()
- {
-@@ -4592,27 +4221,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -4622,7 +4234,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef int ac__type_sizeof_;
-+   typedef int ac__type_sizeof_;
- int
- main ()
- {
-@@ -4646,38 +4258,112 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+   typedef int ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_hi=$ac_mid; break
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_lo=$ac_mid; break
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_lo=`expr $ac_mid + 1`
--			if test $ac_lo -le $ac_mid; then
-+	ac_hi=`expr '(' $ac_mid ')' - 1`
-+			if test $ac_mid -le $ac_hi; then
- 			  ac_lo= ac_hi=
- 			  break
- 			fi
--			ac_mid=`expr 2 '*' $ac_mid + 1`
-+			ac_mid=`expr 2 '*' $ac_mid`
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-@@ -4686,18 +4372,28 @@ else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	cat >conftest.$ac_ext <<_ACEOF
-+	ac_lo= ac_hi=
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+# Binary search between lo and hi bounds.
-+while test "x$ac_lo" != "x$ac_hi"; do
-+  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
-+  cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef int ac__type_sizeof_;
-+   typedef int ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -4717,18 +4413,83 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_hi=$ac_mid
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo=`expr '(' $ac_mid ')' + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+done
-+case $ac_lo in
-+?*) ac_cv_sizeof_int=$ac_lo;;
-+'') if test "$ac_cv_type_int" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (int)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_int=0
-+   fi ;;
-+esac
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+   typedef int ac__type_sizeof_;
-+static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
-+#include <stdio.h>
-+#include <stdlib.h>
-+int
-+main ()
-+{
-+
-+  FILE *f = fopen ("conftest.val", "w");
-+  if (! f)
-+    return 1;
-+  if (((long int) (sizeof (ac__type_sizeof_))) < 0)
-+    {
-+      long int i = longval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%ld\n", i);
-+    }
-+  else
-+    {
-+      unsigned long int i = ulongval ();
-+      if (i != ((long int) (sizeof (ac__type_sizeof_))))
-+	return 1;
-+      fprintf (f, "%lu\n", i);
-+    }
-+  return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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
-+  (eval "$ac_link") 2>&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
-+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-   { (case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
-@@ -4738,7 +4499,138 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_hi=-1 ac_mid=-1
-+  ac_cv_sizeof_int=`cat conftest.val`
-+else
-+  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 )
-+if test "$ac_cv_type_int" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-+See \`config.log' for more details." >&5
-+echo "$as_me: error: cannot compute sizeof (int)
-+See \`config.log' for more details." >&2;}
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_int=0
-+   fi
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.val
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_INT $ac_cv_sizeof_int
-+_ACEOF
-+
-+
-+{ echo "$as_me:$LINENO: checking for double" >&5
-+echo $ECHO_N "checking for double... $ECHO_C" >&6; }
-+if test "${ac_cv_type_double+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+typedef double ac__type_new_;
-+int
-+main ()
-+{
-+if ((ac__type_new_ *) 0)
-+  return 0;
-+if (sizeof (ac__type_new_))
-+  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_cv_type_double=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_type_double=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_type_double" >&5
-+echo "${ECHO_T}$ac_cv_type_double" >&6; }
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
-+{ echo "$as_me:$LINENO: checking size of double" >&5
-+echo $ECHO_N "checking size of double... $ECHO_C" >&6; }
-+if test "${ac_cv_sizeof_double+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  if test "$cross_compiling" = yes; then
-+  # Depending upon the size, compute the lo and hi bounds.
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+   typedef double ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -4747,11 +4639,11 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef int ac__type_sizeof_;
-+   typedef double ac__type_sizeof_;
- int
- main ()
- {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)];
- test_array [0] = 0
- 
-   ;
-@@ -4771,27 +4663,101 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_hi=$ac_mid; break
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_lo=`expr $ac_mid + 1`
-+			if test $ac_lo -le $ac_mid; then
-+			  ac_lo= ac_hi=
-+			  break
-+			fi
-+			ac_mid=`expr 2 '*' $ac_mid + 1`
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+   typedef double ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  ac_hi=-1 ac_mid=-1
-+  while :; do
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+   typedef double ac__type_sizeof_;
-+int
-+main ()
-+{
-+static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)];
-+test_array [0] = 0
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   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_lo=$ac_mid; break
- else
-   echo "$as_me: failed program was:" >&5
-@@ -4828,7 +4794,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef int ac__type_sizeof_;
-+   typedef double ac__type_sizeof_;
- int
- main ()
- {
-@@ -4852,27 +4818,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_hi=$ac_mid
- else
-   echo "$as_me: failed program was:" >&5
-@@ -4884,12 +4833,16 @@ fi
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
--?*) ac_cv_sizeof_int=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-+?*) ac_cv_sizeof_double=$ac_lo;;
-+'') if test "$ac_cv_type_double" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int)
-+echo "$as_me: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; } ;;
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_double=0
-+   fi ;;
- esac
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -4899,7 +4852,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef int ac__type_sizeof_;
-+   typedef double ac__type_sizeof_;
- static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
- static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
-@@ -4951,30 +4904,34 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   ac_status=$?
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); }; }; then
--  ac_cv_sizeof_int=`cat conftest.val`
-+  ac_cv_sizeof_double=`cat conftest.val`
- else
-   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 )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int)
-+if test "$ac_cv_type_double" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&5
--echo "$as_me: error: cannot compute sizeof (int)
-+echo "$as_me: error: cannot compute sizeof (double)
- See \`config.log' for more details." >&2;}
-    { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_double=0
-+   fi
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
--  ac_cv_sizeof_int=0
--fi
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5
--echo "${ECHO_T}$ac_cv_sizeof_int" >&6; }
-+{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_double" >&5
-+echo "${ECHO_T}$ac_cv_sizeof_double" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
--#define SIZEOF_INT $ac_cv_sizeof_int
-+#define SIZEOF_DOUBLE $ac_cv_sizeof_double
- _ACEOF
- 
- 
-@@ -5015,27 +4972,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_type_long=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5049,16 +4989,15 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5
- echo "${ECHO_T}$ac_cv_type_long" >&6; }
- 
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
- { echo "$as_me:$LINENO: checking size of long" >&5
- echo $ECHO_N "checking size of long... $ECHO_C" >&6; }
- if test "${ac_cv_sizeof_long+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if test "$ac_cv_type_long" = yes; then
--  # The cast to long int works around a bug in the HP C Compiler
--  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--  # This bug is HP SR number 8606223364.
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5068,7 +5007,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long ac__type_sizeof_;
-+   typedef long ac__type_sizeof_;
- int
- main ()
- {
-@@ -5092,27 +5031,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -5122,7 +5044,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long ac__type_sizeof_;
-+   typedef long ac__type_sizeof_;
- int
- main ()
- {
-@@ -5146,27 +5068,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_hi=$ac_mid; break
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5193,7 +5098,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long ac__type_sizeof_;
-+   typedef long ac__type_sizeof_;
- int
- main ()
- {
-@@ -5217,27 +5122,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -5247,7 +5135,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long ac__type_sizeof_;
-+   typedef long ac__type_sizeof_;
- int
- main ()
- {
-@@ -5271,27 +5159,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_lo=$ac_mid; break
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5328,7 +5199,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long ac__type_sizeof_;
-+   typedef long ac__type_sizeof_;
- int
- main ()
- {
-@@ -5352,27 +5223,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_hi=$ac_mid
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5385,11 +5239,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+'') if test "$ac_cv_type_long" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; } ;;
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_long=0
-+   fi ;;
- esac
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -5399,7 +5257,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long ac__type_sizeof_;
-+   typedef long ac__type_sizeof_;
- static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
- static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
-@@ -5458,21 +5316,25 @@ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
-+if test "$ac_cv_type_long" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute sizeof (long)
- See \`config.log' for more details." >&2;}
-    { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_long=0
-+   fi
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
--  ac_cv_sizeof_long=0
--fi
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5
- echo "${ECHO_T}$ac_cv_sizeof_long" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_LONG $ac_cv_sizeof_long
- _ACEOF
-@@ -5515,27 +5377,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_type_long_long=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5549,16 +5394,15 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_type_long_long" >&5
- echo "${ECHO_T}$ac_cv_type_long_long" >&6; }
- 
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
- { echo "$as_me:$LINENO: checking size of long long" >&5
- echo $ECHO_N "checking size of long long... $ECHO_C" >&6; }
- if test "${ac_cv_sizeof_long_long+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if test "$ac_cv_type_long_long" = yes; then
--  # The cast to long int works around a bug in the HP C Compiler
--  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--  # This bug is HP SR number 8606223364.
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -5568,7 +5412,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long long ac__type_sizeof_;
-+   typedef long long ac__type_sizeof_;
- int
- main ()
- {
-@@ -5592,27 +5436,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -5622,7 +5449,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long long ac__type_sizeof_;
-+   typedef long long ac__type_sizeof_;
- int
- main ()
- {
-@@ -5646,27 +5473,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_hi=$ac_mid; break
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5693,7 +5503,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long long ac__type_sizeof_;
-+   typedef long long ac__type_sizeof_;
- int
- main ()
- {
-@@ -5717,27 +5527,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -5747,7 +5540,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long long ac__type_sizeof_;
-+   typedef long long ac__type_sizeof_;
- int
- main ()
- {
-@@ -5771,27 +5564,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_lo=$ac_mid; break
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5828,7 +5604,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long long ac__type_sizeof_;
-+   typedef long long ac__type_sizeof_;
- int
- main ()
- {
-@@ -5852,27 +5628,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_hi=$ac_mid
- else
-   echo "$as_me: failed program was:" >&5
-@@ -5885,11 +5644,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_long_long=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-+'') if test "$ac_cv_type_long_long" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; } ;;
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_long_long=0
-+   fi ;;
- esac
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -5899,7 +5662,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef long long ac__type_sizeof_;
-+   typedef long long ac__type_sizeof_;
- static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
- static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
-@@ -5958,21 +5721,25 @@ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
-+if test "$ac_cv_type_long_long" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute sizeof (long long)
- See \`config.log' for more details." >&2;}
-    { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_long_long=0
-+   fi
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
--  ac_cv_sizeof_long_long=0
--fi
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
- echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
- _ACEOF
-@@ -6015,27 +5782,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_type_void_p=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6049,16 +5799,15 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_type_void_p" >&5
- echo "${ECHO_T}$ac_cv_type_void_p" >&6; }
- 
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
- { echo "$as_me:$LINENO: checking size of void *" >&5
- echo $ECHO_N "checking size of void *... $ECHO_C" >&6; }
- if test "${ac_cv_sizeof_void_p+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
--  if test "$ac_cv_type_void_p" = yes; then
--  # The cast to long int works around a bug in the HP C Compiler
--  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
--  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
--  # This bug is HP SR number 8606223364.
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
- cat >conftest.$ac_ext <<_ACEOF
-@@ -6068,7 +5817,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef void * ac__type_sizeof_;
-+   typedef void * ac__type_sizeof_;
- int
- main ()
- {
-@@ -6092,27 +5841,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_lo=0 ac_mid=0
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -6122,7 +5854,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef void * ac__type_sizeof_;
-+   typedef void * ac__type_sizeof_;
- int
- main ()
- {
-@@ -6146,27 +5878,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_hi=$ac_mid; break
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6193,7 +5908,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef void * ac__type_sizeof_;
-+   typedef void * ac__type_sizeof_;
- int
- main ()
- {
-@@ -6217,27 +5932,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_hi=-1 ac_mid=-1
-   while :; do
-     cat >conftest.$ac_ext <<_ACEOF
-@@ -6247,7 +5945,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef void * ac__type_sizeof_;
-+   typedef void * ac__type_sizeof_;
- int
- main ()
- {
-@@ -6271,27 +5969,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_lo=$ac_mid; break
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6328,7 +6009,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef void * ac__type_sizeof_;
-+   typedef void * ac__type_sizeof_;
- int
- main ()
- {
-@@ -6352,27 +6033,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_hi=$ac_mid
- else
-   echo "$as_me: failed program was:" >&5
-@@ -6385,11 +6049,15 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- done
- case $ac_lo in
- ?*) ac_cv_sizeof_void_p=$ac_lo;;
--'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
-+'') if test "$ac_cv_type_void_p" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute sizeof (void *)
- See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; } ;;
-+   { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_void_p=0
-+   fi ;;
- esac
- else
-   cat >conftest.$ac_ext <<_ACEOF
-@@ -6399,7 +6067,7 @@ cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--		   typedef void * ac__type_sizeof_;
-+   typedef void * ac__type_sizeof_;
- static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); }
- static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); }
- #include <stdio.h>
-@@ -6458,27 +6126,62 @@ echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- ( exit $ac_status )
--{ { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
-+if test "$ac_cv_type_void_p" = yes; then
-+     { { echo "$as_me:$LINENO: error: cannot compute sizeof (void *)
- See \`config.log' for more details." >&5
- echo "$as_me: error: cannot compute sizeof (void *)
- See \`config.log' for more details." >&2;}
-    { (exit 77); exit 77; }; }
-+   else
-+     ac_cv_sizeof_void_p=0
-+   fi
- fi
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
--else
--  ac_cv_sizeof_void_p=0
--fi
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
- echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
-+
-+
-+
- cat >>confdefs.h <<_ACEOF
- #define SIZEOF_VOID_P $ac_cv_sizeof_void_p
- _ACEOF
- 
- 
- 
-+if test $ac_cv_sizeof_int != "4"; then
-+    { { echo "$as_me:$LINENO: error: \"Integer is not of size 4 $ac_cv_sizeof_int\"" >&5
-+echo "$as_me: error: \"Integer is not of size 4 $ac_cv_sizeof_int\"" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+if test $ac_cv_sizeof_double != "8"; then
-+    { { echo "$as_me:$LINENO: error: \"Double is not of size 8 $ac_cv_sizeof_double\"" >&5
-+echo "$as_me: error: \"Double is not of size 8 $ac_cv_sizeof_double\"" >&2;}
-+   { (exit 1); exit 1; }; }
-+fi
-+
-+if test $ac_cv_sizeof_long == "8"; then
-+    ac_cv_int64_t="long"
-+else
-+    if test $ac_cv_sizeof_long_long == "8"; then
-+        ac_cv_int64_t="long long"
-+    else
-+        { { echo "$as_me:$LINENO: error: \"No 64bit int type found\"" >&5
-+echo "$as_me: error: \"No 64bit int type found\"" >&2;}
-+   { (exit 1); exit 1; }; };
-+    fi
-+fi
-+
-+SQUEAK_INT64_T="$ac_cv_int64_t"
-+
-+cat >>confdefs.h <<_ACEOF
-+#define squeakInt64 $ac_cv_int64_t
-+_ACEOF
-+
-+
- # libtool configuration
- 
- # Check whether --enable-static was given.
-@@ -6604,10 +6307,10 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-     fi
-   done
- done
--SED=$lt_cv_path_SED
- 
- fi
- 
-+SED=$lt_cv_path_SED
- { echo "$as_me:$LINENO: result: $SED" >&5
- echo "${ECHO_T}$SED" >&6; }
- 
-@@ -6635,7 +6338,7 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-     # Accept absolute paths.
-     [\\/]* | ?:[\\/]*)
-       re_direlt='/[^/][^/]*/\.\./'
--      # Canonicalize the path of ld
-+      # 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%/%"`
-@@ -6704,7 +6407,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `"$LD" -v 2>&1 </dev/null` in
-+case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -6732,7 +6435,16 @@ case $reload_flag in
- "" | " "*) ;;
- *) reload_flag=" $reload_flag" ;;
- esac
--reload_cmds='$CC -nostdlib -Xlinker$reload_flag $archargs -o $output$reload_objs'
-+reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+case $host_os in
-+  darwin*)
-+    if test "$GCC" = yes; then
-+      reload_cmds='$CC -nostdlib ${wl}-r -o $output$reload_objs'
-+    else
-+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
-+    fi
-+    ;;
-+esac
- 
- { echo "$as_me:$LINENO: checking whether ln -s works" >&5
- echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
-@@ -6773,34 +6485,30 @@ beos*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-   lt_cv_file_magic_cmd='/usr/bin/file -L'
-   lt_cv_file_magic_test_file=/shlib/libc.so
-   ;;
- 
--cygwin* | mingw* | pw32*)
--  # win32_libid is a shell function defined in ltmain.sh
-+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='win32_libid'
-+  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*)
--  # this will be overwritten by pass_all, but leave it in just in case
--  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=`/System/Library/Frameworks/System.framework/System`
--    ;;
--  *) # Darwin 1.3 on
--    lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
--    ;;
--  esac
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--freebsd*)
-+freebsd* | kfreebsd*-gnu)
-   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-     case $host_cpu in
-     i*86 )
-@@ -6839,36 +6547,23 @@ hpux10.20* | hpux11*)
-   ;;
- 
- 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"
--    ;;
-+  case $LD in
-+  *-32|*"-32 ") libmagic=32-bit;;
-+  *-n32|*"-n32 ") libmagic=N32;;
-+  *-64|*"-64 ") libmagic=64-bit;;
-+  *) libmagic=never-match;;
-   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*)
--  case $host_cpu in
--  alpha* | hppa* | i*86 | ia64* | m68* | mips | mipsel | powerpc* | sparc* | s390* | sh*)
--    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_cv_deplibs_check_method=pass_all
-+  ;;
-+
-+linux-uclibc*)
-+  lt_cv_deplibs_check_method=pass_all
-+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
-   ;;
- 
- netbsd*)
-@@ -6885,24 +6580,19 @@ newos6*)
-   lt_cv_file_magic_test_file=/usr/lib/libnls.so
-   ;;
- 
--nto-qnx)
-+nto-qnx*)
-   lt_cv_deplibs_check_method=unknown
-   ;;
- 
- openbsd*)
--  lt_cv_file_magic_cmd=/usr/bin/file
--  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|\.so|_pic\.a)$'
-   else
--    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-+    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   fi
-   ;;
- 
- osf3* | osf4* | osf5*)
--  # this will be overridden with pass_all, but let us keep it just in case
--  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
--  lt_cv_file_magic_test_file=/shlib/libc.so
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-@@ -6912,7 +6602,6 @@ sco3.2v5*)
- 
- solaris*)
-   lt_cv_deplibs_check_method=pass_all
--  lt_cv_file_magic_test_file=/lib/libc.so
-   ;;
- 
- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -6991,7 +6680,7 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 6994 "configure"' > conftest.$ac_ext
-+  echo '#line 6683 "configure"' > conftest.$ac_ext
-   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
-@@ -7040,7 +6729,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_i386"
-           ;;
--        ppc64-*linux*)
-+        ppc64-*linux*|powerpc64-*linux*)
-           LD="${LD-ld} -m elf32ppclinux"
-           ;;
-         s390x-*linux*)
-@@ -7115,27 +6804,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -7144,7 +6817,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	lt_cv_cc_needs_belf=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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'
-@@ -7205,27 +6878,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -7261,17 +6917,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -7358,7 +7007,7 @@ 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
-@@ -7402,7 +7051,7 @@ 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
-@@ -7515,27 +7164,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -7590,27 +7222,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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 "$as_me: failed program was:" >&5
-@@ -7645,27 +7260,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -7701,27 +7299,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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 "$as_me: failed program was:" >&5
-@@ -7762,7 +7343,12 @@ 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
- 
--ac_ext=cpp
-+
-+
-+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+    (test "X$CXX" != "Xg++"))) ; then
-+  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'
-@@ -7810,17 +7396,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -7854,17 +7433,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -7929,17 +7501,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -7973,17 +7538,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -8016,13 +7574,15 @@ 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
- 
-+fi
-+
- 
- 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
-@@ -8040,7 +7600,7 @@ 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_F77="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -8066,7 +7626,7 @@ fi
- 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
-@@ -8084,7 +7644,7 @@ 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_F77="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -8191,27 +7751,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -8254,27 +7797,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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 "$as_me: failed program was:" >&5
-@@ -8322,7 +7848,7 @@ if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-     i=0
--  testring="ABCD"
-+  teststring="ABCD"
- 
-   case $build_os in
-   msdosdjgpp*)
-@@ -8351,20 +7877,40 @@ else
-     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* )
-+    # 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 *BSD
-+    fi
-+    # And add a safety zone
-+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
-+    ;;
-+
-  *)
-     # If test is not a shell built-in, we'll probably end up computing a
-     # maximum length that is only half of the actual maximum length, but
-     # we can't tell.
--    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
--	       = "XX$testring") >/dev/null 2>&1 &&
--	    new_result=`expr "X$testring" : ".*" 2>&1` &&
-+    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`
--      testring=$testring$testring
-+      teststring=$teststring$teststring
-     done
--    testring=
-+    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.
-@@ -8425,6 +7971,13 @@ hpux*) # Its linker distinguishes data from code symbols
-   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-   ;;
-+linux*)
-+  if test "$host_cpu" = ia64; then
-+    symcode='[ABCDGIRSTW]'
-+    lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-+    lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-+  fi
-+  ;;
- irix* | nonstopux*)
-   symcode='[BCDEGRST]'
-   ;;
-@@ -8432,7 +7985,7 @@ osf*)
-   symcode='[BCDEGQRST]'
-   ;;
- solaris* | sysv5*)
--  symcode='[BDT]'
-+  symcode='[BDRT]'
-   ;;
- sysv4)
-   symcode='[DFNSTU]'
-@@ -8450,7 +8003,7 @@ esac
- # If we're using GNU nm, then use its standard symbol codes.
- case `$NM -V 2>&1` in
- *GNU* | *'with BFD'*)
--  symcode='[ABCDGISTW]' ;;
-+  symcode='[ABCDGIRSTW]' ;;
- esac
- 
- # Try without a prefix undercore, then with it.
-@@ -8629,9 +8182,6 @@ double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
- # double_quote_subst'ed string.
- delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
- 
--# Sed substitution to undo escaping of the cmd sep variable
--unescape_variable_subst='s/\\\(${_S_}\)/\1/g'
--
- # Sed substitution to avoid accidental globbing in evaled expressions
- no_glob_subst='s/\*/\\\*/g'
- 
-@@ -8639,7 +8189,7 @@ no_glob_subst='s/\*/\\\*/g'
- rm="rm -f"
- 
- # Global variables:
--default_ofile=libtool
-+default_ofile=${host_alias}-libtool
- can_build_shared=yes
- 
- # All known linkers require a `.a' archive for static linking (except M$VC,
-@@ -8666,7 +8216,7 @@ 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_AR="${ac_tool_prefix}ar"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -8706,7 +8256,7 @@ 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_AR="ar"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -8762,7 +8312,7 @@ 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_RANLIB="${ac_tool_prefix}ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -8802,7 +8352,7 @@ 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_RANLIB="ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -8858,7 +8408,7 @@ 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_STRIP="${ac_tool_prefix}strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -8898,7 +8448,7 @@ 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_STRIP="strip"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -8966,15 +8516,17 @@ old_postuninstall_cmds=
- if test -n "$RANLIB"; then
-   case $host_os in
-   openbsd*)
--    old_postinstall_cmds="\$RANLIB -t \$oldlib\${_S_}$old_postinstall_cmds"
-+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-     ;;
-   *)
--    old_postinstall_cmds="\$RANLIB \$oldlib\${_S_}$old_postinstall_cmds"
-+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-     ;;
-   esac
--  old_archive_cmds="$old_archive_cmds\${_S_}\$RANLIB \$oldlib"
-+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- fi
- 
-+cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-+
- # Only perform the check for file, if the check method requires it
- case $deplibs_check_method in
- file_magic*)
-@@ -9227,7 +8779,8 @@ lt_prog_compiler_no_builtin_flag=
- if test "$GCC" = yes; then
-   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
--  { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+
-+{ 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
-@@ -9245,11 +8798,11 @@ else
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9248: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:8801: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9252: \$? = $ac_status" >&5
-+   echo "$as_me:8805: \$? = $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
-@@ -9356,6 +8909,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 	lt_prog_compiler_static='-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_prog_compiler_pic='-qnocommon'
-+         lt_prog_compiler_wl='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -9392,12 +8955,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-     linux*)
-       case $CC in
--      icc|ecc)
-+      icc* | ecc*)
- 	lt_prog_compiler_wl='-Wl,'
- 	lt_prog_compiler_pic='-KPIC'
- 	lt_prog_compiler_static='-static'
-         ;;
--      ccc)
-+      ccc*)
-         lt_prog_compiler_wl='-Wl,'
-         # All Alpha code is PIC.
-         lt_prog_compiler_static='-non_shared'
-@@ -9459,7 +9022,8 @@ echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic"; then
--  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -9477,11 +9041,11 @@ else
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9480: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9044: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:9484: \$? = $ac_status" >&5
-+   echo "$as_me:9048: \$? = $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
-@@ -9528,13 +9092,6 @@ else
-    mkdir out
-    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--   # 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 .
--
-    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.
-@@ -9544,11 +9101,11 @@ else
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:9547: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9104: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:9551: \$? = $ac_status" >&5
-+   echo "$as_me:9108: \$? = $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
-@@ -9558,8 +9115,11 @@ else
-      fi
-    fi
-    chmod u+w .
--   $rm conftest* out/*
--   rmdir out
-+   $rm conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+   $rm out/* && rmdir out
-    cd ..
-    rmdir conftest
-    $rm conftest*
-@@ -9669,7 +9229,7 @@ EOF
-       ;;
- 
-     amigaos*)
--      archive_cmds='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
-+      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
- 
-@@ -9711,7 +9271,7 @@ EOF
- 	else
- 	  echo EXPORTS > $output_objdir/$soname.def;
- 	  cat $export_symbols >> $output_objdir/$soname.def;
--	fi${_S_}
-+	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
- 	ld_shlibs=no
-@@ -9756,6 +9316,31 @@ EOF
-       hardcode_shlibpath_var=no
-       ;;
- 
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        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 $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds="$tmp_archive_cmds"
-+      fi
-+    else
-+      ld_shlibs=no
-+    fi
-+    ;;
-+
-     *)
-       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'
-@@ -9783,7 +9368,7 @@ EOF
-     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${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      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
-@@ -9911,27 +9496,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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; }
- }'`
-@@ -9945,7 +9514,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- 
--rm -f core 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
- 
-@@ -9986,27 +9555,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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; }
- }'`
-@@ -10020,7 +9573,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- 
--rm -f core 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
- 
-@@ -10035,20 +9588,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 	  whole_archive_flag_spec=' '
- 	  archive_cmds_need_lc=yes
- 	  # This 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 ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-       ;;
- 
-     amigaos*)
--      archive_cmds='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
-+      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
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec=-rdynamic
-       ;;
- 
-@@ -10062,9 +9615,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       # Tell ltmain to make .lib files, not .a files.
-       libext=lib
-       # Tell ltmain to make .dll files, not .so files.
--      shrext=".dll"
-+      shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
--      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
-+      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.
-@@ -10074,57 +9627,52 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       ;;
- 
-     darwin* | rhapsody*)
--    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
--      archive_cmds_need_lc=no
-       case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag='-undefined suppress'
--	;;
--      darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0
--	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
--	;;
--      *) # Darwin 7.0 on
--	case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
--	10.[012])
--	  test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
--	  ;;
--	*) # 10.3 on
--	  if test -z ${LD_TWOLEVEL_NAMESPACE}; then
--	    allow_undefined_flag='-flat_namespace -undefined suppress'
--	  else
--	    allow_undefined_flag='-undefined dynamic_lookup'
--	  fi
--	  ;;
--	esac
--	;;
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-       esac
--      # FIXME: Relying on posixy $() will cause problems for
--      #        cross-compilation, but unfortunately the echo tests do not
--      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
--      #	       `"' quotes if we put them in here... so don't!
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      archive_cmds_need_lc=no
-       hardcode_direct=no
-       hardcode_automatic=yes
-       hardcode_shlibpath_var=unsupported
--      whole_archive_flag_spec='-all_load $convenience'
-+      whole_archive_flag_spec=''
-       link_all_deplibs=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      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 ld's
-+      archive_expsym_cmds='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='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'
-+         archive_cmds='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $verstring'
-+         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 ld's
-+         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}'
-+          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
-       ;;
- 
-@@ -10158,7 +9706,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | kfreebsd*-gnu)
-       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_direct=yes
-@@ -10167,9 +9715,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-     hpux9*)
-       if test "$GCC" = yes; then
--	archive_cmds='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+	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'
-       else
--	archive_cmds='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+	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'
-       fi
-       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator=:
-@@ -10269,6 +9817,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       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
-@@ -10289,7 +9838,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       hardcode_libdir_flag_spec='-L$libdir'
-       hardcode_minus_L=yes
-       allow_undefined_flag=unsupported
--      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      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'
-       ;;
- 
-@@ -10313,8 +9862,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       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 "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_}
--	$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${_S_}$rm $lib.exp'
-+	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 ${objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10334,12 +9883,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       no_undefined_flag=' -z text'
-       if test "$GCC" = yes; then
- 	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp'
-+	archive_expsym_cmds='$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
- 	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	archive_expsym_cmds='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
-+	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'
-       fi
-       hardcode_libdir_flag_spec='-R$libdir'
-       hardcode_shlibpath_var=no
-@@ -10428,8 +9977,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
-+      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'
-@@ -10466,7 +10015,7 @@ x|xyes)
- 
-   if test "$enable_shared" = yes && test "$GCC" = yes; then
-     case $archive_cmds in
--    *"$_S_"*)
-+    *'~'*)
-       # FIXME: we may have to deal with multi-command sequences.
-       ;;
-     '$CC '*)
-@@ -10518,78 +10067,12 @@ echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
-   ;;
- esac
- 
--{ 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
--
--  # 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 "$_LT_AC_TAGVAR(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 "$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
--
--striplib=
--old_striplib=
--{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--   NOT-darwin*)
--       if test -n "$STRIP" ; then
--         striplib="$STRIP -x"
--         { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--       else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--       ;;
--   *)
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--    ;;
--  esac
--fi
--
- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
- echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -10677,7 +10160,7 @@ aix4* | aix5*)
- 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*)
-@@ -10686,7 +10169,7 @@ beos*)
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10702,7 +10185,7 @@ bsdi4*)
- 
- cygwin* | mingw* | pw32*)
-   version_type=windows
--  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
- 
-@@ -10710,13 +10193,13 @@ cygwin* | mingw* | pw32*)
-   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}`${_S_}
--      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_}
--      dldir=$destdir/`dirname \$dlpath`${_S_}
--      test -d \$dldir || mkdir -p \$dldir${_S_}
-+    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'
--    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_}
--      dlpath=$dir/\$dldll${_S_}
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-     shlibpath_overrides_runpath=yes
- 
-@@ -10724,7 +10207,7 @@ cygwin* | mingw* | pw32*)
-     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="/lib /lib/w32api /usr/lib /usr/local/lib"
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
-     mingw*)
-       # MinGW DLLs use traditional 'lib' prefix
-@@ -10763,17 +10246,16 @@ darwin* | rhapsody*)
-   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}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
-+  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='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; 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"`
-+  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'
-   ;;
-@@ -10791,6 +10273,18 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
-+kfreebsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-@@ -10839,7 +10333,7 @@ hpux9* | hpux10* | hpux11*)
-   need_version=no
-   case "$host_cpu" in
-   ia64*)
--    shrext='.so'
-+    shrext_cmds='.so'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.so"
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -10854,7 +10348,7 @@ hpux9* | hpux10* | hpux11*)
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-    hppa*64*)
--     shrext='.sl'
-+     shrext_cmds='.sl'
-      hardcode_into_libs=yes
-      dynamic_linker="$host_os dld.sl"
-      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10865,7 +10359,7 @@ hpux9* | hpux10* | hpux11*)
-      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-      ;;
-    *)
--    shrext='.sl'
-+    shrext_cmds='.sl'
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=SHLIB_PATH
-     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10934,6 +10428,12 @@ linux*)
-   # 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=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | 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,
-@@ -10943,6 +10443,18 @@ linux*)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+knetbsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -10952,7 +10464,7 @@ netbsd*)
-     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}${release}${shared_ext} ${libname}${shared_ext}'
-+    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
-@@ -10968,7 +10480,7 @@ newsos6)
-   shlibpath_overrides_runpath=yes
-   ;;
- 
--nto-qnx)
-+nto-qnx*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -11001,7 +10513,7 @@ openbsd*)
- 
- os2*)
-   libname_spec='$name'
--  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-@@ -11099,6 +10611,72 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-+{ 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
-+
-+  # 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 "$_LT_AC_TAGVAR(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 "$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
-+
-+striplib=
-+old_striplib=
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+   darwin*)
-+       if test -n "$STRIP" ; then
-+         striplib="$STRIP -x"
-+         { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+       else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+       ;;
-+   *)
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+    ;;
-+  esac
-+fi
-+
- if test "x$enable_dlopen" != xyes; then
-   enable_dlopen=unknown
-   enable_dlopen_self=unknown
-@@ -11168,27 +10746,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -11197,7 +10759,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dl_dlopen=no
- fi
- 
--rm -f core 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
-@@ -11279,27 +10841,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -11308,7 +10854,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_shl_load=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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
-@@ -11358,27 +10904,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -11387,7 +10917,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dld_shl_load=no
- fi
- 
--rm -f core 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
-@@ -11459,27 +10989,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -11488,7 +11002,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_dlopen=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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
-@@ -11538,27 +11052,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -11567,7 +11065,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dl_dlopen=no
- fi
- 
--rm -f core 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
-@@ -11618,27 +11116,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -11647,7 +11129,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_svld_dlopen=no
- fi
- 
--rm -f core 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
-@@ -11698,27 +11180,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -11727,7 +11193,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dld_dld_link=no
- fi
- 
--rm -f core 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
-@@ -11783,7 +11249,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11786 "configure"
-+#line 11252 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -11881,7 +11347,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 11884 "configure"
-+#line 11350 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -12001,57 +11467,15 @@ case "$host_os" in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
--    archive_cmds="$archive_cmds\${_S_}\$RANLIB \$lib"
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-     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
--  ;;
--  darwin* | rhapsody*)
--  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
--    archive_cmds_need_lc=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag='-undefined suppress'
--      ;;
--    darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0
--      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
--      ;;
--    *) # Darwin 7.0 on
--      case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
--      10.[012])
--	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag='-flat_namespace -undefined suppress'
--	;;
--      *) # 10.3 on
--	if test -z ${LD_TWOLEVEL_NAMESPACE}; then
--	  allow_undefined_flag='-flat_namespace -undefined suppress'
--	else
--	  allow_undefined_flag='-undefined dynamic_lookup'
--	fi
--	;;
--      esac
--      ;;
--    esac
--    # FIXME: Relying on posixy $() will cause problems for
--    #        cross-compilation, but unfortunately the echo tests do not
--    #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
--    #	       `"' quotes if we put them in here... so don't!
--		output_verbose_link_cmd='echo'
--    archive_cmds='$CC -dynamiclib $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
--    module_cmds='$CC -bundle $archargs $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--		  archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring${_S_}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${_S_}$CC -bundle $archargs $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct=no
--    hardcode_automatic=yes
--    hardcode_shlibpath_var=unsupported
--    whole_archive_flag_spec='-all_load $convenience'
--    link_all_deplibs=yes
--    fi
-     ;;
- esac
- { echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -12077,7 +11501,8 @@ if test -f "$ltmain"; then
-   # Now quote all the things that may contain metacharacters while being
-   # careful not to overquote the AC_SUBSTed values.  We take copies of the
-   # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-+    SED SHELL STRIP \
-     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-     deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -12135,7 +11560,7 @@ if test -f "$ltmain"; then
-     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\" -e \"\$unescape_variable_subst\"\`\\\""
-+      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\"\`\\\""
-@@ -12195,7 +11620,7 @@ 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
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- # The names of the tagged configurations supported by this script.
- available_tags=
-@@ -12204,9 +11629,6 @@ available_tags=
- 
- # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- 
--# Set the command separator (default: ~)
--_S_=\${LIBTOOL_CMD_SEP-\~}
--
- # Shell to use when invoking shell scripts.
- SHELL=$lt_SHELL
- 
-@@ -12258,7 +11680,7 @@ LN_S=$lt_LN_S
- 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
-@@ -12289,7 +11711,7 @@ objext="$ac_objext"
- libext="$libext"
- 
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
- 
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -12531,7 +11953,10 @@ 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"
-+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+  if test -f "$ltmain_in"; then
-+    test -f Makefile && make "$ltmain"
-+  fi
- fi
- 
- 
-@@ -12596,7 +12021,9 @@ echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
- 
-       case $tagname in
-       CXX)
--	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-+	if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-+	    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-+	    (test "X$CXX" != "Xg++"))) ; then
- 	  ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12712,7 +12139,7 @@ echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
-     # Accept absolute paths.
-     [\\/]* | ?:[\\/]*)
-       re_direlt='/[^/][^/]*/\.\./'
--      # Canonicalize the path of ld
-+      # 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%/%"`
-@@ -12781,7 +12208,7 @@ if test "${lt_cv_prog_gnu_ld+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   # I'd rather use --version here, but apparently some GNU ld's only accept -v.
--case `"$LD" -v 2>&1 </dev/null` in
-+case `$LD -v 2>&1 </dev/null` in
- *GNU* | *'with BFD'*)
-   lt_cv_prog_gnu_ld=yes
-   ;;
-@@ -12826,7 +12253,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
-     # linker, instead of GNU ld.  If possible, this setting should
-     # overridden to take advantage of the native linker features on
-     # the platform it is being used on.
--    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-+    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-   fi
- 
-   # Commands to make compiler produce verbose output that lists
-@@ -12961,27 +12388,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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; }
- }'`
-@@ -12995,7 +12406,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- 
--rm -f core 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
- 
-@@ -13037,27 +12448,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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; }
- }'`
-@@ -13071,7 +12466,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- 
--rm -f core 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
- 
-@@ -13086,7 +12481,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 	whole_archive_flag_spec_CXX=' '
- 	archive_cmds_need_lc_CXX=yes
- 	# This is similar to how AIX traditionally builds it's shared libraries.
--	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-       fi
-     fi
-     ;;
-@@ -13099,6 +12494,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-     esac
-     ;;
- 
-+
-   cygwin* | mingw* | pw32*)
-     # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-     # as there is no search path for DLLs.
-@@ -13116,64 +12512,74 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       else
- 	echo EXPORTS > $output_objdir/$soname.def;
- 	cat $export_symbols >> $output_objdir/$soname.def;
--      fi${_S_}
-+      fi~
-       $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-     else
-       ld_shlibs_CXX=no
-     fi
-   ;;
--
--  darwin* | rhapsody*)
--   if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
--    archive_cmds_need_lc_CXX=no
--    case "$host_os" in
--    rhapsody* | darwin1.[012])
--      allow_undefined_flag_CXX='-undefined suppress'
--      ;;
--    darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0
--      test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
--      ;;
--    *) # Darwin 7.0 on
--      case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
--      10.[012])
--	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
--	;;
--      *) # 10.3 on
--	if test -z ${LD_TWOLEVEL_NAMESPACE}; then
--	  allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
--	else
--	  allow_undefined_flag_CXX='-undefined dynamic_lookup'
--	fi
--	;;
--      esac
--      ;;
--    esac
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_CXX='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      darwin* | rhapsody*)
-+        case "$host_os" in
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_CXX='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_CXX='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_CXX='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-+        esac
-+      archive_cmds_need_lc_CXX=no
-+      hardcode_direct_CXX=no
-+      hardcode_automatic_CXX=yes
-+      hardcode_shlibpath_var_CXX=unsupported
-+      whole_archive_flag_spec_CXX=''
-+      link_all_deplibs_CXX=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
--      module_cmds_CXX='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
--
--    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-       if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--        archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+       archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-       else
--        archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+          archive_cmds_CXX='$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
-+        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 ld's
-+          if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-+            archive_expsym_cmds_CXX='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
-+            archive_expsym_cmds_CXX='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
-+            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}'
-+      else
-+      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'
-+          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 ld's
-+          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}'
-+          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}'
-+          ;;
-+       *)
-+         ld_shlibs_CXX=no
-+          ;;
-+      esac
-       fi
--        module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--    hardcode_direct_CXX=no
--    hardcode_automatic_CXX=yes
--    hardcode_shlibpath_var_CXX=unsupported
--    whole_archive_flag_spec_CXX='-all_load $convenience'
--    link_all_deplibs_CXX=yes
--   fi
--    ;;
-+        ;;
- 
-   dgux*)
-     case $cc_basename in
-@@ -13199,7 +12605,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-   freebsd-elf*)
-     archive_cmds_need_lc_CXX=no
-     ;;
--  freebsd*)
-+  freebsd* | kfreebsd*-gnu)
-     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-     # conventions
-     ld_shlibs_CXX=yes
-@@ -13221,7 +12627,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       ld_shlibs_CXX=no
-       ;;
-     aCC)
--      archive_cmds_CXX='$rm $output_objdir/$soname${_S_}$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+      archive_cmds_CXX='$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.
-@@ -13230,11 +12636,11 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       # explicitly linking system object files so we need to strip them
-       # from the output so that they don't get included in the library
-       # dependencies.
--      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-+      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-       ;;
-     *)
-       if test "$GXX" = yes; then
--        archive_cmds_CXX='$rm $output_objdir/$soname${_S_}$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+        archive_cmds_CXX='$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
-         ld_shlibs_CXX=no
-@@ -13379,9 +12785,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       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."*)
-+  	  archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	  archive_expsym_cmds_CXX='$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
-+  	  archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+  	archive_expsym_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-+	  ;;
-+	esac
- 	archive_cmds_need_lc_CXX=no
--	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
--	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
- 	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
- 	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
- 	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-@@ -13438,6 +12855,22 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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
-+    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'
-+    fi
-+    output_verbose_link_cmd='echo'
-+    ;;
-   osf3*)
-     case $cc_basename in
-       KCC)
-@@ -13523,9 +12956,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       cxx)
- 	allow_undefined_flag_CXX=' -expect_unresolved \*'
- 	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
--	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done${_S_}
--	  echo "-hidden">> $lib.exp${_S_}
--	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib${_S_}
-+	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-+	  echo "-hidden">> $lib.exp~
-+	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
- 	  $rm $lib.exp'
- 
- 	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13602,8 +13035,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 	# Sun C++ 4.2, 5.x and Centerline C++
- 	no_undefined_flag_CXX=' -zdefs'
- 	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
--	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp'
-+	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-+	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
- 
- 	hardcode_libdir_flag_spec_CXX='-R$libdir'
- 	hardcode_shlibpath_var_CXX=no
-@@ -13648,8 +13081,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
- 	  if $CC --version | grep -v '^2\.7' > /dev/null; then
- 	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp'
-+	    archive_expsym_cmds_CXX='$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
-@@ -13659,8 +13092,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
- 	    # platform.
- 	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
--	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags${_S_}$rm $lib.exp'
-+	    archive_expsym_cmds_CXX='$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
-@@ -13893,6 +13326,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 	  ;;
- 	esac
- 	;;
-+       darwin*)
-+         # PIC is the default on this platform
-+         # Common symbols not allowed in MH_DYLIB files
-+         case "$cc_basename" in
-+           xlc*)
-+           lt_prog_compiler_pic_CXX='-qnocommon'
-+           lt_prog_compiler_wl_CXX='-Wl,'
-+           ;;
-+         esac
-+       ;;
-       dgux*)
- 	case $cc_basename in
- 	  ec++)
-@@ -13906,7 +13349,7 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 	    ;;
- 	esac
- 	;;
--      freebsd*)
-+      freebsd* | kfreebsd*-gnu)
- 	# FreeBSD uses GNU C++
- 	;;
-       hpux9* | hpux10* | hpux11*)
-@@ -14074,7 +13517,8 @@ echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6; }
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_CXX"; then
--  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-+
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -14092,11 +13536,11 @@ else
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14095: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13539: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:14099: \$? = $ac_status" >&5
-+   echo "$as_me:13543: \$? = $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
-@@ -14143,13 +13587,6 @@ else
-    mkdir out
-    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--   # 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 .
--
-    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.
-@@ -14159,11 +13596,11 @@ else
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:14162: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:13599: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:14166: \$? = $ac_status" >&5
-+   echo "$as_me:13603: \$? = $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
-@@ -14173,8 +13610,11 @@ else
-      fi
-    fi
-    chmod u+w .
--   $rm conftest* out/*
--   rmdir out
-+   $rm conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+   $rm out/* && rmdir out
-    cd ..
-    rmdir conftest
-    $rm conftest*
-@@ -14250,7 +13690,7 @@ x|xyes)
- 
-   if test "$enable_shared" = yes && test "$GCC" = yes; then
-     case $archive_cmds_CXX in
--    *"$_S_"*)
-+    *'~'*)
-       # FIXME: we may have to deal with multi-command sequences.
-       ;;
-     '$CC '*)
-@@ -14302,78 +13742,12 @@ echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6; }
-   ;;
- esac
- 
--{ 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_CXX=
--if test -n "$hardcode_libdir_flag_spec_CXX" || \
--   test -n "$runpath_var CXX" || \
--   test "X$hardcode_automatic_CXX"="Xyes" ; then
--
--  # We can hardcode non-existant directories.
--  if test "$hardcode_direct_CXX" != no &&
--     # If the only mechanism to avoid hardcoding is shlibpath_var, we
--     # have to relink, otherwise we might link with an installed library
--     # when we should be linking with a yet-to-be-installed one
--     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
--     test "$hardcode_minus_L_CXX" != no; then
--    # Linking always hardcodes the temporary library directory.
--    hardcode_action_CXX=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    hardcode_action_CXX=immediate
--  fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  hardcode_action_CXX=unsupported
--fi
--{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
--echo "${ECHO_T}$hardcode_action_CXX" >&6; }
--
--if test "$hardcode_action_CXX" = 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
--
--striplib=
--old_striplib=
--{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--   NOT-darwin*)
--       if test -n "$STRIP" ; then
--         striplib="$STRIP -x"
--         { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--       else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--       ;;
--   *)
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--    ;;
--  esac
--fi
--
- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
- echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -14461,7 +13835,7 @@ aix4* | aix5*)
- 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*)
-@@ -14470,7 +13844,7 @@ beos*)
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14486,7 +13860,7 @@ bsdi4*)
- 
- cygwin* | mingw* | pw32*)
-   version_type=windows
--  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
- 
-@@ -14494,13 +13868,13 @@ cygwin* | mingw* | pw32*)
-   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}`${_S_}
--      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_}
--      dldir=$destdir/`dirname \$dlpath`${_S_}
--      test -d \$dldir || mkdir -p \$dldir${_S_}
-+    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'
--    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_}
--      dlpath=$dir/\$dldll${_S_}
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-     shlibpath_overrides_runpath=yes
- 
-@@ -14508,7 +13882,7 @@ cygwin* | mingw* | pw32*)
-     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="/lib /lib/w32api /usr/lib /usr/local/lib"
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
-     mingw*)
-       # MinGW DLLs use traditional 'lib' prefix
-@@ -14547,17 +13921,16 @@ darwin* | rhapsody*)
-   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}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
-+  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='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; 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"`
-+  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'
-   ;;
-@@ -14575,6 +13948,18 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
-+kfreebsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-@@ -14623,7 +14008,7 @@ hpux9* | hpux10* | hpux11*)
-   need_version=no
-   case "$host_cpu" in
-   ia64*)
--    shrext='.so'
-+    shrext_cmds='.so'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.so"
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -14638,7 +14023,7 @@ hpux9* | hpux10* | hpux11*)
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-    hppa*64*)
--     shrext='.sl'
-+     shrext_cmds='.sl'
-      hardcode_into_libs=yes
-      dynamic_linker="$host_os dld.sl"
-      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14649,7 +14034,7 @@ hpux9* | hpux10* | hpux11*)
-      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-      ;;
-    *)
--    shrext='.sl'
-+    shrext_cmds='.sl'
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=SHLIB_PATH
-     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14718,6 +14103,12 @@ linux*)
-   # 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=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | 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,
-@@ -14727,6 +14118,18 @@ linux*)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+knetbsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -14736,7 +14139,7 @@ netbsd*)
-     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}${release}${shared_ext} ${libname}${shared_ext}'
-+    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
-@@ -14752,7 +14155,7 @@ newsos6)
-   shlibpath_overrides_runpath=yes
-   ;;
- 
--nto-qnx)
-+nto-qnx*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -14785,7 +14188,7 @@ openbsd*)
- 
- os2*)
-   libname_spec='$name'
--  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-@@ -14883,6 +14286,72 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-+{ 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_CXX=
-+if test -n "$hardcode_libdir_flag_spec_CXX" || \
-+   test -n "$runpath_var_CXX" || \
-+   test "X$hardcode_automatic_CXX" = "Xyes" ; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct_CXX" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-+     test "$hardcode_minus_L_CXX" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action_CXX=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action_CXX=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action_CXX=unsupported
-+fi
-+{ echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-+echo "${ECHO_T}$hardcode_action_CXX" >&6; }
-+
-+if test "$hardcode_action_CXX" = 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
-+
-+striplib=
-+old_striplib=
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+   darwin*)
-+       if test -n "$STRIP" ; then
-+         striplib="$STRIP -x"
-+         { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+       else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+       ;;
-+   *)
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+    ;;
-+  esac
-+fi
-+
- if test "x$enable_dlopen" != xyes; then
-   enable_dlopen=unknown
-   enable_dlopen_self=unknown
-@@ -14952,27 +14421,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_dl_dlopen=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -14981,7 +14434,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dl_dlopen=no
- fi
- 
--rm -f core 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
-@@ -15063,27 +14516,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_func_shl_load=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -15092,7 +14529,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_shl_load=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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
-@@ -15142,27 +14579,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_dld_shl_load=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -15171,7 +14592,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dld_shl_load=no
- fi
- 
--rm -f core 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
-@@ -15243,27 +14664,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_func_dlopen=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -15272,7 +14677,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_dlopen=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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
-@@ -15322,27 +14727,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_dl_dlopen=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -15351,7 +14740,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dl_dlopen=no
- fi
- 
--rm -f core 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
-@@ -15402,27 +14791,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_svld_dlopen=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -15431,7 +14804,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_svld_dlopen=no
- fi
- 
--rm -f core 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
-@@ -15482,27 +14855,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_dld_dld_link=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -15511,7 +14868,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dld_dld_link=no
- fi
- 
--rm -f core 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
-@@ -15567,7 +14924,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15570 "configure"
-+#line 14927 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15665,7 +15022,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 15668 "configure"
-+#line 15025 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -15782,7 +15139,8 @@ if test -f "$ltmain"; then
-   # Now quote all the things that may contain metacharacters while being
-   # careful not to overquote the AC_SUBSTed values.  We take copies of the
-   # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-+    SED SHELL STRIP \
-     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-     deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -15840,7 +15198,7 @@ if test -f "$ltmain"; then
-     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\" -e \"\$unescape_variable_subst\"\`\\\""
-+      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\"\`\\\""
-@@ -15861,9 +15219,6 @@ cfgfile="$ofile"
- 
- # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- 
--# Set the command separator (default: ~)
--_S_=\${LIBTOOL_CMD_SEP-\~}
--
- # Shell to use when invoking shell scripts.
- SHELL=$lt_SHELL
- 
-@@ -15915,7 +15270,7 @@ LN_S=$lt_LN_S
- 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
-@@ -15946,7 +15301,7 @@ objext="$ac_objext"
- libext="$libext"
- 
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
- 
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -16163,7 +15518,10 @@ 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"
-+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+  if test -f "$ltmain_in"; then
-+    test -f Makefile && make "$ltmain"
-+  fi
- fi
- 
- 
-@@ -16261,11 +15619,11 @@ case "$host_os" in
- aix3*)
-   test "$enable_shared" = yes && enable_static=no
-   if test -n "$RANLIB"; then
--    archive_cmds="$archive_cmds\${_S_}\$RANLIB \$lib"
-+    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-     postinstall_cmds='$RANLIB $lib'
-   fi
-   ;;
--aix4*)
-+aix4* | aix5*)
-   test "$enable_shared" = yes && enable_static=no
-   ;;
- esac
-@@ -16369,6 +15727,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 	lt_prog_compiler_static_F77='-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_prog_compiler_pic_F77='-qnocommon'
-+         lt_prog_compiler_wl_F77='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -16405,12 +15773,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-     linux*)
-       case $CC in
--      icc|ecc)
-+      icc* | ecc*)
- 	lt_prog_compiler_wl_F77='-Wl,'
- 	lt_prog_compiler_pic_F77='-KPIC'
- 	lt_prog_compiler_static_F77='-static'
-         ;;
--      ccc)
-+      ccc*)
-         lt_prog_compiler_wl_F77='-Wl,'
-         # All Alpha code is PIC.
-         lt_prog_compiler_static_F77='-non_shared'
-@@ -16472,7 +15840,8 @@ echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6; }
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_F77"; then
--  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-+
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -16490,11 +15859,11 @@ else
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16493: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15862: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:16497: \$? = $ac_status" >&5
-+   echo "$as_me:15866: \$? = $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
-@@ -16541,13 +15910,6 @@ else
-    mkdir out
-    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--   # 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 .
--
-    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.
-@@ -16557,11 +15919,11 @@ else
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:16560: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:15922: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:16564: \$? = $ac_status" >&5
-+   echo "$as_me:15926: \$? = $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
-@@ -16571,8 +15933,11 @@ else
-      fi
-    fi
-    chmod u+w .
--   $rm conftest* out/*
--   rmdir out
-+   $rm conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+   $rm out/* && rmdir out
-    cd ..
-    rmdir conftest
-    $rm conftest*
-@@ -16682,7 +16047,7 @@ EOF
-       ;;
- 
-     amigaos*)
--      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
-+      archive_cmds_F77='$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_F77='-L$libdir'
-       hardcode_minus_L_F77=yes
- 
-@@ -16724,7 +16089,7 @@ EOF
- 	else
- 	  echo EXPORTS > $output_objdir/$soname.def;
- 	  cat $export_symbols >> $output_objdir/$soname.def;
--	fi${_S_}
-+	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
- 	ld_shlibs=no
-@@ -16769,6 +16134,31 @@ EOF
-       hardcode_shlibpath_var_F77=no
-       ;;
- 
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds_F77="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        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 $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds_F77="$tmp_archive_cmds"
-+      fi
-+    else
-+      ld_shlibs_F77=no
-+    fi
-+    ;;
-+
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -16796,7 +16186,7 @@ EOF
-     aix3*)
-       allow_undefined_flag_F77=unsupported
-       always_export_symbols_F77=yes
--      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      archive_expsym_cmds_F77='$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_F77=yes
-@@ -16914,27 +16304,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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; }
- }'`
-@@ -16948,7 +16322,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- 
--rm -f core 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
- 
-@@ -16979,27 +16353,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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; }
- }'`
-@@ -17013,7 +16371,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- 
--rm -f core 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
- 
-@@ -17028,20 +16386,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 	  whole_archive_flag_spec_F77=' '
- 	  archive_cmds_need_lc_F77=yes
- 	  # This is similar to how AIX traditionally builds it's shared libraries.
--	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-       ;;
- 
-     amigaos*)
--      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
-+      archive_cmds_F77='$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_F77='-L$libdir'
-       hardcode_minus_L_F77=yes
-       # see comment about different semantics on the GNU ld section
-       ld_shlibs_F77=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec_F77=-rdynamic
-       ;;
- 
-@@ -17055,9 +16413,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       # Tell ltmain to make .lib files, not .a files.
-       libext=lib
-       # Tell ltmain to make .dll files, not .so files.
--      shrext=".dll"
-+      shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
--      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
-+      archive_cmds_F77='$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_F77='true'
-       # FIXME: Should let the user specify the lib program.
-@@ -17067,57 +16425,52 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       ;;
- 
-     darwin* | rhapsody*)
--    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
--      archive_cmds_need_lc_F77=no
-       case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_F77='-undefined suppress'
--	;;
--      darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0
--	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--	;;
--      *) # Darwin 7.0 on
--	case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
--	10.[012])
--	  test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--	  ;;
--	*) # 10.3 on
--	  if test -z ${LD_TWOLEVEL_NAMESPACE}; then
--	    allow_undefined_flag_F77='-flat_namespace -undefined suppress'
--	  else
--	    allow_undefined_flag_F77='-undefined dynamic_lookup'
--	  fi
--	  ;;
--	esac
--	;;
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_F77='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_F77='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_F77='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-       esac
--      # FIXME: Relying on posixy $() will cause problems for
--      #        cross-compilation, but unfortunately the echo tests do not
--      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
--      #	       `"' quotes if we put them in here... so don't!
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_F77='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_F77='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      archive_cmds_need_lc_F77=no
-       hardcode_direct_F77=no
-       hardcode_automatic_F77=yes
-       hardcode_shlibpath_var_F77=unsupported
--      whole_archive_flag_spec_F77='-all_load $convenience'
-+      whole_archive_flag_spec_F77=''
-       link_all_deplibs_F77=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds_F77='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      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 ld's
-+      archive_expsym_cmds_F77='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_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}'
-+    else
-+      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'
-+         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 ld's
-+         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}'
-+          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}'
-+          ;;
-+       *)
-+         ld_shlibs_F77=no
-+          ;;
-+      esac
-     fi
-       ;;
- 
-@@ -17151,7 +16504,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | kfreebsd*-gnu)
-       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_direct_F77=yes
-@@ -17160,9 +16513,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-     hpux9*)
-       if test "$GCC" = yes; then
--	archive_cmds_F77='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+	archive_cmds_F77='$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
--	archive_cmds_F77='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+	archive_cmds_F77='$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
-       hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator_F77=:
-@@ -17262,6 +16615,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       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
-@@ -17282,7 +16636,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       hardcode_libdir_flag_spec_F77='-L$libdir'
-       hardcode_minus_L_F77=yes
-       allow_undefined_flag_F77=unsupported
--      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      archive_cmds_F77='$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_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-       ;;
- 
-@@ -17306,8 +16660,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       else
- 	allow_undefined_flag_F77=' -expect_unresolved \*'
- 	archive_cmds_F77='$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_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp${_S_}
--	$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${_S_}$rm $lib.exp'
-+	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-+	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -17327,12 +16681,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       no_undefined_flag_F77=' -z text'
-       if test "$GCC" = yes; then
- 	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp'
-+	archive_expsym_cmds_F77='$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
- 	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
-+	archive_expsym_cmds_F77='$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
-       hardcode_libdir_flag_spec_F77='-R$libdir'
-       hardcode_shlibpath_var_F77=no
-@@ -17421,8 +16775,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
-+      archive_expsym_cmds_F77='$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_F77=
-       hardcode_shlibpath_var_F77=no
-       runpath_var='LD_RUN_PATH'
-@@ -17459,7 +16813,7 @@ x|xyes)
- 
-   if test "$enable_shared" = yes && test "$GCC" = yes; then
-     case $archive_cmds_F77 in
--    *"$_S_"*)
-+    *'~'*)
-       # FIXME: we may have to deal with multi-command sequences.
-       ;;
-     '$CC '*)
-@@ -17511,78 +16865,12 @@ echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6; }
-   ;;
- esac
- 
--{ 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_F77=
--if test -n "$hardcode_libdir_flag_spec_F77" || \
--   test -n "$runpath_var F77" || \
--   test "X$hardcode_automatic_F77"="Xyes" ; then
--
--  # We can hardcode non-existant directories.
--  if test "$hardcode_direct_F77" != no &&
--     # If the only mechanism to avoid hardcoding is shlibpath_var, we
--     # have to relink, otherwise we might link with an installed library
--     # when we should be linking with a yet-to-be-installed one
--     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
--     test "$hardcode_minus_L_F77" != no; then
--    # Linking always hardcodes the temporary library directory.
--    hardcode_action_F77=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    hardcode_action_F77=immediate
--  fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  hardcode_action_F77=unsupported
--fi
--{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
--echo "${ECHO_T}$hardcode_action_F77" >&6; }
--
--if test "$hardcode_action_F77" = 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
--
--striplib=
--old_striplib=
--{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--   NOT-darwin*)
--       if test -n "$STRIP" ; then
--         striplib="$STRIP -x"
--         { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--       else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--       ;;
--   *)
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--    ;;
--  esac
--fi
--
- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
- echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -17670,7 +16958,7 @@ aix4* | aix5*)
- 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*)
-@@ -17679,7 +16967,7 @@ beos*)
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17695,7 +16983,7 @@ bsdi4*)
- 
- cygwin* | mingw* | pw32*)
-   version_type=windows
--  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
- 
-@@ -17703,13 +16991,13 @@ cygwin* | mingw* | pw32*)
-   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}`${_S_}
--      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_}
--      dldir=$destdir/`dirname \$dlpath`${_S_}
--      test -d \$dldir || mkdir -p \$dldir${_S_}
-+    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'
--    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_}
--      dlpath=$dir/\$dldll${_S_}
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-     shlibpath_overrides_runpath=yes
- 
-@@ -17717,7 +17005,7 @@ cygwin* | mingw* | pw32*)
-     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="/lib /lib/w32api /usr/lib /usr/local/lib"
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
-     mingw*)
-       # MinGW DLLs use traditional 'lib' prefix
-@@ -17756,17 +17044,16 @@ darwin* | rhapsody*)
-   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}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
-+  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='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; 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"`
-+  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'
-   ;;
-@@ -17784,6 +17071,18 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
-+kfreebsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-@@ -17832,7 +17131,7 @@ hpux9* | hpux10* | hpux11*)
-   need_version=no
-   case "$host_cpu" in
-   ia64*)
--    shrext='.so'
-+    shrext_cmds='.so'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.so"
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -17847,7 +17146,7 @@ hpux9* | hpux10* | hpux11*)
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-    hppa*64*)
--     shrext='.sl'
-+     shrext_cmds='.sl'
-      hardcode_into_libs=yes
-      dynamic_linker="$host_os dld.sl"
-      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17858,7 +17157,7 @@ hpux9* | hpux10* | hpux11*)
-      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-      ;;
-    *)
--    shrext='.sl'
-+    shrext_cmds='.sl'
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=SHLIB_PATH
-     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17927,6 +17226,12 @@ linux*)
-   # 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=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | 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,
-@@ -17936,6 +17241,18 @@ linux*)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+knetbsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -17945,7 +17262,7 @@ netbsd*)
-     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}${release}${shared_ext} ${libname}${shared_ext}'
-+    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
-@@ -17961,7 +17278,7 @@ newsos6)
-   shlibpath_overrides_runpath=yes
-   ;;
- 
--nto-qnx)
-+nto-qnx*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -17994,7 +17311,7 @@ openbsd*)
- 
- os2*)
-   libname_spec='$name'
--  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-@@ -18092,6 +17409,73 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-+{ 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_F77=
-+if test -n "$hardcode_libdir_flag_spec_F77" || \
-+   test -n "$runpath_var_F77" || \
-+   test "X$hardcode_automatic_F77" = "Xyes" ; then
-+
-+  # We can hardcode non-existant directories.
-+  if test "$hardcode_direct_F77" != no &&
-+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-+     test "$hardcode_minus_L_F77" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action_F77=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action_F77=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action_F77=unsupported
-+fi
-+{ echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-+echo "${ECHO_T}$hardcode_action_F77" >&6; }
-+
-+if test "$hardcode_action_F77" = 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
-+
-+striplib=
-+old_striplib=
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+   darwin*)
-+       if test -n "$STRIP" ; then
-+         striplib="$STRIP -x"
-+         { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+       else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+       ;;
-+   *)
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+    ;;
-+  esac
-+fi
-+
-+
- 
- # The else clause should only fire when bootstrapping the
- # libtool distribution, otherwise you forgot to ship ltmain.sh
-@@ -18106,7 +17490,8 @@ if test -f "$ltmain"; then
-   # Now quote all the things that may contain metacharacters while being
-   # careful not to overquote the AC_SUBSTed values.  We take copies of the
-   # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-+    SED SHELL STRIP \
-     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-     deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -18164,7 +17549,7 @@ if test -f "$ltmain"; then
-     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\" -e \"\$unescape_variable_subst\"\`\\\""
-+      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\"\`\\\""
-@@ -18185,9 +17570,6 @@ cfgfile="$ofile"
- 
- # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- 
--# Set the command separator (default: ~)
--_S_=\${LIBTOOL_CMD_SEP-\~}
--
- # Shell to use when invoking shell scripts.
- SHELL=$lt_SHELL
- 
-@@ -18239,7 +17621,7 @@ LN_S=$lt_LN_S
- 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
-@@ -18270,7 +17652,7 @@ objext="$ac_objext"
- libext="$libext"
- 
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
- 
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -18487,7 +17869,10 @@ 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"
-+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+  if test -f "$ltmain_in"; then
-+    test -f Makefile && make "$ltmain"
-+  fi
- fi
- 
- 
-@@ -18545,7 +17930,8 @@ lt_prog_compiler_no_builtin_flag_GCJ=
- if test "$GCC" = yes; then
-   lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
- 
--  { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+
-+{ 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
-@@ -18563,11 +17949,11 @@ else
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18566: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:17952: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18570: \$? = $ac_status" >&5
-+   echo "$as_me:17956: \$? = $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
-@@ -18674,6 +18060,16 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 	lt_prog_compiler_static_GCJ='-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_prog_compiler_pic_GCJ='-qnocommon'
-+         lt_prog_compiler_wl_GCJ='-Wl,'
-+         ;;
-+       esac
-+       ;;
- 
-     mingw* | pw32* | os2*)
-       # This hack is so that the source file can tell whether it is being
-@@ -18710,12 +18106,12 @@ echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
- 
-     linux*)
-       case $CC in
--      icc|ecc)
-+      icc* | ecc*)
- 	lt_prog_compiler_wl_GCJ='-Wl,'
- 	lt_prog_compiler_pic_GCJ='-KPIC'
- 	lt_prog_compiler_static_GCJ='-static'
-         ;;
--      ccc)
-+      ccc*)
-         lt_prog_compiler_wl_GCJ='-Wl,'
-         # All Alpha code is PIC.
-         lt_prog_compiler_static_GCJ='-non_shared'
-@@ -18777,7 +18173,8 @@ echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6; }
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic_GCJ"; then
--  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-+
-+{ echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
- echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6; }
- if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -18795,11 +18192,11 @@ else
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18798: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18195: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:18802: \$? = $ac_status" >&5
-+   echo "$as_me:18199: \$? = $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
-@@ -18846,13 +18243,6 @@ else
-    mkdir out
-    printf "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--   # 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 .
--
-    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.
-@@ -18862,11 +18252,11 @@ else
-    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:18865: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18255: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:18869: \$? = $ac_status" >&5
-+   echo "$as_me:18259: \$? = $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
-@@ -18876,8 +18266,11 @@ else
-      fi
-    fi
-    chmod u+w .
--   $rm conftest* out/*
--   rmdir out
-+   $rm conftest*
-+   # SGI C++ compiler will create directory out/ii_files/ for
-+   # template instantiation
-+   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-+   $rm out/* && rmdir out
-    cd ..
-    rmdir conftest
-    $rm conftest*
-@@ -18987,7 +18380,7 @@ EOF
-       ;;
- 
-     amigaos*)
--      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
-+      archive_cmds_GCJ='$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_GCJ='-L$libdir'
-       hardcode_minus_L_GCJ=yes
- 
-@@ -19029,7 +18422,7 @@ EOF
- 	else
- 	  echo EXPORTS > $output_objdir/$soname.def;
- 	  cat $export_symbols >> $output_objdir/$soname.def;
--	fi${_S_}
-+	fi~
- 	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
- 	ld_shlibs=no
-@@ -19074,6 +18467,31 @@ EOF
-       hardcode_shlibpath_var_GCJ=no
-       ;;
- 
-+  linux*)
-+    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-+        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-+	archive_cmds_GCJ="$tmp_archive_cmds"
-+      supports_anon_versioning=no
-+      case `$LD -v 2>/dev/null` in
-+        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-+        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-+        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-+        *\ 2.11.*) ;; # other 2.11 versions
-+        *) supports_anon_versioning=yes ;;
-+      esac
-+      if test $supports_anon_versioning = yes; then
-+        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 $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-+      else
-+        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
-+      fi
-+    else
-+      ld_shlibs_GCJ=no
-+    fi
-+    ;;
-+
-     *)
-       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
- 	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-@@ -19101,7 +18519,7 @@ EOF
-     aix3*)
-       allow_undefined_flag_GCJ=unsupported
-       always_export_symbols_GCJ=yes
--      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE${_S_}$AR $AR_FLAGS $lib $output_objdir/$soname'
-+      archive_expsym_cmds_GCJ='$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_GCJ=yes
-@@ -19229,27 +18647,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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; }
- }'`
-@@ -19263,7 +18665,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- 
--rm -f core 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
- 
-@@ -19304,27 +18706,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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; }
- }'`
-@@ -19338,7 +18724,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- 
--rm -f core 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
- 
-@@ -19353,20 +18739,20 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 	  whole_archive_flag_spec_GCJ=' '
- 	  archive_cmds_need_lc_GCJ=yes
- 	  # This is similar to how AIX traditionally builds it's shared libraries.
--	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}\${_S_}$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-+	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
- 	fi
-       fi
-       ;;
- 
-     amigaos*)
--      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data${_S_}$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data${_S_}$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data${_S_}$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data${_S_}$AR $AR_FLAGS $lib $libobjs${_S_}$RANLIB $lib${_S_}(cd $output_objdir && a2ixlibrary -32)'
-+      archive_cmds_GCJ='$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_GCJ='-L$libdir'
-       hardcode_minus_L_GCJ=yes
-       # see comment about different semantics on the GNU ld section
-       ld_shlibs_GCJ=no
-       ;;
- 
--    bsdi4*)
-+    bsdi[45]*)
-       export_dynamic_flag_spec_GCJ=-rdynamic
-       ;;
- 
-@@ -19380,9 +18766,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       # Tell ltmain to make .lib files, not .a files.
-       libext=lib
-       # Tell ltmain to make .dll files, not .so files.
--      shrext=".dll"
-+      shrext_cmds=".dll"
-       # FIXME: Setting linknames here is a bad hack.
--      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll${_S_}linknames='
-+      archive_cmds_GCJ='$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_GCJ='true'
-       # FIXME: Should let the user specify the lib program.
-@@ -19392,57 +18778,52 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       ;;
- 
-     darwin* | rhapsody*)
--    if $CC -v 2>&1 | grep 'Apple' >/dev/null ; then
--      archive_cmds_need_lc_GCJ=no
-       case "$host_os" in
--      rhapsody* | darwin1.[012])
--	allow_undefined_flag_GCJ='-undefined suppress'
--	;;
--      darwin1.* | darwin[2-6].*) # Darwin 1.3 on, but less than 7.0
--	test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--	;;
--      *) # Darwin 7.0 on
--	case "${MACOSX_DEPLOYMENT_TARGET-10.1}" in
--	10.[012])
--	  test -z ${LD_TWOLEVEL_NAMESPACE} && allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--	  ;;
--	*) # 10.3 on
--	  if test -z ${LD_TWOLEVEL_NAMESPACE}; then
--	    allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
--	  else
--	    allow_undefined_flag_GCJ='-undefined dynamic_lookup'
--	  fi
--	  ;;
--	esac
--	;;
-+        rhapsody* | darwin1.[012])
-+         allow_undefined_flag_GCJ='${wl}-undefined ${wl}suppress'
-+         ;;
-+       *) # Darwin 1.3 on
-+         if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-+           allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+         else
-+           case ${MACOSX_DEPLOYMENT_TARGET} in
-+             10.[012])
-+               allow_undefined_flag_GCJ='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
-+               ;;
-+             10.*)
-+               allow_undefined_flag_GCJ='${wl}-undefined ${wl}dynamic_lookup'
-+               ;;
-+           esac
-+         fi
-+         ;;
-       esac
--      # FIXME: Relying on posixy $() will cause problems for
--      #        cross-compilation, but unfortunately the echo tests do not
--      #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
--      #	       `"' quotes if we put them in here... so don't!
--    	lt_int_apple_cc_single_mod=no
--    	output_verbose_link_cmd='echo'
--    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
--    	  lt_int_apple_cc_single_mod=yes
--    	fi
--    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--    	  archive_cmds_GCJ='$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--    	else
--        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
--      fi
--      module_cmds_GCJ='$CC -bundle $archargs ${wl}-bind_at_load $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags'
--      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
--        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -dynamiclib $archargs -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        else
--          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs${_S_}$CC -dynamiclib $archargs $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
--        fi
--          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym${_S_}$CC -bundle $archargs $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags${_S_}nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-+      archive_cmds_need_lc_GCJ=no
-       hardcode_direct_GCJ=no
-       hardcode_automatic_GCJ=yes
-       hardcode_shlibpath_var_GCJ=unsupported
--      whole_archive_flag_spec_GCJ='-all_load $convenience'
-+      whole_archive_flag_spec_GCJ=''
-       link_all_deplibs_GCJ=yes
-+    if test "$GCC" = yes ; then
-+    	output_verbose_link_cmd='echo'
-+        archive_cmds_GCJ='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-+      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 ld's
-+      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
-+      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'
-+         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 ld's
-+         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}'
-+          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
-       ;;
- 
-@@ -19476,7 +18857,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       ;;
- 
-     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | kfreebsd*-gnu)
-       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_direct_GCJ=yes
-@@ -19485,9 +18866,9 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-     hpux9*)
-       if test "$GCC" = yes; then
--	archive_cmds_GCJ='$rm $output_objdir/$soname${_S_}$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+	archive_cmds_GCJ='$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
--	archive_cmds_GCJ='$rm $output_objdir/$soname${_S_}$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags${_S_}test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-+	archive_cmds_GCJ='$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
-       hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-       hardcode_libdir_separator_GCJ=:
-@@ -19587,6 +18968,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       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
-@@ -19607,7 +18989,7 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       hardcode_libdir_flag_spec_GCJ='-L$libdir'
-       hardcode_minus_L_GCJ=yes
-       allow_undefined_flag_GCJ=unsupported
--      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def${_S_}$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def${_S_}$echo DATA >> $output_objdir/$libname.def${_S_}$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def${_S_}$echo EXPORTS >> $output_objdir/$libname.def${_S_}emxexp $libobjs >> $output_objdir/$libname.def${_S_}$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-+      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'
-       ;;
- 
-@@ -19631,8 +19013,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       else
- 	allow_undefined_flag_GCJ=' -expect_unresolved \*'
- 	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${_S_}
--	$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${_S_}$rm $lib.exp'
-+	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 ${objdir}/so_locations -o $lib~$rm $lib.exp'
- 
- 	# Both c and cxx compiler support -rpath directly
- 	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19652,12 +19034,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-       no_undefined_flag_GCJ=' -z text'
-       if test "$GCC" = yes; then
- 	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
--	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags${_S_}$rm $lib.exp'
-+	archive_expsym_cmds_GCJ='$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
- 	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
-+	archive_expsym_cmds_GCJ='$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
-       hardcode_libdir_flag_spec_GCJ='-R$libdir'
-       hardcode_shlibpath_var_GCJ=no
-@@ -19746,8 +19128,8 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; 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_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
--      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp${_S_}cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp${_S_}$echo "local: *; };" >> $lib.exp${_S_}
--  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags${_S_}$rm $lib.exp'
-+      archive_expsym_cmds_GCJ='$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_GCJ=
-       hardcode_shlibpath_var_GCJ=no
-       runpath_var='LD_RUN_PATH'
-@@ -19784,7 +19166,7 @@ x|xyes)
- 
-   if test "$enable_shared" = yes && test "$GCC" = yes; then
-     case $archive_cmds_GCJ in
--    *"$_S_"*)
-+    *'~'*)
-       # FIXME: we may have to deal with multi-command sequences.
-       ;;
-     '$CC '*)
-@@ -19836,78 +19218,12 @@ echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6; }
-   ;;
- esac
- 
--{ 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
--     # have to relink, otherwise we might link with an installed library
--     # when we should be linking with a yet-to-be-installed one
--     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
--     test "$hardcode_minus_L_GCJ" != no; then
--    # Linking always hardcodes the temporary library directory.
--    hardcode_action_GCJ=relink
--  else
--    # We can link without hardcoding, and we can hardcode nonexisting dirs.
--    hardcode_action_GCJ=immediate
--  fi
--else
--  # We cannot hardcode anything, or else we can only hardcode existing
--  # directories.
--  hardcode_action_GCJ=unsupported
--fi
--{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
--echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
--
--if test "$hardcode_action_GCJ" = 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
--
--striplib=
--old_striplib=
--{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
--echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
--if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
--  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
--  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--else
--# FIXME - insert some real tests, host_os isn't really good enough
--  case $host_os in
--   NOT-darwin*)
--       if test -n "$STRIP" ; then
--         striplib="$STRIP -x"
--         { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--       else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--fi
--       ;;
--   *)
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--    ;;
--  esac
--fi
--
- { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
- echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
- library_names_spec=
- libname_spec='lib$name'
- soname_spec=
--shrext=".so"
-+shrext_cmds=".so"
- postinstall_cmds=
- postuninstall_cmds=
- finish_cmds=
-@@ -19995,7 +19311,7 @@ aix4* | aix5*)
- 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*)
-@@ -20004,7 +19320,7 @@ beos*)
-   shlibpath_var=LIBRARY_PATH
-   ;;
- 
--bsdi4*)
-+bsdi[45]*)
-   version_type=linux
-   need_version=no
-   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -20020,7 +19336,7 @@ bsdi4*)
- 
- cygwin* | mingw* | pw32*)
-   version_type=windows
--  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_version=no
-   need_lib_prefix=no
- 
-@@ -20028,13 +19344,13 @@ cygwin* | mingw* | pw32*)
-   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}`${_S_}
--      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`${_S_}
--      dldir=$destdir/`dirname \$dlpath`${_S_}
--      test -d \$dldir || mkdir -p \$dldir${_S_}
-+    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'
--    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`${_S_}
--      dlpath=$dir/\$dldll${_S_}
-+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-+      dlpath=$dir/\$dldll~
-        $rm \$dlpath'
-     shlibpath_overrides_runpath=yes
- 
-@@ -20042,7 +19358,7 @@ cygwin* | mingw* | pw32*)
-     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="/lib /lib/w32api /usr/lib /usr/local/lib"
-+      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-       ;;
-     mingw*)
-       # MinGW DLLs use traditional 'lib' prefix
-@@ -20081,17 +19397,16 @@ darwin* | rhapsody*)
-   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}${major}$shared_ext ${libname}$shared_ext ${libname}${release}${versuffix}$shared_ext'
-+  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='$(test .$module = .yes && echo .so || echo .dylib)'
-+  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-   # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
--  if $CC -v 2>&1 | grep 'Apple' >/dev/null ; 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"`
-+  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'
-   ;;
-@@ -20109,6 +19424,18 @@ freebsd1*)
-   dynamic_linker=no
-   ;;
- 
-+kfreebsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
- freebsd*)
-   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-   version_type=freebsd-$objformat
-@@ -20157,7 +19484,7 @@ hpux9* | hpux10* | hpux11*)
-   need_version=no
-   case "$host_cpu" in
-   ia64*)
--    shrext='.so'
-+    shrext_cmds='.so'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.so"
-     shlibpath_var=LD_LIBRARY_PATH
-@@ -20172,7 +19499,7 @@ hpux9* | hpux10* | hpux11*)
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-    hppa*64*)
--     shrext='.sl'
-+     shrext_cmds='.sl'
-      hardcode_into_libs=yes
-      dynamic_linker="$host_os dld.sl"
-      shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -20183,7 +19510,7 @@ hpux9* | hpux10* | hpux11*)
-      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-      ;;
-    *)
--    shrext='.sl'
-+    shrext_cmds='.sl'
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=SHLIB_PATH
-     shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -20252,6 +19579,12 @@ linux*)
-   # 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=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | 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,
-@@ -20261,6 +19594,18 @@ linux*)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+knetbsd*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='GNU ld.so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -20270,7 +19615,7 @@ netbsd*)
-     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}${release}${shared_ext} ${libname}${shared_ext}'
-+    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
-@@ -20286,7 +19631,7 @@ newsos6)
-   shlibpath_overrides_runpath=yes
-   ;;
- 
--nto-qnx)
-+nto-qnx*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -20319,7 +19664,7 @@ openbsd*)
- 
- os2*)
-   libname_spec='$name'
--  shrext=".dll"
-+  shrext_cmds=".dll"
-   need_lib_prefix=no
-   library_names_spec='$libname${shared_ext} $libname.a'
-   dynamic_linker='OS/2 ld.exe'
-@@ -20417,6 +19762,72 @@ esac
- echo "${ECHO_T}$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-+{ 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
-+     # have to relink, otherwise we might link with an installed library
-+     # when we should be linking with a yet-to-be-installed one
-+     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-+     test "$hardcode_minus_L_GCJ" != no; then
-+    # Linking always hardcodes the temporary library directory.
-+    hardcode_action_GCJ=relink
-+  else
-+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-+    hardcode_action_GCJ=immediate
-+  fi
-+else
-+  # We cannot hardcode anything, or else we can only hardcode existing
-+  # directories.
-+  hardcode_action_GCJ=unsupported
-+fi
-+{ echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-+echo "${ECHO_T}$hardcode_action_GCJ" >&6; }
-+
-+if test "$hardcode_action_GCJ" = 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
-+
-+striplib=
-+old_striplib=
-+{ echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6; }
-+if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+# FIXME - insert some real tests, host_os isn't really good enough
-+  case $host_os in
-+   darwin*)
-+       if test -n "$STRIP" ; then
-+         striplib="$STRIP -x"
-+         { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+       else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+fi
-+       ;;
-+   *)
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+    ;;
-+  esac
-+fi
-+
- if test "x$enable_dlopen" != xyes; then
-   enable_dlopen=unknown
-   enable_dlopen_self=unknown
-@@ -20486,27 +19897,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -20515,7 +19910,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dl_dlopen=no
- fi
- 
--rm -f core 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
-@@ -20597,27 +19992,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -20626,7 +20005,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_shl_load=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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
-@@ -20676,27 +20055,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -20705,7 +20068,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dld_shl_load=no
- fi
- 
--rm -f core 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
-@@ -20777,27 +20140,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -20806,7 +20153,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_dlopen=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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
-@@ -20856,27 +20203,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -20885,7 +20216,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dl_dlopen=no
- fi
- 
--rm -f core 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
-@@ -20936,27 +20267,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -20965,7 +20280,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_svld_dlopen=no
- fi
- 
--rm -f core 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
-@@ -21016,27 +20331,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -21045,7 +20344,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dld_dld_link=no
- fi
- 
--rm -f core 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
-@@ -21101,7 +20400,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 21104 "configure"
-+#line 20403 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -21199,7 +20498,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<EOF
--#line 21202 "configure"
-+#line 20501 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -21316,7 +20615,8 @@ if test -f "$ltmain"; then
-   # Now quote all the things that may contain metacharacters while being
-   # careful not to overquote the AC_SUBSTed values.  We take copies of the
-   # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-+    SED SHELL STRIP \
-     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-     deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21374,7 +20674,7 @@ if test -f "$ltmain"; then
-     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\" -e \"\$unescape_variable_subst\"\`\\\""
-+      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\"\`\\\""
-@@ -21395,9 +20695,6 @@ cfgfile="$ofile"
- 
- # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- 
--# Set the command separator (default: ~)
--_S_=\${LIBTOOL_CMD_SEP-\~}
--
- # Shell to use when invoking shell scripts.
- SHELL=$lt_SHELL
- 
-@@ -21449,7 +20746,7 @@ LN_S=$lt_LN_S
- 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
-@@ -21480,7 +20777,7 @@ objext="$ac_objext"
- libext="$libext"
- 
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
- 
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -21697,7 +20994,10 @@ 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"
-+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+  if test -f "$ltmain_in"; then
-+    test -f Makefile && make "$ltmain"
-+  fi
- fi
- 
- 
-@@ -21759,7 +21059,8 @@ if test -f "$ltmain"; then
-   # Now quote all the things that may contain metacharacters while being
-   # careful not to overquote the AC_SUBSTed values.  We take copies of the
-   # variables and quote the copies for generation of the libtool script.
--  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
-+  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-+    SED SHELL STRIP \
-     libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-     old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-     deplibs_check_method reload_flag reload_cmds need_locks \
-@@ -21817,7 +21118,7 @@ if test -f "$ltmain"; then
-     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\" -e \"\$unescape_variable_subst\"\`\\\""
-+      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\"\`\\\""
-@@ -21838,9 +21139,6 @@ cfgfile="$ofile"
- 
- # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
- 
--# Set the command separator (default: ~)
--_S_=\${LIBTOOL_CMD_SEP-\~}
--
- # Shell to use when invoking shell scripts.
- SHELL=$lt_SHELL
- 
-@@ -21892,7 +21190,7 @@ LN_S=$lt_LN_S
- 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
-@@ -21923,7 +21221,7 @@ objext="$ac_objext"
- libext="$libext"
- 
- # Shared library suffix (normally ".so").
--shrext='$shrext'
-+shrext_cmds='$shrext_cmds'
- 
- # Executable file suffix (normally "").
- exeext="$exeext"
-@@ -22140,7 +21438,10 @@ 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"
-+  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-+  if test -f "$ltmain_in"; then
-+    test -f Makefile && make "$ltmain"
-+  fi
- fi
- 
- 
-@@ -22187,7 +21488,8 @@ fi
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+LIBTOOL='$(SHELL) $(top_builddir)'
-+LIBTOOL="$LIBTOOL/$host_alias-libtool"
- 
- # Prevent multiple expansion
- 
-@@ -22220,7 +21522,8 @@ INCLUDES="-I${blddir} -I${topdir}/platforms/unix/vm -I${topdir}/platforms/Cross/
- # Checks for header files.
- 
- case "$host" in
--  *-sunos*)	cat >>confdefs.h <<\_ACEOF
-+  *-sunos*)
-+cat >>confdefs.h <<\_ACEOF
- #define NEED_SUNOS_H 1
- _ACEOF
- 
-@@ -22263,27 +21566,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -22460,27 +21746,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -22516,17 +21785,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -22626,27 +21888,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -22682,17 +21927,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -22790,27 +22028,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -22846,17 +22067,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -22954,27 +22168,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -23010,17 +22207,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -23116,27 +22306,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_time=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -23201,27 +22374,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -23294,27 +22450,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_search_opendir=$ac_res
- else
-   echo "$as_me: failed program was:" >&5
-@@ -23323,7 +22463,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext
-   if test "${ac_cv_search_opendir+set}" = set; then
-   break
-@@ -23394,27 +22534,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_search_opendir=$ac_res
- else
-   echo "$as_me: failed program was:" >&5
-@@ -23423,7 +22547,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext
-   if test "${ac_cv_search_opendir+set}" = set; then
-   break
-@@ -23449,7 +22573,8 @@ fi
- 
- 
- if test -f "${vmmdir}/vm/interp.h"; then
--  cat >>confdefs.h <<\_ACEOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_INTERP_H 1
- _ACEOF
- 
-@@ -23473,7 +22598,9 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--struct tm *tp; tp->tm_sec;
-+struct tm tm;
-+				     int *p = &tm.tm_sec;
-+ 				     return !p;
-   ;
-   return 0;
- }
-@@ -23491,27 +22618,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_struct_tm=time.h
- else
-   echo "$as_me: failed program was:" >&5
-@@ -23570,27 +22680,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_member_struct_tm_tm_zone=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -23629,27 +22722,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_member_struct_tm_tm_zone=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -23698,8 +22774,7 @@ int
- main ()
- {
- #ifndef tzname
--  char *p = (char *) tzname;
--  return !p;
-+  (void) tzname;
- #endif
- 
-   ;
-@@ -23719,27 +22794,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_have_decl_tzname=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -23805,27 +22863,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_var_tzname=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -23834,7 +22876,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_var_tzname=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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_var_tzname" >&5
-@@ -23882,27 +22924,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_socklen_t="yes"
- else
-   echo "$as_me: failed program was:" >&5
-@@ -23915,7 +22940,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_socklen_t" >&5
- echo "${ECHO_T}$ac_cv_socklen_t" >&6; }
--test "$ac_cv_socklen_t" != "yes" && cat >>confdefs.h <<\_ACEOF
-+test "$ac_cv_socklen_t" != "yes" &&
-+cat >>confdefs.h <<\_ACEOF
- #define socklen_t int
- _ACEOF
- 
-@@ -23952,27 +22978,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_atexit="atexit"
- else
-   echo "$as_me: failed program was:" >&5
-@@ -24006,27 +23015,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_atexit="on_exit"
- else
-   echo "$as_me: failed program was:" >&5
-@@ -24043,7 +23035,8 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_atexit" >&5
- echo "${ECHO_T}$ac_cv_atexit" >&6; }
- if test "$ac_cv_atexit" != "no"; then
--  cat >>confdefs.h <<_ACEOF
-+
-+cat >>confdefs.h <<_ACEOF
- #define AT_EXIT $ac_cv_atexit
- _ACEOF
- 
-@@ -24081,27 +23074,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_tzset="yes"
- else
-   echo "$as_me: failed program was:" >&5
-@@ -24114,7 +23090,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_tzset" >&5
- echo "${ECHO_T}$ac_cv_tzset" >&6; }
--test "$ac_cv_tzset" != "no" && cat >>confdefs.h <<\_ACEOF
-+test "$ac_cv_tzset" != "no" &&
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_TZSET 1
- _ACEOF
- 
-@@ -24151,27 +23128,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_tm_gmtoff="yes"
- else
-   echo "$as_me: failed program was:" >&5
-@@ -24184,7 +23144,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_tm_gmtoff" >&5
- echo "${ECHO_T}$ac_cv_tm_gmtoff" >&6; }
--test "$ac_cv_tm_gmtoff" != "no" && cat >>confdefs.h <<\_ACEOF
-+test "$ac_cv_tm_gmtoff" != "no" &&
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_TM_GMTOFF 1
- _ACEOF
- 
-@@ -24221,27 +23182,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_timezone="yes"
- else
-   echo "$as_me: failed program was:" >&5
-@@ -24254,7 +23198,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_timezone" >&5
- echo "${ECHO_T}$ac_cv_timezone" >&6; }
--test "$ac_cv_timezone" != "no" && cat >>confdefs.h <<\_ACEOF
-+test "$ac_cv_timezone" != "no" &&
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_TIMEZONE 1
- _ACEOF
- 
-@@ -24291,27 +23236,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_gethostname_p="yes"
- else
-   echo "$as_me: failed program was:" >&5
-@@ -24324,7 +23252,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_gethostname_p" >&5
- echo "${ECHO_T}$ac_cv_gethostname_p" >&6; }
--test "$ac_cv_gethostname_p" = "no" && cat >>confdefs.h <<\_ACEOF
-+test "$ac_cv_gethostname_p" = "no" &&
-+cat >>confdefs.h <<\_ACEOF
- #define NEED_GETHOSTNAME_P 1
- _ACEOF
- 
-@@ -24340,7 +23269,8 @@ else
- fi
- 
- 
--test $have_rfb = "yes" && cat >>confdefs.h <<\_ACEOF
-+test $have_rfb = "yes" &&
-+cat >>confdefs.h <<\_ACEOF
- #define USE_RFB 1
- _ACEOF
- 
-@@ -24390,27 +23320,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_nsl_yp_bind=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -24419,7 +23333,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_nsl_yp_bind=no
- fi
- 
--rm -f core 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
-@@ -24477,27 +23391,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_socket_socket=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -24506,7 +23404,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_socket_socket=no
- fi
- 
--rm -f core 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
-@@ -24564,27 +23462,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_m_sin=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -24593,7 +23475,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_m_sin=no
- fi
- 
--rm -f core 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
-@@ -24685,27 +23567,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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__dyld_present=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -24714,14 +23580,15 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func__dyld_present=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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__dyld_present" >&5
- echo "${ECHO_T}$ac_cv_func__dyld_present" >&6; }
- if test $ac_cv_func__dyld_present = yes; then
- 
--  cat >>confdefs.h <<\_ACEOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_DYLD 1
- _ACEOF
- 
-@@ -24767,27 +23634,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -24823,17 +23673,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -24955,27 +23798,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   echo "$as_me: failed program was:" >&5
-@@ -24984,14 +23811,15 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_dlopen=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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
- 
--    cat >>confdefs.h <<\_ACEOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBDL 1
- _ACEOF
- 
-@@ -25040,27 +23868,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -25069,7 +23881,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dl_dlopen=no
- fi
- 
--rm -f core 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
-@@ -25160,27 +23972,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
-@@ -25189,7 +23985,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	eval "$as_ac_var=no"
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25244,27 +24040,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -25300,17 +24079,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -25436,27 +24208,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
-@@ -25465,7 +24221,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	eval "$as_ac_var=no"
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -25522,21 +24278,21 @@ $ac_includes_default
- #include <fcntl.h>
- #include <sys/mman.h>
- 
--#if !STDC_HEADERS && !HAVE_STDLIB_H
-+#if !defined STDC_HEADERS && !defined HAVE_STDLIB_H
- char *malloc ();
- #endif
- 
- /* This mess was copied from the GNU getpagesize.h.  */
--#if !HAVE_GETPAGESIZE
-+#ifndef HAVE_GETPAGESIZE
- /* Assume that all systems that can run configure have sys/param.h.  */
--# if !HAVE_SYS_PARAM_H
-+# ifndef HAVE_SYS_PARAM_H
- #  define HAVE_SYS_PARAM_H 1
- # endif
- 
- # ifdef _SC_PAGESIZE
- #  define getpagesize() sysconf(_SC_PAGESIZE)
- # else /* no _SC_PAGESIZE */
--#  if HAVE_SYS_PARAM_H
-+#  ifdef HAVE_SYS_PARAM_H
- #   include <sys/param.h>
- #   ifdef EXEC_PAGESIZE
- #    define getpagesize() EXEC_PAGESIZE
-@@ -25701,27 +24457,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_working_alloca_h=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -25730,7 +24470,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_working_alloca_h=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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_working_alloca_h" >&5
-@@ -25761,7 +24501,7 @@ cat >>conftest.$ac_ext <<_ACEOF
- #  include <malloc.h>
- #  define alloca _alloca
- # else
--#  if HAVE_ALLOCA_H
-+#  ifdef HAVE_ALLOCA_H
- #   include <alloca.h>
- #  else
- #   ifdef _AIX
-@@ -25797,27 +24537,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_alloca_works=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -25826,7 +24550,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_alloca_works=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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_alloca_works" >&5
-@@ -25946,27 +24670,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   eval "$as_ac_var=yes"
- else
-   echo "$as_me: failed program was:" >&5
-@@ -25975,7 +24683,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	eval "$as_ac_var=no"
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
- ac_res=`eval echo '${'$as_ac_var'}'`
-@@ -26094,7 +24802,8 @@ if test "$GCC" = yes; then
-     ac_optflags="-O3 -funroll-loops -mcpu=750 -mno-fused-madd"
-     ;;
-   esac
--  cat >>confdefs.h <<\_ACEOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define VM_BUILD_STRING "Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__
- _ACEOF
- 
-@@ -26134,7 +24843,7 @@ 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_AWK="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -26198,6 +24907,7 @@ fi
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_module_prefix" >&5
- echo "${ECHO_T}$ac_cv_module_prefix" >&6; }
-+
- cat >>confdefs.h <<_ACEOF
- #define VM_MODULE_PREFIX "$mkfrags_lib_prefix"
- _ACEOF
-@@ -26234,7 +24944,8 @@ cat >>conftest.$ac_ext <<_ACEOF
- int
- main ()
- {
--#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
-+#if  ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \
-+	&& BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN)
-  bogus endian macros
- #endif
- 
-@@ -26255,27 +24966,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   # It does; now see whether it defined to BIG_ENDIAN or not.
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -26310,27 +25004,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_c_bigendian=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -26381,27 +25058,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
-   ac_cv_c_bigendian=yes
- fi
-@@ -26562,7 +25222,8 @@ fi
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_double_align" >&5
- echo "${ECHO_T}$ac_cv_double_align" >&6; }
--test "$ac_cv_double_align" = "no" && cat >>confdefs.h <<\_ACEOF
-+test "$ac_cv_double_align" = "no" &&
-+cat >>confdefs.h <<\_ACEOF
- #define DOUBLE_WORD_ALIGNMENT 1
- _ACEOF
- 
-@@ -26623,14 +25284,16 @@ fi
- fi
- { echo "$as_me:$LINENO: result: $ac_cv_double_order" >&5
- echo "${ECHO_T}$ac_cv_double_order" >&6; }
--test "$ac_cv_double_order" = "no" && cat >>confdefs.h <<\_ACEOF
-+test "$ac_cv_double_order" = "no" &&
-+cat >>confdefs.h <<\_ACEOF
- #define DOUBLE_WORD_ORDER 1
- _ACEOF
- 
- 
- case $host_os in
-   darwin*)
--    cat >>confdefs.h <<\_ACEOF
-+
-+cat >>confdefs.h <<\_ACEOF
- #define DARWIN 1
- _ACEOF
- 
-@@ -26679,10 +25342,12 @@ else
- fi
- 
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define SQ_LIBDIR "${SQ_LIBDIR}"
- _ACEOF
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define VM_LIBDIR "${plgdir}"
- _ACEOF
-@@ -26722,6 +25387,756 @@ ext_modules="`cd ${topdir}/platforms/unix; echo vm-*`"
- 
- disabled_plugins=""
- rm -f plugins.exc
-+plugin="vm"
-+plibs=""
-+rm -f vm.sub vm.lib
-+
-+
-+
-+
-+# Check whether --enable-iconv was given.
-+if test "${enable_iconv+set}" = set; then
-+  enableval=$enable_iconv; with_iconv="$withval"
-+else
-+  with_iconv="yes"
-+fi
-+
-+
-+
-+case $host_os in
-+  darwin*) LIBS="$LIBS -framework CoreFoundation -framework CoreServices";;
-+  *)       ;;
-+esac
-+
-+if test "$with_iconv" = "yes"; then
-+
-+for ac_header in iconv.h
-+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
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+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; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+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_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ 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
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+  { echo "$as_me:$LINENO: checking for _dyld_present" >&5
-+echo $ECHO_N "checking for _dyld_present... $ECHO_C" >&6; }
-+if test "${ac_cv_func__dyld_present+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define _dyld_present to an innocuous variant, in case <limits.h> declares _dyld_present.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define _dyld_present innocuous__dyld_present
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char _dyld_present (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef _dyld_present
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char _dyld_present ();
-+/* 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__dyld_present || defined __stub____dyld_present
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return _dyld_present ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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__dyld_present=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func__dyld_present=no
-+fi
-+
-+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__dyld_present" >&5
-+echo "${ECHO_T}$ac_cv_func__dyld_present" >&6; }
-+if test $ac_cv_func__dyld_present = yes; then
-+  :
-+else
-+
-+    { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
-+echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char iconv_open ();
-+int
-+main ()
-+{
-+return iconv_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_iconv_iconv_open=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_iconv_iconv_open=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6; }
-+if test $ac_cv_lib_iconv_iconv_open = yes; then
-+  ac_cv_iconv=yes
-+else
-+
-+      { echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
-+echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char libiconv_open ();
-+int
-+main ()
-+{
-+return libiconv_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_iconv_libiconv_open=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_iconv_libiconv_open=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }
-+if test $ac_cv_lib_iconv_libiconv_open = yes; then
-+  ac_cv_iconv=yes
-+else
-+  ac_cv_iconv=no
-+fi
-+
-+
-+fi
-+
-+    if test $ac_cv_iconv = yes; then
-+      LIBS="$LIBS -liconv"
-+    fi
-+
-+fi
-+
-+
-+
-+  { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-+echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
-+if test "${ac_cv_langinfo_codeset+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <langinfo.h>
-+int
-+main ()
-+{
-+char *cs= nl_langinfo(CODESET);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_langinfo_codeset=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_langinfo_codeset=no
-+fi
-+
-+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_langinfo_codeset" >&5
-+echo "${ECHO_T}$ac_cv_langinfo_codeset" >&6; }
-+  if test $ac_cv_langinfo_codeset = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LANGINFO_CODESET 1
-+_ACEOF
-+
-+  fi
-+
-+
-+else
-+  { echo "$as_me:$LINENO: result: ******** disabling iconv" >&5
-+echo "${ECHO_T}******** disabling iconv" >&6; }
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for nanosleep" >&5
-+echo $ECHO_N "checking for nanosleep... $ECHO_C" >&6; }
-+if test "${ac_cv_func_nanosleep+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define nanosleep to an innocuous variant, in case <limits.h> declares nanosleep.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define nanosleep innocuous_nanosleep
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char nanosleep (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef nanosleep
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char nanosleep ();
-+/* 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_nanosleep || defined __stub___nanosleep
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return nanosleep ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_nanosleep=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_nanosleep=no
-+fi
-+
-+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_nanosleep" >&5
-+echo "${ECHO_T}$ac_cv_func_nanosleep" >&6; }
-+if test $ac_cv_func_nanosleep = yes; then
-+
-+  cat >>confdefs.h <<\_ACEOF
-+#define HAVE_NANOSLEEP 1
-+_ACEOF
-+
-+
-+
-+fi
-+
-+if test "${plibs}"; then
-+  llibs="${LIBS}"
-+  for l in ${plibs}; do
-+  llibs="${llibs} -l${l}"
-+  done
-+  echo ${llibs} > ${plugin}.lib
-+fi
-+plugin="vm-display-custom"
-+plibs=""
-+rm -f vm-display-custom.sub vm-display-custom.lib
-+# -*- sh -*-
-+
-+{ echo "$as_me:$LINENO: checking for custom display support" >&5
-+echo $ECHO_N "checking for custom display support... $ECHO_C" >&6; }
-+
-+
-+# Check whether --with-custom-display was given.
-+if test "${with_custom_display+set}" = set; then
-+  withval=$with_custom_display; have_dpy_custom="$withval"
-+else
-+  have_dpy_custom="no"
-+fi
-+
-+
-+if test "$have_dpy_custom" = "yes"; then
-+  # check for libraries, headers, etc., here...
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+if test "${plibs}"; then
-+  llibs="${LIBS}"
-+  for l in ${plibs}; do
-+  llibs="${llibs} -l${l}"
-+  done
-+  echo ${llibs} > ${plugin}.lib
-+fi
-+plugin="vm-display-fbdev"
-+plibs=""
-+rm -f vm-display-fbdev.sub vm-display-fbdev.lib
-+# -*- sh -*-
-+
-+
-+for ac_header in linux/fb.h
-+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
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+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; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+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_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ 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
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+
-+done
-+
-+if test "${plibs}"; then
-+  llibs="${LIBS}"
-+  for l in ${plibs}; do
-+  llibs="${llibs} -l${l}"
-+  done
-+  echo ${llibs} > ${plugin}.lib
-+fi
- plugin="vm-display-Quartz"
- plibs=""
- rm -f vm-display-Quartz.sub vm-display-Quartz.lib
-@@ -26786,27 +26201,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -26842,17 +26240,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -26985,81 +26376,9 @@ echo "$as_me: error: Cannot use X directory names containing '" >&2;}
- else
-   # One or both of the vars are not set, and there is no cached value.
- ac_x_includes=no ac_x_libraries=no
--rm -f -r conftest.dir
--if mkdir conftest.dir; then
--  cd conftest.dir
--  cat >Imakefile <<'_ACEOF'
--incroot:
--	@echo incroot='${INCROOT}'
--usrlibdir:
--	@echo usrlibdir='${USRLIBDIR}'
--libdir:
--	@echo libdir='${LIBDIR}'
--_ACEOF
--  if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then
--    # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
--    for ac_var in incroot usrlibdir libdir; do
--      eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`"
--    done
--    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
--    for ac_extension in a so sl; do
--      if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" &&
--	 test -f "$ac_im_libdir/libX11.$ac_extension"; then
--	ac_im_usrlibdir=$ac_im_libdir; break
--      fi
--    done
--    # Screen out bogus values from the imake configuration.  They are
--    # bogus both because they are the default anyway, and because
--    # using them would break gcc on systems where it needs fixed includes.
--    case $ac_im_incroot in
--	/usr/include) ac_x_includes= ;;
--	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
--    esac
--    case $ac_im_usrlibdir in
--	/usr/lib | /lib) ;;
--	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
--    esac
--  fi
--  cd ..
--  rm -f -r conftest.dir
--fi
--
- # Standard set of common directories for X headers.
- # Check X11 before X11Rn because it is often a symlink to the current release.
--ac_x_header_dirs='
--/usr/X11/include
--/usr/X11R6/include
--/usr/X11R5/include
--/usr/X11R4/include
--
--/usr/include/X11
--/usr/include/X11R6
--/usr/include/X11R5
--/usr/include/X11R4
--
--/usr/local/X11/include
--/usr/local/X11R6/include
--/usr/local/X11R5/include
--/usr/local/X11R4/include
--
--/usr/local/include/X11
--/usr/local/include/X11R6
--/usr/local/include/X11R5
--/usr/local/include/X11R4
--
--/usr/X386/include
--/usr/x386/include
--/usr/XFree86/include/X11
--
--/usr/include
--/usr/local/include
--/usr/unsupported/include
--/usr/athena/include
--/usr/local/x11r5/include
--/usr/lpp/Xamples/include
--
--/usr/openwin/include
--/usr/openwin/share/include'
-+ac_x_header_dirs=''
- 
- if test "$ac_x_includes" = no; then
-   # Guess where to find include files, by looking for Xlib.h.
-@@ -27084,17 +26403,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (exit $ac_status); } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then
-   # We can compile using X headers with no special include directory.
- ac_x_includes=
- else
-@@ -27117,7 +26429,7 @@ if test "$ac_x_libraries" = no; then
-   # See if we find them without any special options.
-   # Don't add to $LIBS permanently.
-   ac_save_LIBS=$LIBS
--  LIBS="-lXt $LIBS"
-+  LIBS="-lX11 $LIBS"
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -27146,27 +26458,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   LIBS=$ac_save_LIBS
- # We can link X programs with no special library path.
- ac_x_libraries=
-@@ -27179,7 +26475,7 @@ for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`
- do
-   # Don't even attempt the hair of trying to link an X program!
-   for ac_extension in a so sl; do
--    if test -r "$ac_dir/libXt.$ac_extension"; then
-+    if test -r "$ac_dir/libX11.$ac_extension"; then
-       ac_x_libraries=$ac_dir
-       break 2
-     fi
-@@ -27187,7 +26483,7 @@ do
- done
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi # $ac_x_libraries = no
- 
-@@ -27242,12 +26538,12 @@ else
-     X_LIBS="$X_LIBS -L$x_libraries"
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
--    case `(uname -sr) 2>/dev/null` in
--    "SunOS 5"*)
--      { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
- echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
--      ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
--      cat >conftest.$ac_ext <<_ACEOF
-+    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-+    ac_xsave_c_werror_flag=$ac_c_werror_flag
-+    ac_c_werror_flag=yes
-+    cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27275,44 +26571,20 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
--  ac_R_nospace=yes
-+  (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 "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+       X_LIBS="$X_LIBS -R$x_libraries"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_R_nospace=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--      if test $ac_R_nospace = yes; then
--	{ echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--	X_LIBS="$X_LIBS -R$x_libraries"
--      else
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
--	cat >conftest.$ac_ext <<_ACEOF
-+       cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
-@@ -27340,48 +26612,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
--  ac_R_space=yes
-+  (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 "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	  X_LIBS="$X_LIBS -R $x_libraries"
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--	ac_R_space=no
-+	{ echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6; }
- fi
- 
--rm -f core 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 $ac_R_space = yes; then
--	  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--	  X_LIBS="$X_LIBS -R $x_libraries"
--	else
--	  { echo "$as_me:$LINENO: result: neither works" >&5
--echo "${ECHO_T}neither works" >&6; }
--	fi
--      fi
--      LIBS=$ac_xsave_LIBS
--    esac
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    ac_c_werror_flag=$ac_xsave_c_werror_flag
-+    LIBS=$ac_xsave_LIBS
-   fi
- 
-   # Check for system-dependent libraries X programs must link with.
-@@ -27430,27 +26684,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -27498,27 +26736,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_dnet_dnet_ntoa=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -27527,7 +26749,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dnet_dnet_ntoa=no
- fi
- 
--rm -f core 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
-@@ -27580,27 +26802,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_dnet_stub_dnet_ntoa=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -27609,7 +26815,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_dnet_stub_dnet_ntoa=no
- fi
- 
--rm -f core 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
-@@ -27622,7 +26828,7 @@ fi
-     fi
- fi
- 
--rm -f core 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_xsave_LIBS"
- 
-@@ -27697,27 +26903,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_gethostbyname=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -27726,7 +26916,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_gethostbyname=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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_gethostbyname" >&5
-@@ -27775,27 +26965,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_nsl_gethostbyname=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -27804,7 +26978,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_nsl_gethostbyname=no
- fi
- 
--rm -f core 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
-@@ -27857,27 +27031,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_bsd_gethostbyname=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -27886,7 +27044,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_bsd_gethostbyname=no
- fi
- 
--rm -f core 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
-@@ -27969,27 +27127,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -27998,7 +27140,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_connect=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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_connect" >&5
-@@ -28047,27 +27189,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_socket_connect=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -28076,7 +27202,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_socket_connect=no
- fi
- 
--rm -f core 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
-@@ -28152,27 +27278,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_remove=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -28181,7 +27291,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_remove=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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_remove" >&5
-@@ -28230,27 +27340,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_posix_remove=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -28259,7 +27353,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_posix_remove=no
- fi
- 
--rm -f core 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
-@@ -28335,27 +27429,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_shmat=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -28364,7 +27442,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_shmat=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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_shmat" >&5
-@@ -28413,27 +27491,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_ipc_shmat=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -28442,7 +27504,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_ipc_shmat=no
- fi
- 
--rm -f core 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
-@@ -28506,27 +27568,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_ICE_IceConnectionNumber=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -28535,7 +27581,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_ICE_IceConnectionNumber=no
- fi
- 
--rm -f core 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
-@@ -28600,27 +27646,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_X11_XOpenDisplay=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -28629,7 +27659,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_X11_XOpenDisplay=no
- fi
- 
--rm -f core 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
-@@ -28689,27 +27719,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_Xext_XShmAttach=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -28718,7 +27732,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_Xext_XShmAttach=no
- fi
- 
--rm -f core 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
-@@ -28774,27 +27788,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -28830,17 +27827,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -28934,27 +27924,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -28990,17 +27963,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -29103,27 +28069,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_GL_glIsEnabled=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -29132,7 +28082,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_GL_glIsEnabled=no
- fi
- 
--rm -f core 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
-@@ -29197,27 +28147,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -29253,17 +28186,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -29361,27 +28287,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_Xrender_XRenderQueryVersion=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -29390,7 +28300,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_Xrender_XRenderQueryVersion=no
- fi
- 
--rm -f core 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
-@@ -29449,73 +28359,27 @@ if test "${plibs}"; then
-   done
-   echo ${llibs} > ${plugin}.lib
- fi
--plugin="vm-display-custom"
--plibs=""
--rm -f vm-display-custom.sub vm-display-custom.lib
--# -*- sh -*-
--
--{ echo "$as_me:$LINENO: checking for custom display support" >&5
--echo $ECHO_N "checking for custom display support... $ECHO_C" >&6; }
--
--
--# Check whether --with-custom-display was given.
--if test "${with_custom_display+set}" = set; then
--  withval=$with_custom_display; have_dpy_custom="$withval"
--else
--  have_dpy_custom="no"
--fi
--
--
--if test "$have_dpy_custom" = "yes"; then
--  # check for libraries, headers, etc., here...
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--
--
--  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
--echo "${ECHO_T}******** disabling ${plugin}" >&6; }
--  disabled_plugins="${disabled_plugins} ${plugin}"
--fi
--if test "${plibs}"; then
--  llibs="${LIBS}"
--  for l in ${plibs}; do
--  llibs="${llibs} -l${l}"
--  done
--  echo ${llibs} > ${plugin}.lib
--fi
--plugin="vm-display-fbdev"
-+plugin="vm-sound-ALSA"
- plibs=""
--rm -f vm-display-fbdev.sub vm-display-fbdev.lib
-+rm -f vm-sound-ALSA.sub vm-sound-ALSA.lib
- # -*- sh -*-
- 
--
--for ac_header in linux/fb.h
--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
--  # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+{ echo "$as_me:$LINENO: checking for Advanced Linux Sound Architecture" >&5
-+echo $ECHO_N "checking for Advanced Linux Sound Architecture... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
-+#include <alsa/asoundlib.h>
-+int
-+main ()
-+{
-+(void)snd_pcm_open;
-+  ;
-+  return 0;
-+}
- _ACEOF
- rm -f conftest.$ac_objext
- if { (ac_try="$ac_compile"
-@@ -29530,137 +28394,30 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
- 
--	ac_header_compiler=no
--fi
--
--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; }
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
- 
--# Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <$ac_header>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--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_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  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
--  ac_header_preproc=yes
- else
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--  ac_header_preproc=no
--fi
- 
--rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--
--    ;;
--esac
--{ 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
--else
--  eval "$as_ac_Header=\$ac_header_preproc"
--fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
- 
- 
-   { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
- echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-   disabled_plugins="${disabled_plugins} ${plugin}"
--fi
- 
--done
-+fi
- 
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test "${plibs}"; then
-   llibs="${LIBS}"
-   for l in ${plibs}; do
-@@ -29668,71 +28425,28 @@ if test "${plibs}"; then
-   done
-   echo ${llibs} > ${plugin}.lib
- fi
--plugin="vm-sound-ALSA"
-+plugin="vm-sound-custom"
- plibs=""
--rm -f vm-sound-ALSA.sub vm-sound-ALSA.lib
-+rm -f vm-sound-custom.sub vm-sound-custom.lib
- # -*- sh -*-
- 
--{ echo "$as_me:$LINENO: checking for Advanced Linux Sound Architecture" >&5
--echo $ECHO_N "checking for Advanced Linux Sound Architecture... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <alsa/asoundlib.h>
--int
--main ()
--{
--(void)snd_pcm_open;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--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_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  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
-+{ echo "$as_me:$LINENO: checking for custom sound support" >&5
-+echo $ECHO_N "checking for custom sound support... $ECHO_C" >&6; }
- 
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
- 
-+# Check whether --with-custom-sound was given.
-+if test "${with_custom_sound+set}" = set; then
-+  withval=$with_custom_sound; have_snd_custom="$withval"
- else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  have_snd_custom="no"
-+fi
- 
- 
-+if test "$have_snd_custom" = "yes"; then
-+  # check for libraries, headers, etc., here...
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-   { echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6; }
- 
-@@ -29740,10 +28454,7 @@ echo "${ECHO_T}no" >&6; }
-   { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
- echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-   disabled_plugins="${disabled_plugins} ${plugin}"
--
- fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- if test "${plibs}"; then
-   llibs="${LIBS}"
-   for l in ${plibs}; do
-@@ -29786,27 +28497,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
- 
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -29870,27 +28564,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
- 
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -29953,27 +28630,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
- 
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -30036,27 +28696,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
- 
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -30098,27 +28741,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
- 
-     { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -30154,702 +28780,6 @@ if test "${plibs}"; then
-   done
-   echo ${llibs} > ${plugin}.lib
- fi
--plugin="vm-sound-custom"
--plibs=""
--rm -f vm-sound-custom.sub vm-sound-custom.lib
--# -*- sh -*-
--
--{ echo "$as_me:$LINENO: checking for custom sound support" >&5
--echo $ECHO_N "checking for custom sound support... $ECHO_C" >&6; }
--
--
--# Check whether --with-custom-sound was given.
--if test "${with_custom_sound+set}" = set; then
--  withval=$with_custom_sound; have_snd_custom="$withval"
--else
--  have_snd_custom="no"
--fi
--
--
--if test "$have_snd_custom" = "yes"; then
--  # check for libraries, headers, etc., here...
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--else
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--
--
--  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
--echo "${ECHO_T}******** disabling ${plugin}" >&6; }
--  disabled_plugins="${disabled_plugins} ${plugin}"
--fi
--if test "${plibs}"; then
--  llibs="${LIBS}"
--  for l in ${plibs}; do
--  llibs="${llibs} -l${l}"
--  done
--  echo ${llibs} > ${plugin}.lib
--fi
--plugin="vm"
--plibs=""
--rm -f vm.sub vm.lib
--
--
--
--
--# Check whether --enable-iconv was given.
--if test "${enable_iconv+set}" = set; then
--  enableval=$enable_iconv; with_iconv="$withval"
--else
--  with_iconv="yes"
--fi
--
--
--
--case $host_os in
--  darwin*) LIBS="$LIBS -framework CoreFoundation -framework CoreServices";;
--  *)       ;;
--esac
--
--if test "$with_iconv" = "yes"; then
--
--for ac_header in iconv.h
--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
--  # Is the header compilable?
--{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--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_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  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_header_compiler=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_header_compiler=no
--fi
--
--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; }
--
--# Is the header present?
--{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <$ac_header>
--_ACEOF
--if { (ac_try="$ac_cpp conftest.$ac_ext"
--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_cpp conftest.$ac_ext") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  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
--  ac_header_preproc=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
--fi
--
--rm -f conftest.err conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--
--    ;;
--esac
--{ 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
--else
--  eval "$as_ac_Header=\$ac_header_preproc"
--fi
--ac_res=`eval echo '${'$as_ac_Header'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
--  cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
--
--
--  { echo "$as_me:$LINENO: checking for _dyld_present" >&5
--echo $ECHO_N "checking for _dyld_present... $ECHO_C" >&6; }
--if test "${ac_cv_func__dyld_present+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define _dyld_present to an innocuous variant, in case <limits.h> declares _dyld_present.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define _dyld_present innocuous__dyld_present
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char _dyld_present (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef _dyld_present
--
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char _dyld_present ();
--/* 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__dyld_present || defined __stub____dyld_present
--choke me
--#endif
--
--int
--main ()
--{
--return _dyld_present ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  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
--  ac_cv_func__dyld_present=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func__dyld_present=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func__dyld_present" >&5
--echo "${ECHO_T}$ac_cv_func__dyld_present" >&6; }
--if test $ac_cv_func__dyld_present = yes; then
--  :
--else
--
--    { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
--echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
--if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-liconv  $LIBS"
--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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char iconv_open ();
--int
--main ()
--{
--return iconv_open ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  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
--  ac_cv_lib_iconv_iconv_open=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_iconv_iconv_open=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
--echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6; }
--if test $ac_cv_lib_iconv_iconv_open = yes; then
--  ac_cv_iconv=yes
--else
--
--      { echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
--echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }
--if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-liconv  $LIBS"
--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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char libiconv_open ();
--int
--main ()
--{
--return libiconv_open ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  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
--  ac_cv_lib_iconv_libiconv_open=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_iconv_libiconv_open=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
--echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }
--if test $ac_cv_lib_iconv_libiconv_open = yes; then
--  ac_cv_iconv=yes
--else
--  ac_cv_iconv=no
--fi
--
--
--fi
--
--    if test $ac_cv_iconv = yes; then
--      LIBS="$LIBS -liconv"
--    fi
--
--fi
--
--
--
--  { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
--echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
--if test "${ac_cv_langinfo_codeset+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <langinfo.h>
--int
--main ()
--{
--char *cs= nl_langinfo(CODESET);
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  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
--  ac_cv_langinfo_codeset=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_langinfo_codeset=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_langinfo_codeset" >&5
--echo "${ECHO_T}$ac_cv_langinfo_codeset" >&6; }
--  if test $ac_cv_langinfo_codeset = yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define HAVE_LANGINFO_CODESET 1
--_ACEOF
--
--  fi
--
--
--else
--  { echo "$as_me:$LINENO: result: ******** disabling iconv" >&5
--echo "${ECHO_T}******** disabling iconv" >&6; }
--fi
--
--{ echo "$as_me:$LINENO: checking for nanosleep" >&5
--echo $ECHO_N "checking for nanosleep... $ECHO_C" >&6; }
--if test "${ac_cv_func_nanosleep+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--/* Define nanosleep to an innocuous variant, in case <limits.h> declares nanosleep.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define nanosleep innocuous_nanosleep
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char nanosleep (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef nanosleep
--
--/* 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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char nanosleep ();
--/* 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_nanosleep || defined __stub___nanosleep
--choke me
--#endif
--
--int
--main ()
--{
--return nanosleep ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  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
--  ac_cv_func_nanosleep=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_nanosleep=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_func_nanosleep" >&5
--echo "${ECHO_T}$ac_cv_func_nanosleep" >&6; }
--if test $ac_cv_func_nanosleep = yes; then
--
--  cat >>confdefs.h <<\_ACEOF
--#define HAVE_NANOSLEEP 1
--_ACEOF
--
--
--
--fi
--
--if test "${plibs}"; then
--  llibs="${LIBS}"
--  for l in ${plibs}; do
--  llibs="${llibs} -l${l}"
--  done
--  echo ${llibs} > ${plugin}.lib
--fi
- plugin="B3DAcceleratorPlugin"
- plibs=""
- rm -f B3DAcceleratorPlugin.sub B3DAcceleratorPlugin.lib
-@@ -30927,27 +28857,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
- 
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -31056,27 +28969,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -31112,17 +29008,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -31230,27 +29119,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_search_openpty=$ac_res
- else
-   echo "$as_me: failed program was:" >&5
-@@ -31259,7 +29132,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext
-   if test "${ac_cv_search_openpty+set}" = set; then
-   break
-@@ -31348,27 +29221,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_grantpt=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -31377,7 +29234,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_grantpt=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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_grantpt" >&5
-@@ -31463,27 +29320,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-@@ -31519,17 +29359,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (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
-@@ -31621,27 +29454,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_ffi_ffi_call=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -31650,7 +29467,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_ffi_ffi_call=no
- fi
- 
--rm -f core 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
-@@ -31693,173 +29510,6 @@ if test "${plibs}"; then
-   done
-   echo ${llibs} > ${plugin}.lib
- fi
--plugin="UUIDPlugin"
--plibs=""
--rm -f UUIDPlugin.sub UUIDPlugin.lib
--# -*- sh -*-
--
--{ echo "$as_me:$LINENO: checking for UUID support" >&5
--echo $ECHO_N "checking for UUID support... $ECHO_C" >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <uuid/uuid.h>
--int
--main ()
--{
--uuid_generate;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (ac_try="$ac_compile"
--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_compile") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  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
--
--  { echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6; }
--  { echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5
--echo $ECHO_N "checking for uuid_generate in -luuid... $ECHO_C" >&6; }
--if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-luuid  $LIBS"
--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.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--char uuid_generate ();
--int
--main ()
--{
--return uuid_generate ();
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (ac_try="$ac_link"
--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_link") 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  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
--  ac_cv_lib_uuid_uuid_generate=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_uuid_uuid_generate=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5
--echo "${ECHO_T}$ac_cv_lib_uuid_uuid_generate" >&6; }
--if test $ac_cv_lib_uuid_uuid_generate = yes; then
--  LIB_UUID="-luuid"
--
--fi
--
--
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
--  { echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6; }
--
--
--  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
--echo "${ECHO_T}******** disabling ${plugin}" >&6; }
--  disabled_plugins="${disabled_plugins} ${plugin}"
--
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--
--
--if test "${plibs}"; then
--  llibs="${LIBS}"
--  for l in ${plibs}; do
--  llibs="${llibs} -l${l}"
--  done
--  echo ${llibs} > ${plugin}.lib
--fi
- plugin="UnixOSProcessPlugin"
- plibs=""
- rm -f UnixOSProcessPlugin.sub UnixOSProcessPlugin.lib
-@@ -31926,27 +29576,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_unsetenv=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -31955,7 +29589,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_func_unsetenv=no
- fi
- 
--rm -f core conftest.err conftest.$ac_objext \
-+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_unsetenv" >&5
-@@ -32010,27 +29644,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_pthread_pthread_kill=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -32039,7 +29657,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_pthread_pthread_kill=no
- fi
- 
--rm -f core 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
-@@ -32060,25 +29678,24 @@ if test "${plibs}"; then
-   done
-   echo ${llibs} > ${plugin}.lib
- fi
--plugin="VideoForLinuxPlugin"
-+plugin="UUIDPlugin"
- plibs=""
--rm -f VideoForLinuxPlugin.sub VideoForLinuxPlugin.lib
--{ echo "$as_me:$LINENO: checking for VideoForLinux support" >&5
--echo $ECHO_N "checking for VideoForLinux support... $ECHO_C" >&6; }
-+rm -f UUIDPlugin.sub UUIDPlugin.lib
-+# -*- sh -*-
-+
-+{ echo "$as_me:$LINENO: checking for UUID support" >&5
-+echo $ECHO_N "checking for UUID support... $ECHO_C" >&6; }
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--
--  #include <stdlib.h>
--  #include <linux/videodev.h>
--
-+#include <uuid/uuid.h>
- int
- main ()
- {
--;
-+uuid_generate;
-   ;
-   return 0;
- }
-@@ -32096,27 +29713,145 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+  { echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5
-+echo $ECHO_N "checking for uuid_generate in -luuid... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-luuid  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char uuid_generate ();
-+int
-+main ()
-+{
-+return uuid_generate ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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
-+  (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
-+  (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_uuid_uuid_generate=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_uuid_uuid_generate=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5
-+echo "${ECHO_T}$ac_cv_lib_uuid_uuid_generate" >&6; }
-+if test $ac_cv_lib_uuid_uuid_generate = yes; then
-+  LIB_UUID="-luuid"
-+
-+fi
-+
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+if test "${plibs}"; then
-+  llibs="${LIBS}"
-+  for l in ${plibs}; do
-+  llibs="${llibs} -l${l}"
-+  done
-+  echo ${llibs} > ${plugin}.lib
-+fi
-+plugin="VideoForLinuxPlugin"
-+plibs=""
-+rm -f VideoForLinuxPlugin.sub VideoForLinuxPlugin.lib
-+{ echo "$as_me:$LINENO: checking for VideoForLinux support" >&5
-+echo $ECHO_N "checking for VideoForLinux support... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+  #include <stdlib.h>
-+  #include <linux/videodev.h>
-+
-+int
-+main ()
-+{
-+;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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
-+  (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-   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
- 
-   { echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6; }
-@@ -32191,27 +29926,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   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_X11_XOpenDisplay=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -32220,7 +29939,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
- 	ac_cv_lib_X11_XOpenDisplay=no
- fi
- 
--rm -f core 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
-@@ -32392,7 +30111,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
--# Be Bourne compatible
-+# 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=:
-@@ -32401,10 +30121,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   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
-+
-+
- 
- 
- # PATH needs CR
-@@ -32628,19 +30351,28 @@ else
-   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'"
-@@ -32656,7 +30388,7 @@ exec 6>&1
- # values after options handling.
- ac_log="
- This file was extended by $as_me, which was
--generated by GNU Autoconf 2.60.  Invocation command line was
-+generated by GNU Autoconf 2.61.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -32685,7 +30417,7 @@ current configuration.
- 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
-@@ -32709,7 +30441,7 @@ _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
- ac_cs_version="\\
- config.status
--configured by $0, generated by GNU Autoconf 2.60,
-+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.
-@@ -33075,15 +30807,14 @@ uninstall_nps!$uninstall_nps$ac_delim
- SQ_LIBDIR!$SQ_LIBDIR$ac_delim
- int_modules!$int_modules$ac_delim
- ext_modules!$ext_modules$ac_delim
--XMKMF!$XMKMF$ac_delim
-+HAVE_LANGINFO_CODESET!$HAVE_LANGINFO_CODESET$ac_delim
-+HAVE_NANOSLEEP!$HAVE_NANOSLEEP$ac_delim
- X_CFLAGS!$X_CFLAGS$ac_delim
- X_PRE_LIBS!$X_PRE_LIBS$ac_delim
- X_LIBS!$X_LIBS$ac_delim
- X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim
- X_CPPFLAGS!$X_CPPFLAGS$ac_delim
- X_INCLUDES!$X_INCLUDES$ac_delim
--HAVE_LANGINFO_CODESET!$HAVE_LANGINFO_CODESET$ac_delim
--HAVE_NANOSLEEP!$HAVE_NANOSLEEP$ac_delim
- LIBM_CFLAGS!$LIBM_CFLAGS$ac_delim
- FFI_DIR!$FFI_DIR$ac_delim
- FFI_C!$FFI_C$ac_delim
-@@ -33096,7 +30827,7 @@ LIBOBJS!$LIBOBJS$ac_delim
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
- 
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 49; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then
-     break
-   elif $ac_last_try; then
-     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -33534,3 +31265,4236 @@ if test "$no_create" != yes; then
-   $ac_cs_success || { (exit 1); exit 1; }
- fi
- 
-+
-+# -*- sh -*-
-+
-+{ echo "$as_me:$LINENO: checking for custom display support" >&5
-+echo $ECHO_N "checking for custom display support... $ECHO_C" >&6; }
-+
-+
-+# Check whether --with-custom-display was given.
-+if test "${with_custom_display+set}" = set; then
-+  withval=$with_custom_display; have_dpy_custom="$withval"
-+else
-+  have_dpy_custom="no"
-+fi
-+
-+
-+if test "$have_dpy_custom" = "yes"; then
-+  # check for libraries, headers, etc., here...
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+
-+# -*- sh -*-
-+
-+{ echo "$as_me:$LINENO: checking for custom sound support" >&5
-+echo $ECHO_N "checking for custom sound support... $ECHO_C" >&6; }
-+
-+
-+# Check whether --with-custom-sound was given.
-+if test "${with_custom_sound+set}" = set; then
-+  withval=$with_custom_sound; have_snd_custom="$withval"
-+else
-+  have_snd_custom="no"
-+fi
-+
-+
-+if test "$have_snd_custom" = "yes"; then
-+  # check for libraries, headers, etc., here...
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+else
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+
-+# -*- sh -*-
-+
-+{ echo "$as_me:$LINENO: checking for Mac OS X CoreAudio" >&5
-+echo $ECHO_N "checking for Mac OS X CoreAudio... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <CoreAudio/CoreAudio.h>
-+int
-+main ()
-+{
-+kAudioHardwareNoError;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+libm_cflags="-O"
-+
-+if test "$GCC" = yes; then
-+  case $host_cpu in
-+  i?86)
-+    libm_cflags="-O -fomit-frame-pointer"
-+    ;;
-+  powerpc|ppc)
-+    libm_cflags="-O3 -funroll-loops -mcpu=750 -mno-fused-madd"
-+    ;;
-+  esac
-+fi
-+
-+LIBM_CFLAGS=$libm_cflags
-+
-+
-+{ echo "$as_me:$LINENO: checking for VideoForLinux support" >&5
-+echo $ECHO_N "checking for VideoForLinux support... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+  #include <stdlib.h>
-+  #include <linux/videodev.h>
-+
-+int
-+main ()
-+{
-+;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+{ echo "$as_me:$LINENO: checking for MIDI support via ALSA" >&5
-+echo $ECHO_N "checking for MIDI support via ALSA... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+  #include <alsa/asoundlib.h>
-+
-+int
-+main ()
-+{
-+;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_MIDI_ALSA 1
-+_ACEOF
-+
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+if test "${have_gl}" != "yes"; then
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for FFI support" >&5
-+echo $ECHO_N "checking for FFI support... $ECHO_C" >&6; }
-+
-+FFI_DIR=${topdir}/platforms/unix/plugins/SqueakFFIPrims
-+
-+
-+# Check whether --with-ffi was given.
-+if test "${with_ffi+set}" = set; then
-+  withval=$with_ffi; with_ffi="$withval"
-+else
-+  with_ffi="auto"
-+fi
-+
-+
-+if test "${with_ffi}" != "auto"; then
-+  ffi_cpu_abi="${with_ffi}"
-+else
-+  ffi_cpu_abi=`${FFI_DIR}/ffi-config ${cfgdir} ${FFI_DIR} -cpu-abi`
-+fi
-+
-+if test "${ffi_cpu_abi}" != "any-libffi"; then
-+    { echo "$as_me:$LINENO: result: ${ffi_cpu_abi}" >&5
-+echo "${ECHO_T}${ffi_cpu_abi}" >&6; }
-+else
-+    { echo "$as_me:$LINENO: result: requires libffi" >&5
-+echo "${ECHO_T}requires libffi" >&6; }
-+    ffi_cpu_abi=any-libffi
-+    if test "${ac_cv_header_ffi_h+set}" = set; then
-+  { echo "$as_me:$LINENO: checking for ffi.h" >&5
-+echo $ECHO_N "checking for ffi.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_ffi_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ffi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ffi_h" >&6; }
-+else
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking ffi.h usability" >&5
-+echo $ECHO_N "checking ffi.h usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <ffi.h>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+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; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking ffi.h presence" >&5
-+echo $ECHO_N "checking ffi.h presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <ffi.h>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+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_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: ffi.h: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: ffi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ffi.h: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: ffi.h: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: ffi.h: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: ffi.h: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ffi.h:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: ffi.h:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ffi.h: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: ffi.h: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ffi.h:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: ffi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ffi.h: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: ffi.h: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: ffi.h: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: ffi.h: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ echo "$as_me:$LINENO: checking for ffi.h" >&5
-+echo $ECHO_N "checking for ffi.h... $ECHO_C" >&6; }
-+if test "${ac_cv_header_ffi_h+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_cv_header_ffi_h=$ac_header_preproc
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_header_ffi_h" >&5
-+echo "${ECHO_T}$ac_cv_header_ffi_h" >&6; }
-+
-+fi
-+if test $ac_cv_header_ffi_h = yes; then
-+  { echo "$as_me:$LINENO: checking for ffi_call in -lffi" >&5
-+echo $ECHO_N "checking for ffi_call in -lffi... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ffi_ffi_call+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lffi  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char ffi_call ();
-+int
-+main ()
-+{
-+return ffi_call ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_ffi_ffi_call=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_ffi_ffi_call=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ffi_ffi_call" >&5
-+echo "${ECHO_T}$ac_cv_lib_ffi_ffi_call" >&6; }
-+if test $ac_cv_lib_ffi_ffi_call = yes; then
-+
-+  plibs="${plibs} ffi"
-+else
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+
-+else
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+
-+
-+fi
-+
-+FFI_C=${ffi_cpu_abi}
-+FFI_S=${ffi_cpu_abi}-asm
-+FFI_O="${FFI_C}\$o ${FFI_S}\$o"
-+
-+
-+
-+
-+
-+
-+# Add `--enable-mpg-[mmx,pthreads]' switches
-+
-+# Check whether --enable-mpg-mmx was given.
-+if test "${enable_mpg_mmx+set}" = set; then
-+  enableval=$enable_mpg_mmx; XDEFS="-DUSE_MMX"
-+else
-+  XDEFS=""
-+fi
-+
-+
-+# Check whether --enable-mpg-pthreads was given.
-+if test "${enable_mpg_pthreads+set}" = set; then
-+  enableval=$enable_mpg_pthreads;
-+else
-+  XDEFS="$XDEFS -DNOPTHREADS"
-+fi
-+
-+
-+# Define `[xdefs]' in Makefile.in
-+
-+
-+  echo 's%\['xdefs'\]%'$XDEFS'%g' >> ${plugin}.sub
-+
-+
-+
-+
-+
-+for ac_header in util.h libutil.h pty.h stropts.h
-+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
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+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; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+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_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ 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
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+{ echo "$as_me:$LINENO: checking for library containing openpty" >&5
-+echo $ECHO_N "checking for library containing openpty... $ECHO_C" >&6; }
-+if test "${ac_cv_search_openpty+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char openpty ();
-+int
-+main ()
-+{
-+return openpty ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' util; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_search_openpty=$ac_res
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext
-+  if test "${ac_cv_search_openpty+set}" = set; then
-+  break
-+fi
-+done
-+if test "${ac_cv_search_openpty+set}" = set; then
-+  :
-+else
-+  ac_cv_search_openpty=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_search_openpty" >&5
-+echo "${ECHO_T}$ac_cv_search_openpty" >&6; }
-+ac_res=$ac_cv_search_openpty
-+if test "$ac_res" != no; then
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_OPENPTY 1
-+_ACEOF
-+
-+else
-+
-+  if test -r /dev/ptmx; then
-+    { echo "$as_me:$LINENO: checking for grantpt" >&5
-+echo $ECHO_N "checking for grantpt... $ECHO_C" >&6; }
-+if test "${ac_cv_func_grantpt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define grantpt to an innocuous variant, in case <limits.h> declares grantpt.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define grantpt innocuous_grantpt
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char grantpt (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef grantpt
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char grantpt ();
-+/* 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_grantpt || defined __stub___grantpt
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return grantpt ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_grantpt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_grantpt=no
-+fi
-+
-+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_grantpt" >&5
-+echo "${ECHO_T}$ac_cv_func_grantpt" >&6; }
-+if test $ac_cv_func_grantpt = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_UNIX98_PTYS 1
-+_ACEOF
-+
-+fi
-+
-+  fi
-+fi
-+
-+
-+{ echo "$as_me:$LINENO: checking for unsetenv" >&5
-+echo $ECHO_N "checking for unsetenv... $ECHO_C" >&6; }
-+if test "${ac_cv_func_unsetenv+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define unsetenv to an innocuous variant, in case <limits.h> declares unsetenv.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define unsetenv innocuous_unsetenv
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char unsetenv (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef unsetenv
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char unsetenv ();
-+/* 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_unsetenv || defined __stub___unsetenv
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return unsetenv ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_unsetenv=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_unsetenv=no
-+fi
-+
-+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_unsetenv" >&5
-+echo "${ECHO_T}$ac_cv_func_unsetenv" >&6; }
-+if test $ac_cv_func_unsetenv = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_UNSETENV 1
-+_ACEOF
-+
-+fi
-+
-+
-+  { echo "$as_me:$LINENO: checking for pthread_kill in -lpthread" >&5
-+echo $ECHO_N "checking for pthread_kill in -lpthread... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_pthread_pthread_kill+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpthread  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pthread_kill ();
-+int
-+main ()
-+{
-+return pthread_kill ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_pthread_pthread_kill=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_pthread_pthread_kill=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_kill" >&5
-+echo "${ECHO_T}$ac_cv_lib_pthread_pthread_kill" >&6; }
-+if test $ac_cv_lib_pthread_pthread_kill = yes; then
-+  plibs="${plibs} pthread"
-+else
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin} due to missing libraries" >&5
-+echo "${ECHO_T}******** disabling ${plugin} due to missing libraries" >&6; }
-+    disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+
-+
-+# -*- sh -*-
-+
-+{ echo "$as_me:$LINENO: checking for UUID support" >&5
-+echo $ECHO_N "checking for UUID support... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <uuid/uuid.h>
-+int
-+main ()
-+{
-+uuid_generate;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+  { echo "$as_me:$LINENO: checking for uuid_generate in -luuid" >&5
-+echo $ECHO_N "checking for uuid_generate in -luuid... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_uuid_uuid_generate+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-luuid  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char uuid_generate ();
-+int
-+main ()
-+{
-+return uuid_generate ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_uuid_uuid_generate=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_uuid_uuid_generate=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_uuid_uuid_generate" >&5
-+echo "${ECHO_T}$ac_cv_lib_uuid_uuid_generate" >&6; }
-+if test $ac_cv_lib_uuid_uuid_generate = yes; then
-+  LIB_UUID="-luuid"
-+
-+fi
-+
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+
-+# Require X11
-+
-+{ echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
-+echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lX11  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XOpenDisplay ();
-+int
-+main ()
-+{
-+return XOpenDisplay ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_X11_XOpenDisplay=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_X11_XOpenDisplay=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-+echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6; }
-+if test $ac_cv_lib_X11_XOpenDisplay = yes; then
-+
-+  plibs="${plibs} X11"
-+else
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+
-+
-+# -*- sh -*-
-+
-+{ echo "$as_me:$LINENO: checking for SunOS/Solaris audio" >&5
-+echo $ECHO_N "checking for SunOS/Solaris audio... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sys/audioio.h>
-+int
-+main ()
-+{
-+AUDIO_SUNVTS;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SYS_AUDIOIO_H 1
-+_ACEOF
-+
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <sun/audioio.h>
-+int
-+main ()
-+{
-+AUDIO_SUNVTS;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+
-+    { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_SUN_AUDIOIO_H 1
-+_ACEOF
-+
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+    { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+# -*- sh -*-
-+
-+
-+# Check whether --with-quartz was given.
-+if test "${with_quartz+set}" = set; then
-+  withval=$with_quartz; have_quartz="$withval"
-+else
-+  have_quartz="yes"
-+fi
-+
-+
-+case $host_os in
-+  darwin*) ;;
-+  *)       have_quartz="no";;
-+esac
-+
-+if test "$have_quartz" = "yes"; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_QUARTZ 1
-+_ACEOF
-+
-+  if test "$have_gl" = ""; then have_gl="no"; fi
-+
-+for ac_header in OpenGL/gl.h
-+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
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+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; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+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_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ 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
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+    have_gl=yes
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_QUARTZ_CGL 1
-+_ACEOF
-+
-+
-+fi
-+
-+done
-+
-+else
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+
-+# -*- sh -*-
-+
-+
-+for ac_header in linux/fb.h
-+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
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+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; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+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_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ 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
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+
-+done
-+
-+
-+# -*- sh -*-
-+
-+{ echo "$as_me:$LINENO: checking for Advanced Linux Sound Architecture" >&5
-+echo $ECHO_N "checking for Advanced Linux Sound Architecture... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <alsa/asoundlib.h>
-+int
-+main ()
-+{
-+(void)snd_pcm_open;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+# -*- sh -*-
-+
-+{ echo "$as_me:$LINENO: checking for Network Audio System" >&5
-+echo $ECHO_N "checking for Network Audio System... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <audio/audio.h>
-+int
-+main ()
-+{
-+AuElementNotifyKindLowWater;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+# -*- sh -*-
-+
-+
-+# Check whether --with-x was given.
-+if test "${with_x+set}" = set; then
-+  withval=$with_x; have_x="$withval"
-+else
-+  have_x="yes"
-+fi
-+
-+
-+
-+# Check whether --with-gl was given.
-+if test "${with_gl+set}" = set; then
-+  withval=$with_gl; have_gl="$withval"
-+else
-+  have_gl="yes"
-+fi
-+
-+
-+###xxx FIXME (AGAIN): mandrake needs explicit -lpthread
-+
-+VMLIBS=${LIBS}
-+VMCFLAGS=${CFLAGS}
-+VMCPPFLAGS=${CPPFLAGS}
-+VMINCLUDES=${INCLUDES}
-+
-+if test "$have_x" = "yes"; then
-+  if test "$no_x" = yes; then
-+  # Not all programs may use this symbol, but it does not hurt to define it.
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define X_DISPLAY_MISSING 1
-+_ACEOF
-+
-+  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-+else
-+  if test -n "$x_includes"; then
-+    X_CFLAGS="$X_CFLAGS -I$x_includes"
-+  fi
-+
-+  # It would also be nice to do this for all -L options, not just this one.
-+  if test -n "$x_libraries"; then
-+    X_LIBS="$X_LIBS -L$x_libraries"
-+    # For Solaris; some versions of Sun CC require a space after -R and
-+    # others require no space.  Words are not sufficient . . . .
-+    { echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5
-+echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; }
-+    ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
-+    ac_xsave_c_werror_flag=$ac_c_werror_flag
-+    ac_c_werror_flag=yes
-+    cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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 "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+       X_LIBS="$X_LIBS -R$x_libraries"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	LIBS="$ac_xsave_LIBS -R $x_libraries"
-+       cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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 "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+	  X_LIBS="$X_LIBS -R $x_libraries"
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	{ echo "$as_me:$LINENO: result: neither works" >&5
-+echo "${ECHO_T}neither works" >&6; }
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    ac_c_werror_flag=$ac_xsave_c_werror_flag
-+    LIBS=$ac_xsave_LIBS
-+  fi
-+
-+  # Check for system-dependent libraries X programs must link with.
-+  # Do this before checking for the system-independent R6 libraries
-+  # (-lICE), since we may need -lsocket or whatever for X linking.
-+
-+  if test "$ISC" = yes; then
-+    X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
-+  else
-+    # Martyn Johnson says this is needed for Ultrix, if the X
-+    # libraries were built with DECnet support.  And Karl Berry says
-+    # the Alpha needs dnet_stub (dnet does not exist).
-+    ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
-+    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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XOpenDisplay ();
-+int
-+main ()
-+{
-+return XOpenDisplay ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+  :
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	{ echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldnet  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dnet_ntoa ();
-+int
-+main ()
-+{
-+return dnet_ntoa ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_dnet_dnet_ntoa=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_dnet_dnet_ntoa=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-+if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
-+fi
-+
-+    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-+      { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldnet_stub  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char dnet_ntoa ();
-+int
-+main ()
-+{
-+return dnet_ntoa ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_dnet_stub_dnet_ntoa=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_dnet_stub_dnet_ntoa=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
-+echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; }
-+if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
-+fi
-+
-+    fi
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+      conftest$ac_exeext conftest.$ac_ext
-+    LIBS="$ac_xsave_LIBS"
-+
-+    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-+    # to get the SysV transport functions.
-+    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-+    # needs -lnsl.
-+    # The nsl library prevents programs from opening the X display
-+    # on Irix 5.2, according to T.E. Dickey.
-+    # The functions gethostbyname, getservbyname, and inet_addr are
-+    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-+    { echo "$as_me:$LINENO: checking for gethostbyname" >&5
-+echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; }
-+if test "${ac_cv_func_gethostbyname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define gethostbyname to an innocuous variant, in case <limits.h> declares gethostbyname.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define gethostbyname innocuous_gethostbyname
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char gethostbyname (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef gethostbyname
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char gethostbyname ();
-+/* 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_gethostbyname || defined __stub___gethostbyname
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return gethostbyname ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_gethostbyname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_gethostbyname=no
-+fi
-+
-+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_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; }
-+
-+    if test $ac_cv_func_gethostbyname = no; then
-+      { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
-+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char gethostbyname ();
-+int
-+main ()
-+{
-+return gethostbyname ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_nsl_gethostbyname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_nsl_gethostbyname=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; }
-+if test $ac_cv_lib_nsl_gethostbyname = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
-+fi
-+
-+      if test $ac_cv_lib_nsl_gethostbyname = no; then
-+	{ echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5
-+echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lbsd  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char gethostbyname ();
-+int
-+main ()
-+{
-+return gethostbyname ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_bsd_gethostbyname=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_bsd_gethostbyname=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5
-+echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; }
-+if test $ac_cv_lib_bsd_gethostbyname = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
-+fi
-+
-+      fi
-+    fi
-+
-+    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-+    # socket/setsockopt and other routines are undefined under SCO ODT
-+    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-+    # on later versions), says Simon Leinen: it contains gethostby*
-+    # variants that don't use the name server (or something).  -lsocket
-+    # must be given before -lnsl if both are needed.  We assume that
-+    # if connect needs -lnsl, so does gethostbyname.
-+    { echo "$as_me:$LINENO: checking for connect" >&5
-+echo $ECHO_N "checking for connect... $ECHO_C" >&6; }
-+if test "${ac_cv_func_connect+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define connect to an innocuous variant, in case <limits.h> declares connect.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define connect innocuous_connect
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char connect (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef connect
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char connect ();
-+/* 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_connect || defined __stub___connect
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return connect ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_connect=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_connect=no
-+fi
-+
-+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_connect" >&5
-+echo "${ECHO_T}$ac_cv_func_connect" >&6; }
-+
-+    if test $ac_cv_func_connect = no; then
-+      { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5
-+echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_socket_connect+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char connect ();
-+int
-+main ()
-+{
-+return connect ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_socket_connect=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_socket_connect=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5
-+echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; }
-+if test $ac_cv_lib_socket_connect = yes; then
-+  X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
-+fi
-+
-+    fi
-+
-+    # Guillermo Gomez says -lposix is necessary on A/UX.
-+    { echo "$as_me:$LINENO: checking for remove" >&5
-+echo $ECHO_N "checking for remove... $ECHO_C" >&6; }
-+if test "${ac_cv_func_remove+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define remove to an innocuous variant, in case <limits.h> declares remove.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define remove innocuous_remove
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char remove (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef remove
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char remove ();
-+/* 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_remove || defined __stub___remove
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return remove ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_remove=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_remove=no
-+fi
-+
-+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_remove" >&5
-+echo "${ECHO_T}$ac_cv_func_remove" >&6; }
-+
-+    if test $ac_cv_func_remove = no; then
-+      { echo "$as_me:$LINENO: checking for remove in -lposix" >&5
-+echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_posix_remove+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lposix  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char remove ();
-+int
-+main ()
-+{
-+return remove ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_posix_remove=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_posix_remove=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5
-+echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; }
-+if test $ac_cv_lib_posix_remove = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
-+fi
-+
-+    fi
-+
-+    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-+    { echo "$as_me:$LINENO: checking for shmat" >&5
-+echo $ECHO_N "checking for shmat... $ECHO_C" >&6; }
-+if test "${ac_cv_func_shmat+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define shmat to an innocuous variant, in case <limits.h> declares shmat.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define shmat innocuous_shmat
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char shmat (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef shmat
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shmat ();
-+/* 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_shmat || defined __stub___shmat
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return shmat ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_shmat=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_shmat=no
-+fi
-+
-+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_shmat" >&5
-+echo "${ECHO_T}$ac_cv_func_shmat" >&6; }
-+
-+    if test $ac_cv_func_shmat = no; then
-+      { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5
-+echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ipc_shmat+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lipc  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char shmat ();
-+int
-+main ()
-+{
-+return shmat ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_ipc_shmat=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_ipc_shmat=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5
-+echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; }
-+if test $ac_cv_lib_ipc_shmat = yes; then
-+  X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
-+fi
-+
-+    fi
-+  fi
-+
-+  # Check for libraries that X11R6 Xt/Xaw programs need.
-+  ac_save_LDFLAGS=$LDFLAGS
-+  test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
-+  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-+  # check for ICE first), but we must link in the order -lSM -lICE or
-+  # we get undefined symbols.  So assume we have SM if we have ICE.
-+  # These have to be linked with before -lX11, unlike the other
-+  # libraries we check for below, so use a different variable.
-+  # John Interrante, Karl Berry
-+  { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5
-+echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char IceConnectionNumber ();
-+int
-+main ()
-+{
-+return IceConnectionNumber ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_ICE_IceConnectionNumber=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_ICE_IceConnectionNumber=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
-+echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; }
-+if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
-+  X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
-+fi
-+
-+  LDFLAGS=$ac_save_LDFLAGS
-+
-+fi
-+
-+  LIBS="${X_PRE_LIBS} ${X_LIBS} ${X_EXTRA_LIBS} ${LIBS}"
-+#  if test "${x_libraries}" != ""; then
-+#    CFLAGS="${X_CFLAGS} ${CFLAGS} -L${x_libraries}"
-+#  fi
-+  if test "${x_includes}" != ""; then
-+    CPPFLAGS="${CPPFLAGS} -I${x_includes}"
-+    INCLUDES="${INCLUDES} -I${x_includes}"
-+    X_INCLUDES="-I${x_includes}"
-+  fi
-+  { echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5
-+echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lX11  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XOpenDisplay ();
-+int
-+main ()
-+{
-+return XOpenDisplay ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_X11_XOpenDisplay=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_X11_XOpenDisplay=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5
-+echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6; }
-+if test $ac_cv_lib_X11_XOpenDisplay = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_X11 1
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define VM_X11DIR "${x_libraries}"
-+_ACEOF
-+
-+    LIBS="${LIBS} -lX11"
-+
-+{ echo "$as_me:$LINENO: checking for XShmAttach in -lXext" >&5
-+echo $ECHO_N "checking for XShmAttach in -lXext... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xext_XShmAttach+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXext  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XShmAttach ();
-+int
-+main ()
-+{
-+return XShmAttach ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_Xext_XShmAttach=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_Xext_XShmAttach=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShmAttach" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xext_XShmAttach" >&6; }
-+if test $ac_cv_lib_Xext_XShmAttach = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBXEXT 1
-+_ACEOF
-+
-+  LIBS="-lXext $LIBS"
-+
-+fi
-+
-+    if test "$have_gl" = "yes"; then
-+      have_gl=no
-+
-+for ac_header in GL/gl.h
-+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
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+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; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+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_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ 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
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+
-+for ac_header in GL/glx.h
-+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
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+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; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+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_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ 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
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+          have_gl=yes
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define USE_X11_GLX 1
-+_ACEOF
-+
-+
-+{ echo "$as_me:$LINENO: checking for glIsEnabled in -lGL" >&5
-+echo $ECHO_N "checking for glIsEnabled in -lGL... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_GL_glIsEnabled+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lGL  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char glIsEnabled ();
-+int
-+main ()
-+{
-+return glIsEnabled ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_GL_glIsEnabled=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_GL_glIsEnabled=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glIsEnabled" >&5
-+echo "${ECHO_T}$ac_cv_lib_GL_glIsEnabled" >&6; }
-+if test $ac_cv_lib_GL_glIsEnabled = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBGL 1
-+_ACEOF
-+
-+  LIBS="-lGL $LIBS"
-+
-+fi
-+
-+
-+fi
-+
-+done
-+
-+
-+fi
-+
-+done
-+
-+    fi
-+
-+for ac_header in X11/extensions/Xrender.h
-+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
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+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; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+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_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ 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
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+
-+{ echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5
-+echo $ECHO_N "checking for XRenderQueryVersion in -lXrender... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_Xrender_XRenderQueryVersion+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lXrender  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char XRenderQueryVersion ();
-+int
-+main ()
-+{
-+return XRenderQueryVersion ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_Xrender_XRenderQueryVersion=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_Xrender_XRenderQueryVersion=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5
-+echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; }
-+if test $ac_cv_lib_Xrender_XRenderQueryVersion = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBXRENDER 1
-+_ACEOF
-+
-+  LIBS="-lXrender $LIBS"
-+
-+fi
-+
-+
-+fi
-+
-+done
-+
-+
-+else
-+
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+
-+fi
-+
-+else
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+fi
-+
-+X_LIBS=${LIBS}
-+
-+X_CFLAGS=${CFLAGS}
-+
-+X_CPPFLAGS=${CPPFLAGS}
-+
-+X_INCLUDES=${INCLUDES}
-+
-+
-+LIBS=${VMLIBS}
-+CFLAGS=${VMCFLAGS}
-+CPPFLAGS=${VMCPPFLAGS}
-+INCLUDES=${VMINCLUDES}
-+
-+
-+
-+
-+
-+# Check whether --enable-iconv was given.
-+if test "${enable_iconv+set}" = set; then
-+  enableval=$enable_iconv; with_iconv="$withval"
-+else
-+  with_iconv="yes"
-+fi
-+
-+
-+
-+case $host_os in
-+  darwin*) LIBS="$LIBS -framework CoreFoundation -framework CoreServices";;
-+  *)       ;;
-+esac
-+
-+if test "$with_iconv" = "yes"; then
-+
-+for ac_header in iconv.h
-+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
-+  # Is the header compilable?
-+{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+#include <$ac_header>
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_header_compiler=no
-+fi
-+
-+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; }
-+
-+# Is the header present?
-+{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <$ac_header>
-+_ACEOF
-+if { (ac_try="$ac_cpp conftest.$ac_ext"
-+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_cpp conftest.$ac_ext") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+  ac_header_preproc=no
-+fi
-+
-+rm -f conftest.err conftest.$ac_ext
-+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-+echo "${ECHO_T}$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-+  yes:no: )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-+    ac_header_preproc=yes
-+    ;;
-+  no:yes:* )
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-+echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-+echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-+    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-+
-+    ;;
-+esac
-+{ 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
-+else
-+  eval "$as_ac_Header=\$ac_header_preproc"
-+fi
-+ac_res=`eval echo '${'$as_ac_Header'}'`
-+	       { echo "$as_me:$LINENO: result: $ac_res" >&5
-+echo "${ECHO_T}$ac_res" >&6; }
-+
-+fi
-+if test `eval echo '${'$as_ac_Header'}'` = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+  { echo "$as_me:$LINENO: checking for _dyld_present" >&5
-+echo $ECHO_N "checking for _dyld_present... $ECHO_C" >&6; }
-+if test "${ac_cv_func__dyld_present+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define _dyld_present to an innocuous variant, in case <limits.h> declares _dyld_present.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define _dyld_present innocuous__dyld_present
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char _dyld_present (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef _dyld_present
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char _dyld_present ();
-+/* 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__dyld_present || defined __stub____dyld_present
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return _dyld_present ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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__dyld_present=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func__dyld_present=no
-+fi
-+
-+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__dyld_present" >&5
-+echo "${ECHO_T}$ac_cv_func__dyld_present" >&6; }
-+if test $ac_cv_func__dyld_present = yes; then
-+  :
-+else
-+
-+    { echo "$as_me:$LINENO: checking for iconv_open in -liconv" >&5
-+echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char iconv_open ();
-+int
-+main ()
-+{
-+return iconv_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_iconv_iconv_open=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_iconv_iconv_open=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_iconv_iconv_open" >&6; }
-+if test $ac_cv_lib_iconv_iconv_open = yes; then
-+  ac_cv_iconv=yes
-+else
-+
-+      { echo "$as_me:$LINENO: checking for libiconv_open in -liconv" >&5
-+echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
-+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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char libiconv_open ();
-+int
-+main ()
-+{
-+return libiconv_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_iconv_libiconv_open=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_lib_iconv_libiconv_open=no
-+fi
-+
-+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
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv_open" >&5
-+echo "${ECHO_T}$ac_cv_lib_iconv_libiconv_open" >&6; }
-+if test $ac_cv_lib_iconv_libiconv_open = yes; then
-+  ac_cv_iconv=yes
-+else
-+  ac_cv_iconv=no
-+fi
-+
-+
-+fi
-+
-+    if test $ac_cv_iconv = yes; then
-+      LIBS="$LIBS -liconv"
-+    fi
-+
-+fi
-+
-+
-+
-+  { echo "$as_me:$LINENO: checking for nl_langinfo and CODESET" >&5
-+echo $ECHO_N "checking for nl_langinfo and CODESET... $ECHO_C" >&6; }
-+if test "${ac_cv_langinfo_codeset+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <langinfo.h>
-+int
-+main ()
-+{
-+char *cs= nl_langinfo(CODESET);
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_langinfo_codeset=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_langinfo_codeset=no
-+fi
-+
-+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_langinfo_codeset" >&5
-+echo "${ECHO_T}$ac_cv_langinfo_codeset" >&6; }
-+  if test $ac_cv_langinfo_codeset = yes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LANGINFO_CODESET 1
-+_ACEOF
-+
-+  fi
-+
-+
-+else
-+  { echo "$as_me:$LINENO: result: ******** disabling iconv" >&5
-+echo "${ECHO_T}******** disabling iconv" >&6; }
-+fi
-+
-+{ echo "$as_me:$LINENO: checking for nanosleep" >&5
-+echo $ECHO_N "checking for nanosleep... $ECHO_C" >&6; }
-+if test "${ac_cv_func_nanosleep+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+/* Define nanosleep to an innocuous variant, in case <limits.h> declares nanosleep.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define nanosleep innocuous_nanosleep
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char nanosleep (); below.
-+    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+    <limits.h> exists even on freestanding compilers.  */
-+
-+#ifdef __STDC__
-+# include <limits.h>
-+#else
-+# include <assert.h>
-+#endif
-+
-+#undef nanosleep
-+
-+/* 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.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char nanosleep ();
-+/* 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_nanosleep || defined __stub___nanosleep
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return nanosleep ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+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_link") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (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_nanosleep=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_func_nanosleep=no
-+fi
-+
-+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_nanosleep" >&5
-+echo "${ECHO_T}$ac_cv_func_nanosleep" >&6; }
-+if test $ac_cv_func_nanosleep = yes; then
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_NANOSLEEP 1
-+_ACEOF
-+
-+
-+
-+fi
-+
-+
-+# -*- sh -*-
-+
-+{ echo "$as_me:$LINENO: checking for Advanced Linux Sound Architecture" >&5
-+echo $ECHO_N "checking for Advanced Linux Sound Architecture... $ECHO_C" >&6; }
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+#include <alsa/asoundlib.h>
-+int
-+main ()
-+{
-+(void)snd_pcm_open;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+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_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+
-+  { echo "$as_me:$LINENO: result: yes" >&5
-+echo "${ECHO_T}yes" >&6; }
-+
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+  { echo "$as_me:$LINENO: result: no" >&5
-+echo "${ECHO_T}no" >&6; }
-+
-+
-+  { echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5
-+echo "${ECHO_T}******** disabling ${plugin}" >&6; }
-+  disabled_plugins="${disabled_plugins} ${plugin}"
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-diff --git a/platforms/unix/config/configure.ac b/platforms/unix/config/configure.ac
-index fc06f48..6c938a5 100644
---- a/platforms/unix/config/configure.ac
-+++ b/platforms/unix/config/configure.ac
-@@ -66,7 +66,7 @@ AC_SUBST(blddir)
- 
- SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE}
- 
--AC_DEFINE_UNQUOTED(SQ_VERSION, "${SQ_VERSION}")
-+AC_DEFINE_UNQUOTED(SQ_VERSION, "${SQ_VERSION}", "squeak version")
- 
- AC_SUBST(SQ_MAJOR)
- AC_SUBST(SQ_MINOR)
-@@ -75,7 +75,7 @@ AC_SUBST(SQ_VERSION)
- 
- VM_VERSION=${VM_MAJOR}.${VM_MINOR}-${VM_RELEASE}
- 
--AC_DEFINE_UNQUOTED(VM_VERSION, "${VM_VERSION}")
-+AC_DEFINE_UNQUOTED(VM_VERSION, "${VM_VERSION}", "vm version")
- 
- AC_SUBST(VM_MAJOR)
- AC_SUBST(VM_MINOR)
-@@ -91,7 +91,7 @@ plgdir=`eval echo ${imgdir}/${VM_VERSION}`
- AC_SUBST(imgdir)
- AC_SUBST(plgdir)
- 
--AC_DEFINE(OS_TYPE, "unix")
-+AC_DEFINE(OS_TYPE, "unix", "unix")
- 
- AC_CANONICAL_HOST
- 
-@@ -103,9 +103,9 @@ AC_SUBST(host_cpu)
- AC_SUBST(host_vendor)
- AC_SUBST(host_os)
- 
--AC_DEFINE_UNQUOTED(VM_HOST, "$host")
--AC_DEFINE_UNQUOTED(VM_HOST_OS, "$host_os")
--AC_DEFINE_UNQUOTED(VM_HOST_CPU, "$host_cpu")
-+AC_DEFINE_UNQUOTED(VM_HOST, "$host", "build host")
-+AC_DEFINE_UNQUOTED(VM_HOST_OS, "$host_os", "host os")
-+AC_DEFINE_UNQUOTED(VM_HOST_CPU, "$host_cpu", "host cpu")
- 
- echo
- echo "Configuring Squeak ${VM_VERSION} (${SQ_VERSION}) for ${host}"
-@@ -137,16 +137,33 @@ AC_CHECK_PROG(LN, ln, ln)
- 
- # Check size assumptions of basic data types
- 
--AC_REQUIRE_SIZEOF(int,    4)
--AC_REQUIRE_SIZEOF(double, 8)
--
--AC_CHECK_INT64_T
--
- AC_CHECK_SIZEOF(int)
-+AC_CHECK_SIZEOF(double)
- AC_CHECK_SIZEOF(long)
- AC_CHECK_SIZEOF(long long)
- AC_CHECK_SIZEOF(void *)
- 
-+if test $ac_cv_sizeof_int != "4"; then
-+    AC_MSG_ERROR("Integer is not of size 4 $ac_cv_sizeof_int")
-+fi
-+
-+if test $ac_cv_sizeof_double != "8"; then
-+    AC_MSG_ERROR("Double is not of size 8 $ac_cv_sizeof_double")
-+fi
-+
-+if test $ac_cv_sizeof_long == "8"; then
-+    ac_cv_int64_t="long"
-+else
-+    if test $ac_cv_sizeof_long_long == "8"; then
-+        ac_cv_int64_t="long long"
-+    else
-+        AC_MSG_ERROR("No 64bit int type found");
-+    fi
-+fi
-+
-+SQUEAK_INT64_T="$ac_cv_int64_t"
-+AC_DEFINE_UNQUOTED(squeakInt64, $ac_cv_int64_t, "squeak 64bit type")
-+
- # libtool configuration
- 
- AC_DISABLE_STATIC
-@@ -171,7 +188,7 @@ AC_HEADER_TIME
- AC_HEADER_DIRENT
- 
- if test -f "${vmmdir}/vm/interp.h"; then
--  AC_DEFINE(HAVE_INTERP_H, 1)
-+  AC_DEFINE(HAVE_INTERP_H, 1, "have interp.h")
- fi
- AC_SUBST(HAVE_INTERP_H)
- 
-@@ -191,7 +208,7 @@ AC_ARG_WITH(rfb,
-   [have_rfb="$withval"],
-   [have_rfb="no"])
- 
--test $have_rfb = "yes" && AC_DEFINE(USE_RFB,[1])
-+test $have_rfb = "yes" && AC_DEFINE(USE_RFB,[1], "remote framebuffer")
- 
- # Checks for libraries.
- 
-@@ -213,11 +230,11 @@ AC_CHECK_LIB(m,	sin)
- #])
- 
- AC_CHECK_FUNC(_dyld_present, [
--  AC_DEFINE(HAVE_DYLD,[1])
-+  AC_DEFINE(HAVE_DYLD,[1], "OSX linker")
- ],[
-   AC_HAVE_HEADERS(dlfcn.h)
-   AC_CHECK_FUNC(dlopen, [
--    AC_DEFINE(HAVE_LIBDL,[1])
-+    AC_DEFINE(HAVE_LIBDL,[1], "GNU linker")
-   ],[
-     AC_CHECK_LIB(dl, dlopen, [
-       LIBS="-ldl $LIBS"
-@@ -253,7 +270,7 @@ AC_C_DOUBLE_ORDER
- 
- case $host_os in
-   darwin*)
--    AC_DEFINE(DARWIN,[1])
-+    AC_DEFINE(DARWIN,[1], "Building on Darwin")
- #    CFLAGS="-no-cpp-precomp $CFLAGS"
-     with_npsqueak=no
-     VM_APP_ICONS="${imgdir}/SqueakVM.icns"
-@@ -295,8 +312,8 @@ else
- fi
- 
- AC_SUBST(SQ_LIBDIR)
--AC_DEFINE_UNQUOTED(SQ_LIBDIR,["${SQ_LIBDIR}"])
--AC_DEFINE_UNQUOTED(VM_LIBDIR,["${plgdir}"])
-+AC_DEFINE_UNQUOTED(SQ_LIBDIR,["${SQ_LIBDIR}"], "SQ libdir")
-+AC_DEFINE_UNQUOTED(VM_LIBDIR,["${plgdir}"], "VM libdir")
- 
- # Configure files
- 
-@@ -362,3 +379,25 @@ AC_CONFIG_COMMANDS([default],[
- ])
- 
- AC_OUTPUT
-+
-+m4_include(../vm-display-custom/acinclude.m4)
-+m4_include(../vm-sound-custom/acinclude.m4)
-+m4_include(../vm-sound-MacOSX/acinclude.m4)
-+m4_include(../plugins/FloatMathPlugin/acinclude.m4)
-+m4_include(../plugins/VideoForLinuxPlugin/acinclude.m4)
-+m4_include(../plugins/MIDIPlugin/acinclude.m4)
-+m4_include(../plugins/B3DAcceleratorPlugin/acinclude.m4)
-+m4_include(../plugins/SqueakFFIPrims/acinclude.m4)
-+m4_include(../plugins/Mpeg3Plugin/acinclude.m4)
-+m4_include(../plugins/PseudoTTYPlugin/acinclude.m4)
-+m4_include(../plugins/UnixOSProcessPlugin/acinclude.m4)
-+m4_include(../plugins/UUIDPlugin/acinclude.m4)
-+m4_include(../plugins/XDisplayControlPlugin/acinclude.m4)
-+m4_include(../vm-sound-Sun/acinclude.m4)
-+m4_include(../vm-display-Quartz/acinclude.m4)
-+m4_include(../vm-display-fbdev/acinclude.m4)
-+m4_include(../vm-sound-ALSA/acinclude.m4)
-+m4_include(../vm-sound-NAS/acinclude.m4)
-+m4_include(../vm-display-X11/acinclude.m4)
-+m4_include(../vm/acinclude.m4)
-+m4_include(../vm-sound-OSS/acinclude.m4)
-diff --git a/platforms/unix/config/ltmain.sh b/platforms/unix/config/ltmain.sh
-index 6e5bf36..e852851 100644
---- a/platforms/unix/config/ltmain.sh
-+++ b/platforms/unix/config/ltmain.sh
-@@ -1,7 +1,7 @@
- # ltmain.sh - Provide generalized library-building support services.
- # NOTE: Changing this file will not affect anything until you rerun configure.
- #
--# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
- # Free Software Foundation, Inc.
- # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
- #
-@@ -24,6 +24,34 @@
- # configuration script generated by Autoconf, you may include it under
- # the same distribution terms that you use for the rest of that program.
- 
-+basename="s,^.*/,,g"
-+
-+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-+# is ksh but when the shell is invoked as "sh" and the current value of
-+# the _XPG environment variable is not equal to 1 (one), the special
-+# positional parameter $0, within a function call, is the name of the
-+# function.
-+progpath="$0"
-+
-+# The name of this program:
-+progname=`echo "$progpath" | $SED $basename`
-+modename="$progname"
-+
-+# Global variables:
-+EXIT_SUCCESS=0
-+EXIT_FAILURE=1
-+
-+PROGRAM=ltmain.sh
-+PACKAGE=libtool
-+VERSION=1.5.10
-+TIMESTAMP=" (1.1220.2.131 2004/09/19 12:46:56)"
-+
-+# See if we are running on zsh, and set the options which allow our
-+# commands through without removal of \ escapes.
-+if test -n "${ZSH_VERSION+set}" ; then
-+  setopt NO_GLOB_SUBST
-+fi
-+
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
-   # Discard the --no-reexec flag, and continue.
-@@ -36,7 +64,7 @@ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-   :
- else
-   # Restart under the correct shell, and then maybe $echo will work.
--  exec $SHELL "$0" --no-reexec ${1+"$@"}
-+  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
- fi
- 
- if test "X$1" = X--fallback-echo; then
-@@ -45,19 +73,9 @@ if test "X$1" = X--fallback-echo; then
-   cat <<EOF
- $*
- EOF
--  exit 0
-+  exit $EXIT_SUCCESS
- fi
- 
--# The name of this program.
--progname=`$echo "$0" | sed 's%^.*/%%'`
--modename="$progname"
--
--# Constants.
--PROGRAM=ltmain.sh
--PACKAGE=libtool
--VERSION=1.4.2
--TIMESTAMP=" (1.922.2.53 2001/09/11 03:18:52)"
--
- default_mode=
- help="Try \`$progname --help' for more information."
- magic="%%%MAGIC variable%%%"
-@@ -67,10 +85,19 @@ rm="rm -f"
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e 1s/^X//'
-+Xsed="${SED}"' -e 1s/^X//'
- sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
--SP2NL='tr \040 \012'
--NL2SP='tr \015\012 \040\040'
-+# test EBCDIC or ASCII
-+case `echo A|tr A '\301'` in
-+ A) # EBCDIC based system
-+  SP2NL="tr '\100' '\n'"
-+  NL2SP="tr '\r\n' '\100\100'"
-+  ;;
-+ *) # Assume ASCII based system
-+  SP2NL="tr '\040' '\012'"
-+  NL2SP="tr '\015\012' '\040\040'"
-+  ;;
-+esac
- 
- # NLS nuisances.
- # Only set LANG and LC_ALL to C if already set.
-@@ -85,12 +112,13 @@ if test "${LANG+set}" = set; then
- fi
- 
- # Make sure IFS has a sensible default
--: ${IFS=" 	"}
-+: ${IFS=" 	
-+"}
- 
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
--  echo "$modename: not configured to build any kind of library" 1>&2
--  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
--  exit 1
-+  $echo "$modename: not configured to build any kind of library" 1>&2
-+  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-+  exit $EXIT_FAILURE
- fi
- 
- # Global variables.
-@@ -105,8 +133,238 @@ execute_dlfiles=
- lo2o="s/\\.lo\$/.${objext}/"
- o2lo="s/\\.${objext}\$/.lo/"
- 
-+#####################################
-+# Shell function definitions:
-+# This seems to be the best place for them
-+
-+# func_win32_libid arg
-+# return the library type of file 'arg'
-+#
-+# Need a lot of goo to handle *both* DLLs and import libs
-+# Has to be a shell function in order to 'eat' the argument
-+# that is supplied when $file_magic_command is called.
-+func_win32_libid () {
-+  win32_libid_type="unknown"
-+  win32_fileres=`file -L $1 2>/dev/null`
-+  case $win32_fileres in
-+  *ar\ archive\ import\ library*) # definitely import
-+    win32_libid_type="x86 archive import"
-+    ;;
-+  *ar\ archive*) # could be an import, or static
-+    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 /{x;/import/!{s/^/import/;h;p;};x;};}'`
-+      if test "X$win32_nmres" = "Ximport" ; then
-+        win32_libid_type="x86 archive import"
-+      else
-+        win32_libid_type="x86 archive static"
-+      fi
-+    fi
-+    ;;
-+  *DLL*)
-+    win32_libid_type="x86 DLL"
-+    ;;
-+  *executable*) # but shell scripts are "executable" too...
-+    case $win32_fileres in
-+    *MS\ Windows\ PE\ Intel*)
-+      win32_libid_type="x86 DLL"
-+      ;;
-+    esac
-+    ;;
-+  esac
-+  $echo $win32_libid_type
-+}
-+
-+
-+# func_infer_tag arg
-+# Infer tagged configuration to use if any are available and
-+# if one wasn't chosen via the "--tag" command line option.
-+# Only attempt this if the compiler in the base compile
-+# command doesn't match the default compiler.
-+# arg is usually of the form 'gcc ...'
-+func_infer_tag () {
-+    if test -n "$available_tags" && test -z "$tagname"; then
-+      CC_quoted=
-+      for arg in $CC; do
-+	case $arg in
-+	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+	CC_quoted="$CC_quoted $arg"
-+      done
-+      case $@ in
-+      # Blanks in the command may have been stripped by the calling shell,
-+      # but not from the CC environment variable when configure was run.
-+      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-+      # Blanks at the start of $base_compile will cause this to fail
-+      # if we don't check for them as well.
-+      *)
-+	for z in $available_tags; do
-+	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-+	    # Evaluate the configuration.
-+	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-+	    CC_quoted=
-+	    for arg in $CC; do
-+	    # Double-quote args containing other shell metacharacters.
-+	    case $arg in
-+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	      arg="\"$arg\""
-+	      ;;
-+	    esac
-+	    CC_quoted="$CC_quoted $arg"
-+	  done
-+	    case "$@ " in
-+	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-+	      # The compiler in the base compile command matches
-+	      # the one in the tagged configuration.
-+	      # Assume this is the tagged configuration we want.
-+	      tagname=$z
-+	      break
-+	      ;;
-+	    esac
-+	  fi
-+	done
-+	# If $tagname still isn't set, then no tagged configuration
-+	# was found and let the user know that the "--tag" command
-+	# line option must be used.
-+	if test -z "$tagname"; then
-+	  $echo "$modename: unable to infer tagged configuration"
-+	  $echo "$modename: defaulting to \`CC'"
-+	  $echo "$modename: if this is not correct, specify a tag with \`--tag'"
-+#	  exit $EXIT_FAILURE
-+#        else
-+#          $echo "$modename: using $tagname tagged configuration"
-+	fi
-+	;;
-+      esac
-+    fi
-+}
-+
-+
-+# func_extract_archives gentop oldlib ...
-+func_extract_archives () {
-+    my_gentop="$1"; shift
-+    my_oldlibs=${1+"$@"}
-+    my_oldobjs=""
-+    my_xlib=""
-+    my_xabs=""
-+    my_xdir=""
-+    my_status=""
-+
-+    $show "${rm}r $my_gentop"
-+    $run ${rm}r "$my_gentop"
-+    $show "$mkdir $my_gentop"
-+    $run $mkdir "$my_gentop"
-+    my_status=$?
-+    if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
-+      exit $my_status
-+    fi
-+
-+    for my_xlib in $my_oldlibs; do
-+      # Extract the objects.
-+      case $my_xlib in
-+	[\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
-+	*) my_xabs=`pwd`"/$my_xlib" ;;
-+      esac
-+      my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
-+      my_xdir="$my_gentop/$my_xlib"
-+
-+      $show "${rm}r $my_xdir"
-+      $run ${rm}r "$my_xdir"
-+      $show "$mkdir $my_xdir"
-+      $run $mkdir "$my_xdir"
-+      status=$?
-+      if test "$status" -ne 0 && test ! -d "$my_xdir"; then
-+	exit $status
-+      fi
-+      case $host in
-+      *-darwin*)
-+	$show "Extracting $my_xabs"
-+	# Do not bother doing anything if just a dry run
-+	if test -z "$run"; then
-+	  darwin_orig_dir=`pwd`
-+	  cd $my_xdir || exit $?
-+	  darwin_archive=$my_xabs
-+	  darwin_curdir=`pwd`
-+	  darwin_base_archive=`basename $darwin_archive`
-+	  darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
-+	  if test -n "$darwin_arches"; then 
-+	    darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
-+	    darwin_arch=
-+	    $show "$darwin_base_archive has multiple architectures $darwin_arches"
-+	    for darwin_arch in  $darwin_arches ; do
-+	      mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
-+	      # Remove the table of contents from the thin files.
-+	      $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF 2>/dev/null || true
-+	      $AR -d "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" __.SYMDEF\ SORTED 2>/dev/null || true
-+	      cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
-+	      $AR -xo "${darwin_base_archive}"
-+	      rm "${darwin_base_archive}"
-+	      cd "$darwin_curdir"
-+	    done # $darwin_arches
-+      ## Okay now we have a bunch of thin objects, gotta fatten them up :)
-+	    darwin_filelist=`find unfat-$$ -type f | xargs basename | sort -u | $NL2SP`
-+	    darwin_file=
-+	    darwin_files=
-+	    for darwin_file in $darwin_filelist; do
-+	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
-+	      lipo -create -output "$darwin_file" $darwin_files
-+	    done # $darwin_filelist
-+	    rm -rf unfat-$$
-+	    cd "$darwin_orig_dir"
-+	  else
-+	    cd $darwin_orig_dir
-+	    (cd $my_xdir && $AR x $my_xabs) || exit $?
-+	  fi # $darwin_arches
-+	fi # $run
-+      ;;
-+      *)
-+	# We will extract separately just the conflicting names and we will
-+	# no longer touch any unique names. It is faster to leave these
-+	# extract automatically by $AR in one run.
-+	$show "(cd $my_xdir && $AR x $my_xabs)"
-+	$run eval "(cd \$my_xdir && $AR x \$my_xabs)" || exit $?
-+	if ($AR t "$my_xabs" | sort | sort -uc >/dev/null 2>&1); then
-+	  :
-+	else
-+	  $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-+	  $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-+	  $AR t "$my_xabs" | sort | uniq -cd | while read -r count name
-+	  do
-+	    i=1
-+	    while test "$i" -le "$count"
-+	    do
-+	      # Put our $i before any first dot (extension)
-+	      # Never overwrite any file
-+	      name_to="$name"
-+	      while test "X$name_to" = "X$name" || test -f "$my_xdir/$name_to"
-+	      do
-+		name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-+	      done
-+	      $show "(cd $my_xdir && $AR xN $i $my_xabs '$name' && $mv '$name' '$name_to')"
-+	      $run eval "(cd \$my_xdir && $AR xN $i \$my_xabs '$name' && $mv '$name' '$name_to')" || exit $?
-+	      i=`expr $i + 1`
-+	    done
-+	  done
-+	fi
-+	;;
-+      esac
-+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-+    done
-+
-+    func_extract_archives_result="$my_oldobjs"
-+}
-+# End of Shell function definitions
-+#####################################
-+
-+# Darwin sucks
-+eval std_shrext=\"$shrext_cmds\"
-+
- # Parse our command line options once, thoroughly.
--while test $# -gt 0
-+while test "$#" -gt 0
- do
-   arg="$1"
-   shift
-@@ -122,6 +380,34 @@ do
-     execute_dlfiles)
-       execute_dlfiles="$execute_dlfiles $arg"
-       ;;
-+    tag)
-+      tagname="$arg"
-+      preserve_args="${preserve_args}=$arg"
-+
-+      # Check whether tagname contains only valid characters
-+      case $tagname in
-+      *[!-_A-Za-z0-9,/]*)
-+	$echo "$progname: invalid tag name: $tagname" 1>&2
-+	exit $EXIT_FAILURE
-+	;;
-+      esac
-+
-+      case $tagname in
-+      CC)
-+	# Don't test for the "default" C tag, as we know, it's there, but
-+	# not specially marked.
-+	;;
-+      *)
-+	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-+	  taglist="$taglist $tagname"
-+	  # Evaluate the configuration.
-+	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-+	else
-+	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-+	fi
-+	;;
-+      esac
-+      ;;
-     *)
-       eval "$prev=\$arg"
-       ;;
-@@ -139,18 +425,27 @@ do
-     ;;
- 
-   --version)
--    echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
--    exit 0
-+    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-+    $echo
-+    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-+    $echo "This is free software; see the source for copying conditions.  There is NO"
-+    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+    exit $EXIT_SUCCESS
-     ;;
- 
-   --config)
--    sed -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
--    exit 0
-+    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-+    # Now print the configurations for the tags.
-+    for tagname in $taglist; do
-+      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-+    done
-+    exit $EXIT_SUCCESS
-     ;;
- 
-   --debug)
--    echo "$progname: enabling shell trace mode"
-+    $echo "$progname: enabling shell trace mode"
-     set -x
-+    preserve_args="$preserve_args $arg"
-     ;;
- 
-   --dry-run | -n)
-@@ -158,18 +453,18 @@ do
-     ;;
- 
-   --features)
--    echo "host: $host"
-+    $echo "host: $host"
-     if test "$build_libtool_libs" = yes; then
--      echo "enable shared libraries"
-+      $echo "enable shared libraries"
-     else
--      echo "disable shared libraries"
-+      $echo "disable shared libraries"
-     fi
-     if test "$build_old_libs" = yes; then
--      echo "enable static libraries"
-+      $echo "enable static libraries"
-     else
--      echo "disable static libraries"
-+      $echo "disable static libraries"
-     fi
--    exit 0
-+    exit $EXIT_SUCCESS
-     ;;
- 
-   --finish) mode="finish" ;;
-@@ -177,8 +472,19 @@ do
-   --mode) prevopt="--mode" prev=mode ;;
-   --mode=*) mode="$optarg" ;;
- 
-+  --preserve-dup-deps) duplicate_deps="yes" ;;
-+
-   --quiet | --silent)
-     show=:
-+    preserve_args="$preserve_args $arg"
-+    ;;
-+
-+  --tag) prevopt="--tag" prev=tag ;;
-+  --tag=*)
-+    set tag "$optarg" ${1+"$@"}
-+    shift
-+    prev=tag
-+    preserve_args="$preserve_args --tag"
-     ;;
- 
-   -dlopen)
-@@ -189,7 +495,7 @@ do
-   -*)
-     $echo "$modename: unrecognized option \`$arg'" 1>&2
-     $echo "$help" 1>&2
--    exit 1
-+    exit $EXIT_FAILURE
-     ;;
- 
-   *)
-@@ -202,7 +508,7 @@ done
- if test -n "$prevopt"; then
-   $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-   $echo "$help" 1>&2
--  exit 1
-+  exit $EXIT_FAILURE
- fi
- 
- # If this variable is set in any of the actions, the command in it
-@@ -214,8 +520,10 @@ if test -z "$show_help"; then
- 
-   # Infer the operation mode.
-   if test -z "$mode"; then
-+    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-+    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-     case $nonopt in
--    *cc | *++ | gcc* | *-gcc*)
-+    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-       mode=link
-       for arg
-       do
-@@ -256,7 +564,7 @@ if test -z "$show_help"; then
-   if test -n "$execute_dlfiles" && test "$mode" != execute; then
-     $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-     $echo "$help" 1>&2
--    exit 1
-+    exit $EXIT_FAILURE
-   fi
- 
-   # Change the help message to a mode-specific one.
-@@ -270,158 +578,124 @@ if test -z "$show_help"; then
-     modename="$modename: compile"
-     # Get the compilation command and the source file.
-     base_compile=
--    prev=
--    lastarg=
--    srcfile="$nonopt"
-+    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-+    suppress_opt=yes
-     suppress_output=
-+    arg_mode=normal
-+    libobj=
-+    later=
- 
--    user_target=no
-     for arg
-     do
--      case $prev in
--      "") ;;
--      xcompiler)
--	# Aesthetically quote the previous argument.
--	prev=
--	lastarg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
--
--	case $arg in
--	# Double-quote args containing other shell metacharacters.
--	# Many Bourne shells cannot handle close brackets correctly
--	# in scan sets, so we specify it separately.
--	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
--	  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
-+      target )
-+	libobj="$arg"
-+	arg_mode=normal
- 	continue
- 	;;
--      esac
- 
--      # Accept any command-line options.
--      case $arg in
--      -o)
--	if test "$user_target" != "no"; then
--	  $echo "$modename: you cannot specify \`-o' more than once" 1>&2
--	  exit 1
--	fi
--	user_target=next
--	;;
-+      normal )
-+	# Accept any command-line options.
-+	case $arg in
-+	-o)
-+	  if test -n "$libobj" ; then
-+	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-+	    exit $EXIT_FAILURE
-+	  fi
-+	  arg_mode=target
-+	  continue
-+	  ;;
- 
--      -static)
--	build_old_libs=yes
--	continue
--	;;
-+	-static | -prefer-pic | -prefer-non-pic)
-+	  later="$later $arg"
-+	  continue
-+	  ;;
- 
--      -prefer-pic)
--	pic_mode=yes
--	continue
--	;;
-+	-no-suppress)
-+	  suppress_opt=no
-+	  continue
-+	  ;;
- 
--      -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=
-+	  save_ifs="$IFS"; IFS=','
-+ 	  for arg in $args; do
-+	    IFS="$save_ifs"
- 
--      -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.
-+	    case $arg in
-+	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	      arg="\"$arg\""
-+	      ;;
-+	    esac
-+	    lastarg="$lastarg $arg"
-+	  done
- 	  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"
--	else
-+	  # Add the arguments to base_compile.
- 	  base_compile="$base_compile $lastarg"
--	fi
--	continue
--	;;
--      esac
-+	  continue
-+	  ;;
- 
--      case $user_target in
--      next)
--	# The next one is the -o target name
--	user_target=yes
--	continue
--	;;
--      yes)
--	# We got the output file
--	user_target=set
--	libobj="$arg"
--	continue
-+	* )
-+	  # Accept the current argument as the source file.
-+	  # The previous "srcfile" becomes the current argument.
-+	  #
-+	  lastarg="$srcfile"
-+	  srcfile="$arg"
-+	  ;;
-+	esac  #  case $arg
- 	;;
--      esac
--
--      # Accept the current argument as the source file.
--      lastarg="$srcfile"
--      srcfile="$arg"
-+      esac    #  case $arg_mode
- 
-       # Aesthetically quote the previous argument.
--
--      # Backslashify any backslashes, double quotes, and dollar signs.
--      # These are the only characters that are still specially
--      # interpreted inside of double-quoted scrings.
-       lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
- 
-+      case $lastarg in
-       # Double-quote args containing other shell metacharacters.
-       # Many Bourne shells cannot handle close brackets correctly
-       # in scan sets, so we specify it separately.
--      case $lastarg in
-       *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
- 	lastarg="\"$lastarg\""
- 	;;
-       esac
- 
--      # Add the previous argument to base_compile.
--      if test -z "$base_compile"; then
--	base_compile="$lastarg"
--      else
--	base_compile="$base_compile $lastarg"
--      fi
--    done
-+      base_compile="$base_compile $lastarg"
-+    done # for arg
- 
--    case $user_target in
--    set)
-+    case $arg_mode in
-+    arg)
-+      $echo "$modename: you must specify an argument for -Xcompile"
-+      exit $EXIT_FAILURE
-       ;;
--    no)
--      # Get the name of the library object.
--      libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-+    target)
-+      $echo "$modename: you must specify a target with \`-o'" 1>&2
-+      exit $EXIT_FAILURE
-       ;;
-     *)
--      $echo "$modename: you must specify a target with \`-o'" 1>&2
--      exit 1
-+      # Get the name of the library object.
-+      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-       ;;
-     esac
- 
-     # Recognize several different file suffixes.
-     # If the user specifies -o file.o, it is replaced with file.lo
--    xform='[cCFSfmso]'
-+    xform='[cCFSifmso]'
-     case $libobj in
-     *.ada) xform=ada ;;
-     *.adb) xform=adb ;;
-@@ -429,10 +703,13 @@ if test -z "$show_help"; then
-     *.asm) xform=asm ;;
-     *.c++) xform=c++ ;;
-     *.cc) xform=cc ;;
-+    *.ii) xform=ii ;;
-+    *.class) xform=class ;;
-     *.cpp) xform=cpp ;;
-     *.cxx) xform=cxx ;;
-     *.f90) xform=f90 ;;
-     *.for) xform=for ;;
-+    *.java) xform=java ;;
-     esac
- 
-     libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-@@ -441,25 +718,55 @@ if test -z "$show_help"; then
-     *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-     *)
-       $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-       ;;
-     esac
- 
-+    func_infer_tag $base_compile
-+
-+    for arg in $later; do
-+      case $arg in
-+      -static)
-+	build_old_libs=yes
-+	continue
-+	;;
-+
-+      -prefer-pic)
-+	pic_mode=yes
-+	continue
-+	;;
-+
-+      -prefer-non-pic)
-+	pic_mode=no
-+	continue
-+	;;
-+      esac
-+    done
-+
-+    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-+    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-+    if test "X$xdir" = "X$obj"; then
-+      xdir=
-+    else
-+      xdir=$xdir/
-+    fi
-+    lobj=${xdir}$objdir/$objname
-+
-     if test -z "$base_compile"; then
-       $echo "$modename: you must specify a compilation command" 1>&2
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     # Delete any leftover library objects.
-     if test "$build_old_libs" = yes; then
--      removelist="$obj $libobj"
-+      removelist="$obj $lobj $libobj ${libobj}T"
-     else
--      removelist="$libobj"
-+      removelist="$lobj $libobj ${libobj}T"
-     fi
- 
-     $run $rm $removelist
--    trap "$run $rm $removelist; exit 1" 1 2 15
-+    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
- 
-     # On Cygwin there's no "real" PIC flag so we must build both object types
-     case $host_os in
-@@ -467,7 +774,7 @@ if test -z "$show_help"; then
-       pic_mode=default
-       ;;
-     esac
--    if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
-+    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-       # non-PIC code in shared libraries is not supported
-       pic_mode=default
-     fi
-@@ -478,8 +785,9 @@ if test -z "$show_help"; then
-       output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-       lockfile="$output_obj.lock"
-       removelist="$removelist $output_obj $lockfile"
--      trap "$run $rm $removelist; exit 1" 1 2 15
-+      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-     else
-+      output_obj=
-       need_locks=no
-       lockfile=
-     fi
-@@ -487,13 +795,13 @@ if test -z "$show_help"; then
-     # 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
--      until $run ln "$0" "$lockfile" 2>/dev/null; do
-+      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
- 	$show "Waiting for $lockfile to be removed"
- 	sleep 2
-       done
-     elif test "$need_locks" = warn; then
-       if test -f "$lockfile"; then
--	echo "\
-+	$echo "\
- *** ERROR, $lockfile exists and contains:
- `cat $lockfile 2>/dev/null`
- 
-@@ -505,68 +813,67 @@ avoid parallel builds (make -j) in this platform, or get a better
- compiler."
- 
- 	$run $rm $removelist
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
--      echo $srcfile > "$lockfile"
-+      $echo $srcfile > "$lockfile"
-     fi
- 
-     if test -n "$fix_srcfile_path"; then
-       eval srcfile=\"$fix_srcfile_path\"
-     fi
- 
-+    $run $rm "$libobj" "${libobj}T"
-+
-+    # Create a libtool object file (analogous to a ".la" file),
-+    # but don't create it if we're doing a dry run.
-+    test -z "$run" && cat > ${libobj}T <<EOF
-+# $libobj - a libtool object file
-+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+#
-+# Please DO NOT delete this file!
-+# It is necessary for linking the library.
-+
-+# Name of the PIC object.
-+EOF
-+
-     # Only build a PIC object if we are building libtool libraries.
-     if test "$build_libtool_libs" = yes; then
-       # Without this assignment, base_compile gets emptied.
-       fbsd_hideous_sh_bug=$base_compile
- 
-       if test "$pic_mode" != no; then
--	# All platforms use -DPIC, to notify preprocessed assembler code.
--	command="$base_compile $srcfile $pic_flag -DPIC"
-+	command="$base_compile $srcfile $pic_flag"
-       else
- 	# Don't build PIC code
- 	command="$base_compile $srcfile"
-       fi
--      if test "$build_old_libs" = yes; then
--	lo_libobj="$libobj"
--	dir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
--	if test "X$dir" = "X$libobj"; then
--	  dir="$objdir"
--	else
--	  dir="$dir/$objdir"
--	fi
--	libobj="$dir/"`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
- 
--	if test -d "$dir"; then
--	  $show "$rm $libobj"
--	  $run $rm $libobj
--	else
--	  $show "$mkdir $dir"
--	  $run $mkdir $dir
--	  status=$?
--	  if test $status -ne 0 && test ! -d $dir; then
--	    exit $status
--	  fi
-+      if test ! -d "${xdir}$objdir"; then
-+	$show "$mkdir ${xdir}$objdir"
-+	$run $mkdir ${xdir}$objdir
-+	status=$?
-+	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-+	  exit $status
- 	fi
-       fi
--      if test "$compiler_o_lo" = yes; then
--	output_obj="$libobj"
--	command="$command -o $output_obj"
--      elif test "$compiler_c_o" = yes; then
--	output_obj="$obj"
--	command="$command -o $output_obj"
-+
-+      if test -z "$output_obj"; then
-+	# Place PIC objects in $objdir
-+	command="$command -o $lobj"
-       fi
- 
--      $run $rm "$output_obj"
-+      $run $rm "$lobj" "$output_obj"
-+
-       $show "$command"
-       if $run eval "$command"; then :
-       else
- 	test -n "$output_obj" && $run $rm $removelist
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
- 
-       if test "$need_locks" = warn &&
--	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
--	echo "\
-+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-+	$echo "\
- *** ERROR, $lockfile contains:
- `cat $lockfile 2>/dev/null`
- 
-@@ -581,13 +888,13 @@ avoid parallel builds (make -j) in this platform, or get a better
- compiler."
- 
- 	$run $rm $removelist
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
- 
-       # Just move the object if needed, then go on to compile the next one
--      if test x"$output_obj" != x"$libobj"; then
--	$show "$mv $output_obj $libobj"
--	if $run $mv $output_obj $libobj; then :
-+      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-+	$show "$mv $output_obj $lobj"
-+	if $run $mv $output_obj $lobj; then :
- 	else
- 	  error=$?
- 	  $run $rm $removelist
-@@ -595,48 +902,23 @@ compiler."
- 	fi
-       fi
- 
--      # If we have no pic_flag, then copy the object into place and finish.
--      if (test -z "$pic_flag" || test "$pic_mode" != default) &&
--	 test "$build_old_libs" = yes; then
--	# Rename the .lo from within objdir to obj
--	if test -f $obj; then
--	  $show $rm $obj
--	  $run $rm $obj
--	fi
-+      # Append the name of the PIC object to the libtool object file.
-+      test -z "$run" && cat >> ${libobj}T <<EOF
-+pic_object='$objdir/$objname'
- 
--	$show "$mv $libobj $obj"
--	if $run $mv $libobj $obj; then :
--	else
--	  error=$?
--	  $run $rm $removelist
--	  exit $error
--	fi
-+EOF
- 
--	xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
--	if test "X$xdir" = "X$obj"; then
--	  xdir="."
--	else
--	  xdir="$xdir"
--	fi
--	baseobj=`$echo "X$obj" | $Xsed -e "s%.*/%%"`
--	libobj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
--	# Now arrange that obj and lo_libobj become the same file
--	$show "(cd $xdir && $LN_S $baseobj $libobj)"
--	if $run eval '(cd $xdir && $LN_S $baseobj $libobj)'; then
--	  # Unlock the critical section if it was locked
--	  if test "$need_locks" != no; then
--	    $run $rm "$lockfile"
--	  fi
--	  exit 0
--	else
--	  error=$?
--	  $run $rm $removelist
--	  exit $error
--	fi
-+      # Allow error messages only from the first compilation.
-+      if test "$suppress_opt" = yes; then
-+        suppress_output=' >/dev/null 2>&1'
-       fi
-+    else
-+      # No PIC object so indicate it doesn't exist in the libtool
-+      # object file.
-+      test -z "$run" && cat >> ${libobj}T <<EOF
-+pic_object=none
- 
--      # Allow error messages only from the first compilation.
--      suppress_output=' >/dev/null 2>&1'
-+EOF
-     fi
- 
-     # Only build a position-dependent object if we build old libraries.
-@@ -645,27 +927,25 @@ compiler."
- 	# Don't build PIC code
- 	command="$base_compile $srcfile"
-       else
--	# All platforms use -DPIC, to notify preprocessed assembler code.
--	command="$base_compile $srcfile $pic_flag -DPIC"
-+	command="$base_compile $srcfile $pic_flag"
-       fi
-       if test "$compiler_c_o" = yes; then
- 	command="$command -o $obj"
--	output_obj="$obj"
-       fi
- 
-       # Suppress compiler output if we already did a PIC compilation.
-       command="$command$suppress_output"
--      $run $rm "$output_obj"
-+      $run $rm "$obj" "$output_obj"
-       $show "$command"
-       if $run eval "$command"; then :
-       else
- 	$run $rm $removelist
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
- 
-       if test "$need_locks" = warn &&
--	 test x"`cat $lockfile 2>/dev/null`" != x"$srcfile"; then
--	echo "\
-+	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-+	$echo "\
- *** ERROR, $lockfile contains:
- `cat $lockfile 2>/dev/null`
- 
-@@ -680,11 +960,11 @@ avoid parallel builds (make -j) in this platform, or get a better
- compiler."
- 
- 	$run $rm $removelist
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
- 
-       # Just move the object if needed
--      if test x"$output_obj" != x"$obj"; then
-+      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
- 	$show "$mv $output_obj $obj"
- 	if $run $mv $output_obj $obj; then :
- 	else
-@@ -694,29 +974,31 @@ compiler."
- 	fi
-       fi
- 
--      # Create an invalid libtool object if no PIC, so that we do not
--      # accidentally link it into a program.
--      if test "$build_libtool_libs" != yes; then
--	$show "echo timestamp > $libobj"
--	$run eval "echo timestamp > \$libobj" || exit $?
--      else
--	# Move the .lo from within objdir
--	$show "$mv $libobj $lo_libobj"
--	if $run $mv $libobj $lo_libobj; then :
--	else
--	  error=$?
--	  $run $rm $removelist
--	  exit $error
--	fi
--      fi
-+      # Append the name of the non-PIC object the libtool object file.
-+      # Only append if the libtool object file exists.
-+      test -z "$run" && cat >> ${libobj}T <<EOF
-+# Name of the non-PIC object.
-+non_pic_object='$objname'
-+
-+EOF
-+    else
-+      # Append the name of the non-PIC object the libtool object file.
-+      # Only append if the libtool object file exists.
-+      test -z "$run" && cat >> ${libobj}T <<EOF
-+# Name of the non-PIC object.
-+non_pic_object=none
-+
-+EOF
-     fi
- 
-+    $run $mv "${libobj}T" "${libobj}"
-+
-     # Unlock the critical section if it was locked
-     if test "$need_locks" != no; then
-       $run $rm "$lockfile"
-     fi
- 
--    exit 0
-+    exit $EXIT_SUCCESS
-     ;;
- 
-   # libtool link mode
-@@ -727,7 +1009,7 @@ compiler."
-       # 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
--      # flag for every libtool invokation.
-+      # flag for every libtool invocation.
-       # allow_undefined=no
- 
-       # FIXME: Unfortunately, there are problems with the above when trying
-@@ -742,6 +1024,7 @@ compiler."
-       ;;
-     esac
-     libtool_args="$nonopt"
-+    base_compile="$nonopt $@"
-     compile_command="$nonopt"
-     finalize_command="$nonopt"
- 
-@@ -757,6 +1040,7 @@ compiler."
-     linker_flags=
-     dllsearchpath=
-     lib_search_path=`pwd`
-+    inst_prefix_dir=
- 
-     avoid_version=no
-     dlfiles=
-@@ -771,6 +1055,8 @@ compiler."
-     module=no
-     no_install=no
-     objs=
-+    non_pic_objects=
-+    precious_files_regex=
-     prefer_static_libs=no
-     preload=no
-     prev=
-@@ -782,6 +1068,9 @@ compiler."
-     temp_rpath=
-     thread_safe=no
-     vinfo=
-+    vinfo_number=no
-+
-+    func_infer_tag $base_compile
- 
-     # We need to know -static, to get the right output filenames.
-     for arg
-@@ -812,7 +1101,7 @@ compiler."
-     test -n "$old_archive_from_new_cmds" && build_old_libs=yes
- 
-     # Go through the arguments, transforming them on the way.
--    while test $# -gt 0; do
-+    while test "$#" -gt 0; do
-       arg="$1"
-       shift
-       case $arg in
-@@ -877,7 +1166,7 @@ compiler."
- 	  export_symbols="$arg"
- 	  if test ! -f "$arg"; then
- 	    $echo "$modename: symbol file \`$arg' does not exist"
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 	  prev=
- 	  continue
-@@ -887,18 +1176,135 @@ compiler."
- 	  prev=
- 	  continue
- 	  ;;
-+	inst_prefix)
-+	  inst_prefix_dir="$arg"
-+	  prev=
-+	  continue
-+	  ;;
-+	precious_regex)
-+	  precious_files_regex="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	release)
- 	  release="-$arg"
- 	  prev=
- 	  continue
- 	  ;;
-+	objectlist)
-+	  if test -f "$arg"; then
-+	    save_arg=$arg
-+	    moreargs=
-+	    for fil in `cat $save_arg`
-+	    do
-+#	      moreargs="$moreargs $fil"
-+	      arg=$fil
-+	      # A libtool-controlled object.
-+
-+	      # Check to see that this really is a libtool object.
-+	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+		pic_object=
-+		non_pic_object=
-+
-+		# Read the .lo file
-+		# If there is no directory component, then add one.
-+		case $arg in
-+		*/* | *\\*) . $arg ;;
-+		*) . ./$arg ;;
-+		esac
-+
-+		if test -z "$pic_object" || \
-+		   test -z "$non_pic_object" ||
-+		   test "$pic_object" = none && \
-+		   test "$non_pic_object" = none; then
-+		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-+		  exit $EXIT_FAILURE
-+		fi
-+
-+		# Extract subdirectory from the argument.
-+		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-+		if test "X$xdir" = "X$arg"; then
-+		  xdir=
-+		else
-+		  xdir="$xdir/"
-+		fi
-+
-+		if test "$pic_object" != none; then
-+		  # Prepend the subdirectory the object is found in.
-+		  pic_object="$xdir$pic_object"
-+
-+		  if test "$prev" = dlfiles; then
-+		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+		      dlfiles="$dlfiles $pic_object"
-+		      prev=
-+		      continue
-+		    else
-+		      # If libtool objects are unsupported, then we need to preload.
-+		      prev=dlprefiles
-+		    fi
-+		  fi
-+
-+		  # CHECK ME:  I think I busted this.  -Ossama
-+		  if test "$prev" = dlprefiles; then
-+		    # Preload the old-style object.
-+		    dlprefiles="$dlprefiles $pic_object"
-+		    prev=
-+		  fi
-+
-+		  # A PIC object.
-+		  libobjs="$libobjs $pic_object"
-+		  arg="$pic_object"
-+		fi
-+
-+		# Non-PIC object.
-+		if test "$non_pic_object" != none; then
-+		  # Prepend the subdirectory the object is found in.
-+		  non_pic_object="$xdir$non_pic_object"
-+
-+		  # A standard non-PIC object
-+		  non_pic_objects="$non_pic_objects $non_pic_object"
-+		  if test -z "$pic_object" || test "$pic_object" = none ; then
-+		    arg="$non_pic_object"
-+		  fi
-+		fi
-+	      else
-+		# Only an error if not doing a dry-run.
-+		if test -z "$run"; then
-+		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-+		  exit $EXIT_FAILURE
-+		else
-+		  # Dry-run case.
-+
-+		  # Extract subdirectory from the argument.
-+		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-+		  if test "X$xdir" = "X$arg"; then
-+		    xdir=
-+		  else
-+		    xdir="$xdir/"
-+		  fi
-+
-+		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-+		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-+		  libobjs="$libobjs $pic_object"
-+		  non_pic_objects="$non_pic_objects $non_pic_object"
-+		fi
-+	      fi
-+	    done
-+	  else
-+	    $echo "$modename: link input file \`$save_arg' does not exist"
-+	    exit $EXIT_FAILURE
-+	  fi
-+	  arg=$save_arg
-+	  prev=
-+	  continue
-+	  ;;
- 	rpath | xrpath)
- 	  # We need an absolute path.
- 	  case $arg in
- 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
- 	  *)
- 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	    ;;
- 	  esac
- 	  if test "$prev" = rpath; then
-@@ -930,13 +1336,26 @@ compiler."
- 	  finalize_command="$finalize_command $wl$qarg"
- 	  continue
- 	  ;;
-+	xcclinker)
-+	  linker_flags="$linker_flags $qarg"
-+	  compiler_flags="$compiler_flags $qarg"
-+	  prev=
-+	  compile_command="$compile_command $qarg"
-+	  finalize_command="$finalize_command $qarg"
-+	  continue
-+	  ;;
-+	shrext)
-+  	  shrext_cmds="$arg"
-+	  prev=
-+	  continue
-+	  ;;
- 	*)
- 	  eval "$prev=\"\$arg\""
- 	  prev=
- 	  continue
- 	  ;;
- 	esac
--      fi # test -n $prev
-+      fi # test -n "$prev"
- 
-       prevarg="$arg"
- 
-@@ -978,7 +1397,7 @@ compiler."
-       -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"
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 	if test "X$arg" = "X-export-symbols"; then
- 	  prev=expsyms
-@@ -988,11 +1407,16 @@ compiler."
- 	continue
- 	;;
- 
-+      -inst-prefix-dir)
-+	prev=inst_prefix
-+	continue
-+	;;
-+
-       # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-       # so, if we see these flags be careful not to treat them like -L
-       -L[A-Z][A-Z]*:*)
- 	case $with_gcc/$host in
--	no/*-*-irix*)
-+	no/*-*-irix* | /*-*-irix*)
- 	  compile_command="$compile_command $arg"
- 	  finalize_command="$finalize_command $arg"
- 	  ;;
-@@ -1009,7 +1433,7 @@ compiler."
- 	  absdir=`cd "$dir" && pwd`
- 	  if test -z "$absdir"; then
- 	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 	  dir="$absdir"
- 	  ;;
-@@ -1043,28 +1467,65 @@ compiler."
- 	    # These systems don't actually have a C library (as such)
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
- 	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  esac
--	 elif test "X$arg" = "X-lc_r"; then
--	  case $host in
--	  *-*-openbsd*)
--	    # Do not include libc_r directly, use -pthread flag.
-+	  *-*-rhapsody* | *-*-darwin1.[012])
-+	    # Rhapsody C and math libraries are in the System framework
-+	    deplibs="$deplibs -framework System"
- 	    continue
--	    ;;
- 	  esac
-+	elif test "X$arg" = "X-lc_r"; then
-+	 case $host in
-+	 *-*-openbsd* | *-*-freebsd*)
-+	   # Do not include libc_r directly, use -pthread flag.
-+	   continue
-+	   ;;
-+	 esac
- 	fi
- 	deplibs="$deplibs $arg"
- 	continue
- 	;;
- 
-+     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
- 	;;
- 
-+      # gcc -m* arguments should be passed to the linker via $compiler_flags
-+      # in order to pass architecture information to the linker
-+      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
-+      # but this is not reliable with gcc because gcc may use -mfoo to
-+      # select a different linker, different libraries, etc, while
-+      # -Wl,-mfoo simply passes -mfoo to the linker.
-+      -m*)
-+	# Unknown arguments in both finalize_command and compile_command need
-+	# to be aesthetically quoted because they are evaled later.
-+	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-+	case $arg in
-+	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-+	  arg="\"$arg\""
-+	  ;;
-+	esac
-+        compile_command="$compile_command $arg"
-+        finalize_command="$finalize_command $arg"
-+        if test "$with_gcc" = "yes" ; then
-+          compiler_flags="$compiler_flags $arg"
-+        fi
-+        continue
-+        ;;
-+
-+      -shrext)
-+	prev=shrext
-+	continue
-+	;;
-+
-       -no-fast-install)
- 	fast_install=no
- 	continue
-@@ -1089,8 +1550,18 @@ compiler."
- 	continue
- 	;;
- 
-+      -objectlist)
-+	prev=objectlist
-+	continue
-+	;;
-+
-       -o) prev=output ;;
- 
-+      -precious-files-regex)
-+	prev=precious_regex
-+	continue
-+	;;
-+
-       -release)
- 	prev=release
- 	continue
-@@ -1113,7 +1584,7 @@ compiler."
- 	[\\/]* | [A-Za-z]:[\\/]*) ;;
- 	*)
- 	  $echo "$modename: only absolute run-paths are allowed" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 	case "$xrpath " in
-@@ -1141,6 +1612,11 @@ compiler."
- 	prev=vinfo
- 	continue
- 	;;
-+      -version-number)
-+	prev=vinfo
-+	vinfo_number=yes
-+	continue
-+	;;
- 
-       -Wc,*)
- 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-@@ -1189,6 +1665,11 @@ compiler."
- 	continue
- 	;;
- 
-+      -XCClinker)
-+	prev=xcclinker
-+	continue
-+	;;
-+
-       # Some other compiler flag.
-       -* | +*)
- 	# Unknown arguments in both finalize_command and compile_command need
-@@ -1201,29 +1682,101 @@ compiler."
- 	esac
- 	;;
- 
--      *.lo | *.$objext)
--	# A library or standard object.
--	if test "$prev" = dlfiles; then
--	  # This file was specified with -dlopen.
--	  if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
--	    dlfiles="$dlfiles $arg"
--	    prev=
--	    continue
--	  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.
-+
-+	# Check to see that this really is a libtool object.
-+	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	  pic_object=
-+	  non_pic_object=
-+
-+	  # Read the .lo file
-+	  # If there is no directory component, then add one.
- 	  case $arg in
--	  *.lo) libobjs="$libobjs $arg" ;;
--	  *) objs="$objs $arg" ;;
-+	  */* | *\\*) . $arg ;;
-+	  *) . ./$arg ;;
- 	  esac
-+
-+	  if test -z "$pic_object" || \
-+	     test -z "$non_pic_object" ||
-+	     test "$pic_object" = none && \
-+	     test "$non_pic_object" = none; then
-+	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-+	    exit $EXIT_FAILURE
-+	  fi
-+
-+	  # Extract subdirectory from the argument.
-+	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-+	  if test "X$xdir" = "X$arg"; then
-+	    xdir=
-+ 	  else
-+	    xdir="$xdir/"
-+	  fi
-+
-+	  if test "$pic_object" != none; then
-+	    # Prepend the subdirectory the object is found in.
-+	    pic_object="$xdir$pic_object"
-+
-+	    if test "$prev" = dlfiles; then
-+	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-+		dlfiles="$dlfiles $pic_object"
-+		prev=
-+		continue
-+	      else
-+		# If libtool objects are unsupported, then we need to preload.
-+		prev=dlprefiles
-+	      fi
-+	    fi
-+
-+	    # CHECK ME:  I think I busted this.  -Ossama
-+	    if test "$prev" = dlprefiles; then
-+	      # Preload the old-style object.
-+	      dlprefiles="$dlprefiles $pic_object"
-+	      prev=
-+	    fi
-+
-+	    # A PIC object.
-+	    libobjs="$libobjs $pic_object"
-+	    arg="$pic_object"
-+	  fi
-+
-+	  # Non-PIC object.
-+	  if test "$non_pic_object" != none; then
-+	    # Prepend the subdirectory the object is found in.
-+	    non_pic_object="$xdir$non_pic_object"
-+
-+	    # A standard non-PIC object
-+	    non_pic_objects="$non_pic_objects $non_pic_object"
-+	    if test -z "$pic_object" || test "$pic_object" = none ; then
-+	      arg="$non_pic_object"
-+	    fi
-+	  fi
-+	else
-+	  # Only an error if not doing a dry-run.
-+	  if test -z "$run"; then
-+	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-+	    exit $EXIT_FAILURE
-+	  else
-+	    # Dry-run case.
-+
-+	    # Extract subdirectory from the argument.
-+	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-+	    if test "X$xdir" = "X$arg"; then
-+	      xdir=
-+	    else
-+	      xdir="$xdir/"
-+	    fi
-+
-+	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-+	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-+	    libobjs="$libobjs $pic_object"
-+	    non_pic_objects="$non_pic_objects $non_pic_object"
-+	  fi
- 	fi
- 	;;
- 
-@@ -1274,7 +1827,7 @@ compiler."
-     if test -n "$prev"; then
-       $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-@@ -1283,6 +1836,7 @@ compiler."
-       finalize_command="$finalize_command $arg"
-     fi
- 
-+    oldlibs=
-     # calculate the name of the file, without its directory
-     outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-     libobjs_save="$libobjs"
-@@ -1303,11 +1857,11 @@ compiler."
-       output_objdir="$output_objdir/$objdir"
-     fi
-     # Create the object directory.
--    if test ! -d $output_objdir; then
-+    if test ! -d "$output_objdir"; then
-       $show "$mkdir $output_objdir"
-       $run $mkdir $output_objdir
-       status=$?
--      if test $status -ne 0 && test ! -d $output_objdir; then
-+      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
- 	exit $status
-       fi
-     fi
-@@ -1317,7 +1871,7 @@ compiler."
-     "")
-       $echo "$modename: you must specify an output file" 1>&2
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-       ;;
-     *.$libext) linkmode=oldlib ;;
-     *.lo | *.$objext) linkmode=obj ;;
-@@ -1325,16 +1879,47 @@ compiler."
-     *) linkmode=prog ;; # Anything else should be a program.
-     esac
- 
-+    case $host in
-+    *cygwin* | *mingw* | *pw32*)
-+      # don't eliminate duplications in $postdeps and $predeps
-+      duplicate_compiler_generated_deps=yes
-+      ;;
-+    *)
-+      duplicate_compiler_generated_deps=$duplicate_deps
-+      ;;
-+    esac
-     specialdeplibs=
-+
-     libs=
-     # Find all interdependent deplibs by searching for libraries
-     # that are linked more than once (e.g. -la -lb -la)
-     for deplib in $deplibs; do
--      case "$libs " in
--      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--      esac
-+      if test "X$duplicate_deps" = "Xyes" ; then
-+	case "$libs " in
-+	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	esac
-+      fi
-       libs="$libs $deplib"
-     done
-+
-+    if test "$linkmode" = lib; then
-+      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-+
-+      # Compute libraries that are listed more than once in $predeps
-+      # $postdeps and mark them as special (i.e., whose duplicates are
-+      # not to be eliminated).
-+      pre_post_deps=
-+      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-+	for pre_post_dep in $predeps $postdeps; do
-+	  case "$pre_post_deps " in
-+	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-+	  esac
-+	  pre_post_deps="$pre_post_deps $pre_post_dep"
-+	done
-+      fi
-+      pre_post_deps=
-+    fi
-+
-     deplibs=
-     newdependency_libs=
-     newlib_search_path=
-@@ -1349,7 +1934,7 @@ compiler."
- 	  *.la) ;;
- 	  *)
- 	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	    ;;
- 	  esac
- 	done
-@@ -1366,39 +1951,59 @@ compiler."
- 	;;
-     esac
-     for pass in $passes; do
--      if test $linkmode = prog; then
--	# Determine which files to process
-+      if test "$linkmode,$pass" = "lib,link" ||
-+	 test "$linkmode,$pass" = "prog,scan"; then
-+	libs="$deplibs"
-+	deplibs=
-+      fi
-+      if test "$linkmode" = prog; then
- 	case $pass in
--	dlopen)
--	  libs="$dlfiles"
--	  save_deplibs="$deplibs" # Collect dlpreopened libraries
--	  deplibs=
--	  ;;
-+	dlopen) libs="$dlfiles" ;;
- 	dlpreopen) libs="$dlprefiles" ;;
- 	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
- 	esac
-       fi
-+      if test "$pass" = dlopen; then
-+	# Collect dlpreopened libraries
-+	save_deplibs="$deplibs"
-+	deplibs=
-+      fi
-       for deplib in $libs; do
- 	lib=
- 	found=no
- 	case $deplib in
-+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	  fi
-+	  continue
-+	  ;;
- 	-l*)
--	  if test $linkmode = oldlib && test $linkmode = obj; then
--	    $echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
-+	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-+	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
- 	    continue
- 	  fi
--	  if test $pass = conv; then
-+	  if test "$pass" = conv; then
- 	    deplibs="$deplib $deplibs"
- 	    continue
- 	  fi
- 	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
- 	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
--	    # Search the libtool library
--	    lib="$searchdir/lib${name}.la"
--	    if test -f "$lib"; then
--	      found=yes
--	      break
--	    fi
-+	    for search_ext in .la $std_shrext .so .a; do
-+	      # Search the libtool library
-+	      lib="$searchdir/lib${name}${search_ext}"
-+	      if test -f "$lib"; then
-+		if test "$search_ext" = ".la"; then
-+		  found=yes
-+		else
-+		  found=no
-+		fi
-+		break 2
-+	      fi
-+	    done
- 	  done
- 	  if test "$found" != yes; then
- 	    # deplib doesn't seem to be a libtool library
-@@ -1407,40 +2012,76 @@ compiler."
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    else
- 	      deplibs="$deplib $deplibs"
--	      test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
-+	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- 	    fi
- 	    continue
-+	  else # deplib is a libtool library
-+	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-+	    # We need to do some special things here, and not later.
-+	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+	      case " $predeps $postdeps " in
-+	      *" $deplib "*)
-+		if (${SED} -e '2q' $lib |
-+                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+		  library_names=
-+		  old_library=
-+		  case $lib in
-+		  */* | *\\*) . $lib ;;
-+		  *) . ./$lib ;;
-+		  esac
-+		  for l in $old_library $library_names; do
-+		    ll="$l"
-+		  done
-+		  if test "X$ll" = "X$old_library" ; then # only static version available
-+		    found=no
-+		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-+		    test "X$ladir" = "X$lib" && ladir="."
-+		    lib=$ladir/$old_library
-+		    if test "$linkmode,$pass" = "prog,link"; then
-+		      compile_deplibs="$deplib $compile_deplibs"
-+		      finalize_deplibs="$deplib $finalize_deplibs"
-+		    else
-+		      deplibs="$deplib $deplibs"
-+		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-+		    fi
-+		    continue
-+		  fi
-+		fi
-+	        ;;
-+	      *) ;;
-+	      esac
-+	    fi
- 	  fi
- 	  ;; # -l
- 	-L*)
- 	  case $linkmode in
- 	  lib)
- 	    deplibs="$deplib $deplibs"
--	    test $pass = conv && continue
-+	    test "$pass" = conv && continue
- 	    newdependency_libs="$deplib $newdependency_libs"
- 	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- 	    ;;
- 	  prog)
--	    if test $pass = conv; then
-+	    if test "$pass" = conv; then
- 	      deplibs="$deplib $deplibs"
- 	      continue
- 	    fi
--	    if test $pass = scan; then
-+	    if test "$pass" = scan; then
- 	      deplibs="$deplib $deplibs"
--	      newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- 	    else
- 	      compile_deplibs="$deplib $compile_deplibs"
- 	      finalize_deplibs="$deplib $finalize_deplibs"
- 	    fi
-+	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
- 	    ;;
- 	  *)
--	    $echo "$modename: warning: \`-L' is ignored for archives/objects: $deplib" 1>&2
-+	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
- 	    ;;
- 	  esac # linkmode
- 	  continue
- 	  ;; # -L
- 	-R*)
--	  if test $pass = link; then
-+	  if test "$pass" = link; then
- 	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
- 	    # Make sure the xrpath contains only unique directories.
- 	    case "$xrpath " in
-@@ -1453,28 +2094,45 @@ compiler."
- 	  ;;
- 	*.la) lib="$deplib" ;;
- 	*.$libext)
--	  if test $pass = conv; then
-+	  if test "$pass" = conv; then
- 	    deplibs="$deplib $deplibs"
- 	    continue
- 	  fi
- 	  case $linkmode in
- 	  lib)
--	    if test "$deplibs_check_method" != pass_all; then
--	      echo
--	      echo "*** Warning: This library needs some functionality provided by $deplib."
--	      echo "*** I have the capability to make that library automatically link in when"
--	      echo "*** you link to this library.  But I can only do this if you have a"
--	      echo "*** shared version of the library, which you do not appear to have."
-+	    valid_a_lib=no
-+	    case $deplibs_check_method in
-+	      match_pattern*)
-+		set dummy $deplibs_check_method
-+	        match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-+		if eval $echo \"$deplib\" 2>/dev/null \
-+		    | $SED 10q \
-+		    | $EGREP "$match_pattern_regex" > /dev/null; then
-+		  valid_a_lib=yes
-+		fi
-+		;;
-+	      pass_all)
-+		valid_a_lib=yes
-+		;;
-+            esac
-+	    if test "$valid_a_lib" != yes; then
-+	      $echo
-+	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-+	      $echo "*** I have the capability to make that library automatically link in when"
-+	      $echo "*** you link to this library.  But I can only do this if you have a"
-+	      $echo "*** shared version of the library, which you do not appear to have"
-+	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-+	      $echo "*** that it is just a static archive that I should not used here."
- 	    else
--	      echo
--	      echo "*** Warning: Linking the shared library $output against the"
--	      echo "*** static library $deplib is not portable!"
-+	      $echo
-+	      $echo "*** Warning: Linking the shared library $output against the"
-+	      $echo "*** static library $deplib is not portable!"
- 	      deplibs="$deplib $deplibs"
- 	    fi
- 	    continue
- 	    ;;
- 	  prog)
--	    if test $pass != link; then
-+	    if test "$pass" != link; then
- 	      deplibs="$deplib $deplibs"
- 	    else
- 	      compile_deplibs="$deplib $compile_deplibs"
-@@ -1485,14 +2143,18 @@ compiler."
- 	  esac # linkmode
- 	  ;; # *.$libext
- 	*.lo | *.$objext)
--	  if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
--	    # If there is no dlopen support or we're linking statically,
--	    # we need to preload.
--	    newdlprefiles="$newdlprefiles $deplib"
--	    compile_deplibs="$deplib $compile_deplibs"
--	    finalize_deplibs="$deplib $finalize_deplibs"
--	  else
--	    newdlfiles="$newdlfiles $deplib"
-+	  if test "$pass" = conv; then
-+	    deplibs="$deplib $deplibs"
-+	  elif test "$linkmode" = prog; then
-+	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	      # If there is no dlopen support or we're linking statically,
-+	      # we need to preload.
-+	      newdlprefiles="$newdlprefiles $deplib"
-+	      compile_deplibs="$deplib $compile_deplibs"
-+	      finalize_deplibs="$deplib $finalize_deplibs"
-+	    else
-+	      newdlfiles="$newdlfiles $deplib"
-+	    fi
- 	  fi
- 	  continue
- 	  ;;
-@@ -1501,17 +2163,17 @@ compiler."
- 	  continue
- 	  ;;
- 	esac # case $deplib
--	if test $found = yes || test -f "$lib"; then :
-+	if test "$found" = yes || test -f "$lib"; then :
- 	else
- 	  $echo "$modename: cannot find the library \`$lib'" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	# Check to see that this really is a libtool archive.
--	if (sed -e '2q' $lib | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
- 	else
- 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-@@ -1524,8 +2186,9 @@ compiler."
- 	library_names=
- 	old_library=
- 	# If the library was installed with an old release of libtool,
--	# it will not redefine variable installed.
-+	# it will not redefine variables installed, or shouldnotlink
- 	installed=yes
-+	shouldnotlink=no
- 
- 	# Read the .la file
- 	case $lib in
-@@ -1535,19 +2198,18 @@ compiler."
- 
- 	if test "$linkmode,$pass" = "lib,link" ||
- 	   test "$linkmode,$pass" = "prog,scan" ||
--	   { test $linkmode = oldlib && test $linkmode = obj; }; then
--	   # Add dl[pre]opened files of deplib
-+	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
- 	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
- 	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
- 	fi
- 
--	if test $pass = conv; then
-+	if test "$pass" = conv; then
- 	  # Only check for convenience libraries
- 	  deplibs="$lib $deplibs"
- 	  if test -z "$libdir"; then
- 	    if test -z "$old_library"; then
- 	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
--	      exit 1
-+	      exit $EXIT_FAILURE
- 	    fi
- 	    # It is a libtool convenience library, so add in its objects.
- 	    convenience="$convenience $ladir/$objdir/$old_library"
-@@ -1555,18 +2217,21 @@ compiler."
- 	    tmp_libs=
- 	    for deplib in $dependency_libs; do
- 	      deplibs="$deplib $deplibs"
--	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	      esac
-+              if test "X$duplicate_deps" = "Xyes" ; then
-+	        case "$tmp_libs " in
-+	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	        esac
-+              fi
- 	      tmp_libs="$tmp_libs $deplib"
- 	    done
--	  elif test $linkmode != prog && test $linkmode != lib; then
-+	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
- 	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 	  continue
- 	fi # $pass = conv
- 
-+
- 	# Get the name of the library we link against.
- 	linklib=
- 	for l in $old_library $library_names; do
-@@ -1574,19 +2239,23 @@ compiler."
- 	done
- 	if test -z "$linklib"; then
- 	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	# This library was specified with -dlopen.
--	if test $pass = dlopen; then
-+	if test "$pass" = dlopen; then
- 	  if test -z "$libdir"; then
- 	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
--	  if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-+	  if test -z "$dlname" ||
-+	     test "$dlopen_support" != yes ||
-+	     test "$build_libtool_libs" = no; then
- 	    # If there is no dlname, no dlopen support or we're linking
--	    # statically, we need to preload.
--	    dlprefiles="$dlprefiles $lib"
-+	    # statically, we need to preload.  We also need to preload any
-+	    # dependent libraries so libltdl's deplib preloader doesn't
-+	    # bomb out in the load deplibs phase.
-+	    dlprefiles="$dlprefiles $lib $dependency_libs"
- 	  else
- 	    newdlfiles="$newdlfiles $lib"
- 	  fi
-@@ -1615,22 +2284,35 @@ compiler."
- 	    absdir="$abs_ladir"
- 	    libdir="$abs_ladir"
- 	  else
--	    dir="$libdir"
--	    absdir="$libdir"
-+            # Adding 'libdir' from the .la file to our library search paths
-+            # breaks crosscompilation horribly.  We cheat here and don't add
-+            # it, instead adding the path where we found the .la.  -CL
-+	    dir="$abs_ladir"
-+	    absdir="$abs_ladir"
-+	    libdir="$abs_ladir"
-+	    #dir="$libdir"
-+	    #absdir="$libdir"
- 	  fi
- 	else
--	  dir="$ladir/$objdir"
--	  absdir="$abs_ladir/$objdir"
--	  # Remove this search path later
--	  notinst_path="$notinst_path $abs_ladir"
-+	  if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-+	    dir="$ladir"
-+	    absdir="$abs_ladir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  else
-+	    dir="$ladir/$objdir"
-+	    absdir="$abs_ladir/$objdir"
-+	    # Remove this search path later
-+	    notinst_path="$notinst_path $abs_ladir"
-+	  fi
- 	fi # $installed = yes
- 	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
- 
- 	# This library was specified with -dlpreopen.
--	if test $pass = dlpreopen; then
-+	if test "$pass" = dlpreopen; then
- 	  if test -z "$libdir"; then
- 	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
--	    exit 1
-+	    exit $EXIT_FAILURE
- 	  fi
- 	  # Prefer using a static library (so that no silly _DYNAMIC symbols
- 	  # are required to link).
-@@ -1646,18 +2328,19 @@ compiler."
- 
- 	if test -z "$libdir"; then
- 	  # Link the convenience library
--	  if test $linkmode = lib; then
-+	  if test "$linkmode" = lib; then
- 	    deplibs="$dir/$old_library $deplibs"
- 	  elif test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$dir/$old_library $compile_deplibs"
- 	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
- 	  else
--	    deplibs="$lib $deplibs"
-+	    deplibs="$lib $deplibs" # used for prog,scan pass
- 	  fi
- 	  continue
- 	fi
- 
--	if test $linkmode = prog && test $pass != link; then
-+
-+	if test "$linkmode" = prog && test "$pass" != link; then
- 	  newlib_search_path="$newlib_search_path $ladir"
- 	  deplibs="$lib $deplibs"
- 
-@@ -1673,28 +2356,36 @@ compiler."
- 	    -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?
--	    if test $linkalldeplibs = yes; then
-+	    if test "$linkalldeplibs" = yes; then
- 	      deplibs="$deplib $deplibs"
- 	    else
- 	      # Need to hardcode shared library paths
- 	      # or/and link against static libraries
- 	      newdependency_libs="$deplib $newdependency_libs"
- 	    fi
--	    case "$tmp_libs " in
--	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	    esac
-+	    if test "X$duplicate_deps" = "Xyes" ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
- 	    tmp_libs="$tmp_libs $deplib"
- 	  done # for deplib
- 	  continue
- 	fi # $linkmode = prog...
- 
--	link_static=no # Whether the deplib will be linked statically
--	if test -n "$library_names" &&
--	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
--	  # 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
-+	    # We need to hardcode the library path
-+	    if test -n "$shlibpath_var"; then
-+	      # Make sure the rpath contains only unique directories.
-+	      case "$temp_rpath " in
-+	      *" $dir "*) ;;
-+	      *" $absdir "*) ;;
-+	      *) temp_rpath="$temp_rpath $dir" ;;
-+	      esac
-+	    fi
- 
--	  if test "$linkmode,$pass" = "prog,link" ||
--	   { test $linkmode = lib && test $hardcode_into_libs = yes; }; then
- 	    # Hardcode the library path.
- 	    # Skip directories that are in the system default run-time
- 	    # search path.
-@@ -1716,17 +2407,6 @@ compiler."
- 	      esac
- 	      ;;
- 	    esac
--	    if test $linkmode = prog; then
--	      # We need to hardcode the library path
--	      if test -n "$shlibpath_var"; then
--		# Make sure the rpath contains only unique directories.
--		case "$temp_rpath " in
--		*" $dir "*) ;;
--		*" $absdir "*) ;;
--		*) temp_rpath="$temp_rpath $dir" ;;
--		esac
--	      fi
--	    fi
- 	  fi # $linkmode,$pass = prog,link...
- 
- 	  if test "$alldeplibs" = yes &&
-@@ -1736,11 +2416,52 @@ compiler."
- 	    # We only need to search for static libraries
- 	    continue
- 	  fi
-+	fi
- 
-+	link_static=no # Whether the deplib will be linked statically
-+	if test -n "$library_names" &&
-+	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- 	  if test "$installed" = no; then
- 	    notinst_deplibs="$notinst_deplibs $lib"
- 	    need_relink=yes
- 	  fi
-+	  # This is a shared library
-+
-+	  # Warn about portability, can't link against -module's on
-+	  # some systems (darwin)
-+	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-+	    $echo
-+	    if test "$linkmode" = prog; then
-+	      $echo "*** Warning: Linking the executable $output against the loadable module"
-+	    else
-+	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-+	    fi
-+	    $echo "*** $linklib is not portable!"
-+	  fi
-+	  if test "$linkmode" = lib &&
-+	     test "$hardcode_into_libs" = yes; then
-+	    # Hardcode the library path.
-+	    # Skip directories that are in the system default run-time
-+	    # search path.
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $absdir "*) ;;
-+	    *)
-+	      case "$compile_rpath " in
-+	      *" $absdir "*) ;;
-+	      *) compile_rpath="$compile_rpath $absdir"
-+	      esac
-+	      ;;
-+	    esac
-+	    case " $sys_lib_dlsearch_path " in
-+	    *" $libdir "*) ;;
-+	    *)
-+	      case "$finalize_rpath " in
-+	      *" $libdir "*) ;;
-+	      *) finalize_rpath="$finalize_rpath $libdir"
-+	      esac
-+	      ;;
-+	    esac
-+	  fi
- 
- 	  if test -n "$old_archive_from_expsyms_cmds"; then
- 	    # figure out the soname
-@@ -1754,7 +2475,7 @@ compiler."
- 	    elif test -n "$soname_spec"; then
- 	      # bleh windows
- 	      case $host in
--	      *cygwin*)
-+	      *cygwin* | mingw*)
- 		major=`expr $current - $age`
- 		versuffix="-$major"
- 		;;
-@@ -1766,17 +2487,18 @@ compiler."
- 
- 	    # Make a new name for the extract_expsyms_cmds to use
- 	    soroot="$soname"
--	    soname=`echo $soroot | sed -e 's/^.*\///'`
--	    newlib="libimp-`echo $soname | sed 's/^lib//;s/\.dll$//'`.a"
-+	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-+	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
- 
- 	    # If the library has no export list, then create one now
- 	    if test -f "$output_objdir/$soname-def"; then :
- 	    else
- 	      $show "extracting exported symbol list from \`$soname'"
- 	      save_ifs="$IFS"; IFS='~'
--	      eval cmds=\"$extract_expsyms_cmds\"
-+	      cmds=$extract_expsyms_cmds
- 	      for cmd in $cmds; do
- 		IFS="$save_ifs"
-+		eval cmd=\"$cmd\"
- 		$show "$cmd"
- 		$run eval "$cmd" || exit $?
- 	      done
-@@ -1787,9 +2509,10 @@ compiler."
- 	    if test -f "$output_objdir/$newlib"; then :; else
- 	      $show "generating import library for \`$soname'"
- 	      save_ifs="$IFS"; IFS='~'
--	      eval cmds=\"$old_archive_from_expsyms_cmds\"
-+	      cmds=$old_archive_from_expsyms_cmds
- 	      for cmd in $cmds; do
- 		IFS="$save_ifs"
-+		eval cmd=\"$cmd\"
- 		$show "$cmd"
- 		$run eval "$cmd" || exit $?
- 	      done
-@@ -1798,9 +2521,9 @@ compiler."
- 	    # make sure the library variables are pointing to the new library
- 	    dir=$output_objdir
- 	    linklib=$newlib
--	  fi # test -n $old_archive_from_expsyms_cmds
-+	  fi # test -n "$old_archive_from_expsyms_cmds"
- 
--	  if test $linkmode = prog || test "$mode" != relink; then
-+	  if test "$linkmode" = prog || test "$mode" != relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
-@@ -1809,6 +2532,22 @@ compiler."
- 	    immediate | unsupported)
- 	      if test "$hardcode_direct" = no; then
- 		add="$dir/$linklib"
-+		case $host in
-+		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-+		  *-*-darwin* )
-+		    # if the lib is a module then we can not link against
-+		    # it, someone is ignoring the new warnings I added
-+		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
-+		      $echo "** Warning, lib $linklib is a module, not a shared library"
-+		      if test -z "$old_library" ; then
-+		        $echo
-+		        $echo "** And there doesn't seem to be a static archive available"
-+		        $echo "** The link will probably fail, sorry"
-+		      else
-+		        add="$dir/$old_library"
-+		      fi
-+		    fi
-+		esac
- 	      elif test "$hardcode_minus_L" = no; then
- 		case $host in
- 		*-*-sunos*) add_shlibpath="$dir" ;;
-@@ -1827,6 +2566,14 @@ compiler."
- 		add="$dir/$linklib"
- 	      elif test "$hardcode_minus_L" = yes; then
- 		add_dir="-L$dir"
-+		# Try looking first in the location we're being installed to.
-+		if test -n "$inst_prefix_dir"; then
-+		  case "$libdir" in
-+		    [\\/]*)
-+		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		      ;;
-+		  esac
-+		fi
- 		add="-l$name"
- 	      elif test "$hardcode_shlibpath_var" = yes; then
- 		add_shlibpath="$dir"
-@@ -1840,7 +2587,7 @@ compiler."
- 
- 	    if test "$lib_linked" != yes; then
- 	      $echo "$modename: configuration error: unsupported hardcode properties"
--	      exit 1
-+	      exit $EXIT_FAILURE
- 	    fi
- 
- 	    if test -n "$add_shlibpath"; then
-@@ -1849,7 +2596,7 @@ compiler."
- 	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
- 	      esac
- 	    fi
--	    if test $linkmode = prog; then
-+	    if test "$linkmode" = prog; then
- 	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
- 	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
- 	    else
-@@ -1866,7 +2613,7 @@ compiler."
- 	    fi
- 	  fi
- 
--	  if test $linkmode = prog || test "$mode" = relink; then
-+	  if test "$linkmode" = prog || test "$mode" = relink; then
- 	    add_shlibpath=
- 	    add_dir=
- 	    add=
-@@ -1882,13 +2629,26 @@ compiler."
- 	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
- 	      esac
- 	      add="-l$name"
-+	    elif test "$hardcode_automatic" = yes; then
-+	      if test -n "$inst_prefix_dir" &&
-+		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-+	        add="$inst_prefix_dir$libdir/$linklib"
-+	      else
-+	        add="$libdir/$linklib"
-+	      fi
- 	    else
--	      # We cannot seem to hardcode it, guess we'll fake it.
--	      add_dir="-L$libdir"
-+	      # Try looking first in the location we're being installed to.
-+	      if test -n "$inst_prefix_dir"; then
-+		case "$libdir" in
-+		  [\\/]*)
-+		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-+		    ;;
-+		esac
-+	      fi
- 	      add="-l$name"
- 	    fi
- 
--	    if test $linkmode = prog; then
-+	    if test "$linkmode" = prog; then
- 	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
- 	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
- 	    else
-@@ -1896,16 +2656,7 @@ compiler."
- 	      test -n "$add" && deplibs="$add $deplibs"
- 	    fi
- 	  fi
--	elif test $linkmode = prog; then
--	  if test "$alldeplibs" = yes &&
--	     { test "$deplibs_check_method" = pass_all ||
--	       { test "$build_libtool_libs" = yes &&
--		 test -n "$library_names"; }; }; then
--	    # We only need to search for static libraries
--	    continue
--	  fi
--
--	  # Try to link the static library
-+	elif test "$linkmode" = prog; then
- 	  # 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.
-@@ -1925,20 +2676,21 @@ compiler."
- 
- 	    # Just print a warning and add the library to dependency_libs so
- 	    # that the program can be linked against the static library.
--	    echo
--	    echo "*** Warning: This library needs some functionality provided by $lib."
--	    echo "*** I have the capability to make that library automatically link in when"
--	    echo "*** you link to this library.  But I can only do this if you have a"
--	    echo "*** shared version of the library, which you do not appear to have."
-+	    $echo
-+	    $echo "*** Warning: This system can not link to static lib archive $lib."
-+	    $echo "*** I have the capability to make that library automatically link in when"
-+	    $echo "*** you link to this library.  But I can only do this if you have a"
-+	    $echo "*** shared version of the library, which you do not appear to have."
- 	    if test "$module" = yes; then
--	      echo "*** Therefore, libtool will create a static module, that should work "
--	      echo "*** as long as the dlopening application is linked with the -dlopen flag."
-+	      $echo "*** But as you try to build a module library, libtool will still create "
-+	      $echo "*** a static module, that should work as long as the dlopening application"
-+	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
- 	      if test -z "$global_symbol_pipe"; then
--		echo
--		echo "*** However, this would only work if libtool was able to extract symbol"
--		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
--		echo "*** not find such a program.  So, this module is probably useless."
--		echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+		$echo
-+		$echo "*** However, this would only work if libtool was able to extract symbol"
-+		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+		$echo "*** not find such a program.  So, this module is probably useless."
-+		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	      fi
- 	      if test "$build_old_libs" = no; then
- 		build_libtool_libs=module
-@@ -1955,10 +2707,11 @@ compiler."
- 	  fi
- 	fi # link shared/static library?
- 
--	if test $linkmode = lib; then
-+	if test "$linkmode" = lib; then
- 	  if test -n "$dependency_libs" &&
--	     { test $hardcode_into_libs != yes || test $build_old_libs = yes ||
--	       test $link_static = yes; }; then
-+	     { test "$hardcode_into_libs" != yes ||
-+	       test "$build_old_libs" = yes ||
-+	       test "$link_static" = yes; }; then
- 	    # Extract -R from dependency_libs
- 	    temp_deplibs=
- 	    for libdir in $dependency_libs; do
-@@ -1981,13 +2734,15 @@ compiler."
- 	  tmp_libs=
- 	  for deplib in $dependency_libs; do
- 	    newdependency_libs="$deplib $newdependency_libs"
--	    case "$tmp_libs " in
--	    *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	    esac
-+	    if test "X$duplicate_deps" = "Xyes" ; then
-+	      case "$tmp_libs " in
-+	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-+	      esac
-+	    fi
- 	    tmp_libs="$tmp_libs $deplib"
- 	  done
- 
--	  if test $link_all_deplibs != no; then
-+	  if test "$link_all_deplibs" != no; then
- 	    # Add the search paths of all dependency libraries
- 	    for deplib in $dependency_libs; do
- 	      case $deplib in
-@@ -2006,23 +2761,95 @@ compiler."
- 		  fi
- 		  ;;
- 		esac
--		if grep "^installed=no" $deplib > /dev/null; then
--		  path="-L$absdir/$objdir"
--		else
--		  eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+#		OE changes to installed=no which means we can't run the original test
-+#		and just look in $objdir. We therefore look in both, preferring 
-+#		$objdir if it exists, see below. - RP 29/11/2007
-+#		if grep "^installed=no" $deplib > /dev/null; then
-+#		  path="$absdir/$objdir"
-+#		This interferes with crosscompilation. -CL
-+#		else
-+#		  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
-+#		    exit 1
-+#		  fi
-+#		  if test "$absdir" != "$libdir"; then
-+#		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-+#		  fi
-+		if ! grep "^installed=no" $deplib > /dev/null; then
-+		  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
--		    exit 1
-+		    exit $EXIT_FAILURE
- 		  fi
- 		  if test "$absdir" != "$libdir"; then
- 		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
- 		  fi
--		  path="-L$absdir"
-+		  path="$absdir"
- 		fi
-+		depdepl=
-+		case $host in
-+		*-*-darwin*)
-+		  # we do not want to link against static libs,
-+		  # but need to link against shared
-+		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-+		  if test -n "$deplibrary_names" ; then
-+		    for tmp in $deplibrary_names ; do
-+		      depdepl=$tmp
-+		    done
-+
-+		    if test -f "$absdir/$objdir/$depdepl" ; then
-+		      depdepl="$absdir/$objdir/$depdepl"
-+		      path="$absdir/$objdir"
-+		    elif test -f "$absdir/$depdepl" ; then
-+		      depdepl="$absdir/$depdepl"
-+		      path="$absdir"
-+		    else
-+		      path="$absdir/$objdir"
-+		    fi
-+		    
-+		    # do not add paths which are already there
-+		    case " $newlib_search_path " in
-+		    *" $path "*) ;;
-+		    *) newlib_search_path="$newlib_search_path $path";;
-+		    esac
-+		  fi
-+		  path=""
-+		  ;;
-+		*)
-+		  if test -d "$absdir/$objdir" ; then
-+		    path="-L$absdir/$objdir"
-+		  elif test -d "$absdir" ; then
-+		    path="-L$absdir"
-+		  else
-+		    path="-L$absdir/$objdir"
-+		  fi
-+		  ;;
-+		esac
-+		;;
-+	      -l*)
-+		case $host in
-+		*-*-darwin*)
-+		  # Again, we only want to link against shared libraries
-+		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-+		  for tmp in $newlib_search_path ; do
-+		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-+		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-+		      break
-+		    fi
-+		  done
-+		  path=""
-+		  ;;
-+		*) continue ;;
-+		esac
- 		;;
- 	      *) continue ;;
- 	      esac
- 	      case " $deplibs " in
-+	      *" $depdepl "*) ;;
-+	      *) deplibs="$depdepl $deplibs" ;;
-+	      esac
-+	      case " $deplibs " in
- 	      *" $path "*) ;;
- 	      *) deplibs="$deplibs $path" ;;
- 	      esac
-@@ -2030,15 +2857,15 @@ compiler."
- 	  fi # link_all_deplibs != no
- 	fi # linkmode = lib
-       done # for deplib in $libs
--      if test $pass = dlpreopen; then
-+      dependency_libs="$newdependency_libs"
-+      if test "$pass" = dlpreopen; then
- 	# Link the dlpreopened libraries before other libraries
- 	for deplib in $save_deplibs; do
- 	  deplibs="$deplib $deplibs"
- 	done
-       fi
--      if test $pass != dlopen; then
--	test $pass != scan && dependency_libs="$newdependency_libs"
--	if test $pass != conv; then
-+      if test "$pass" != dlopen; then
-+	if test "$pass" != conv; then
- 	  # Make sure lib_search_path contains only unique directories.
- 	  lib_search_path=
- 	  for dir in $newlib_search_path; do
-@@ -2060,9 +2887,30 @@ compiler."
- 	  eval tmp_libs=\"\$$var\"
- 	  new_libs=
- 	  for deplib in $tmp_libs; do
-+	    # FIXME: Pedantically, this is the right thing to do, so
-+	    #        that some nasty dependency loop isn't accidentally
-+	    #        broken:
-+	    #new_libs="$deplib $new_libs"
-+	    # Pragmatically, this seems to cause very few problems in
-+	    # practice:
- 	    case $deplib in
- 	    -L*) new_libs="$deplib $new_libs" ;;
-+	    -R*) ;;
- 	    *)
-+	      # And here is the reason: when a library appears more
-+	      # than once as an explicit dependence of a library, or
-+	      # is implicitly linked in more than once by the
-+	      # compiler, it is considered special, and multiple
-+	      # occurrences thereof are not removed.  Compare this
-+	      # with having the same library being listed as a
-+	      # dependency of multiple other libraries: in this case,
-+	      # we know (pedantically, we assume) the library does not
-+	      # need to be listed more than once, so we keep only the
-+	      # last copy.  This is not always right, but it is rare
-+	      # enough that we require users that really mean to play
-+	      # such unportable linking tricks to link the library
-+	      # using -Wl,-lname, so that libtool does not consider it
-+	      # for duplicate removal.
- 	      case " $specialdeplibs " in
- 	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
- 	      *)
-@@ -2090,19 +2938,32 @@ compiler."
- 	  eval $var=\"$tmp_libs\"
- 	done # for var
-       fi
--      if test "$pass" = "conv" &&
--       { test "$linkmode" = "lib" || test "$linkmode" = "prog"; }; then
--	libs="$deplibs" # reset libs
--	deplibs=
--      fi
-+      # Last step: remove runtime libs from dependency_libs
-+      # (they stay in deplibs)
-+      tmp_libs=
-+      for i in $dependency_libs ; do
-+	case " $predeps $postdeps $compiler_lib_search_path " in
-+	*" $i "*)
-+	  i=""
-+	  ;;
-+	esac
-+	if test -n "$i" ; then
-+	  tmp_libs="$tmp_libs $i"
-+	fi
-+      done
-+      dependency_libs=$tmp_libs
-     done # for pass
--    if test $linkmode = prog; then
-+    if test "$linkmode" = prog; then
-       dlfiles="$newdlfiles"
-       dlprefiles="$newdlprefiles"
-     fi
- 
-     case $linkmode in
-     oldlib)
-+      if test -n "$deplibs"; then
-+	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-+      fi
-+
-       if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- 	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-       fi
-@@ -2116,7 +2977,7 @@ compiler."
-       fi
- 
-       if test -n "$vinfo"; then
--	$echo "$modename: warning: \`-version-info' is ignored for archives" 1>&2
-+	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-       fi
- 
-       if test -n "$release"; then
-@@ -2138,17 +2999,19 @@ compiler."
-       case $outputname in
-       lib*)
- 	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-+	eval shared_ext=\"$shrext_cmds\"
- 	eval libname=\"$libname_spec\"
- 	;;
-       *)
- 	if test "$module" = no; then
- 	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 	if test "$need_lib_prefix" != no; then
- 	  # Add the "lib" prefix for modules if required
- 	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-+	  eval shared_ext=\"$shrext_cmds\"
- 	  eval libname=\"$libname_spec\"
- 	else
- 	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-@@ -2159,11 +3022,11 @@ compiler."
-       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
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	else
--	  echo
--	  echo "*** Warning: Linking the shared library $output against the non-libtool"
--	  echo "*** objects $objs is not portable!"
-+	  $echo
-+	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-+	  $echo "*** objects $objs is not portable!"
- 	  libobjs="$libobjs $objs"
- 	fi
-       fi
-@@ -2173,7 +3036,7 @@ compiler."
-       fi
- 
-       set dummy $rpath
--      if test $# -gt 2; then
-+      if test "$#" -gt 2; then
- 	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-       fi
-       install_libdir="$2"
-@@ -2182,14 +3045,16 @@ compiler."
-       if test -z "$rpath"; then
- 	if test "$build_libtool_libs" = yes; then
- 	  # Building a libtool convenience library.
--	  libext=al
-+	  # Some compilers have problems with a `.al' extension so
-+	  # convenience libraries should have the same extension an
-+	  # archive normally would.
- 	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
- 	  build_libtool_libs=convenience
- 	  build_old_libs=yes
- 	fi
- 
- 	if test -n "$vinfo"; then
--	  $echo "$modename: warning: \`-version-info' is ignored for convenience libraries" 1>&2
-+	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
- 	fi
- 
- 	if test -n "$release"; then
-@@ -2205,45 +3070,82 @@ compiler."
- 	if test -n "$8"; then
- 	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
--	current="$2"
--	revision="$3"
--	age="$4"
-+	# convert absolute version numbers to libtool ages
-+	# this retains compatibility with .la files and attempts
-+	# to make the code below a bit more comprehensible
-+
-+	case $vinfo_number in
-+	yes)
-+	  number_major="$2"
-+	  number_minor="$3"
-+	  number_revision="$4"
-+	  #
-+	  # There are really only two kinds -- those that
-+	  # use the current revision as the major version
-+	  # and those that subtract age and use age as
-+	  # a minor version.  But, then there is irix
-+	  # which has an extra 1 added just for fun
-+	  #
-+	  case $version_type in
-+	  darwin|linux|osf|windows)
-+	    current=`expr $number_major + $number_minor`
-+	    age="$number_minor"
-+	    revision="$number_revision"
-+	    ;;
-+	  freebsd-aout|freebsd-elf|sunos)
-+	    current="$number_major"
-+	    revision="$number_minor"
-+	    age="0"
-+	    ;;
-+	  irix|nonstopux)
-+	    current=`expr $number_major + $number_minor - 1`
-+	    age="$number_minor"
-+	    revision="$number_minor"
-+	    ;;
-+	  esac
-+	  ;;
-+	no)
-+	  current="$2"
-+	  revision="$3"
-+	  age="$4"
-+	  ;;
-+	esac
- 
- 	# Check that each of the things are valid numbers.
- 	case $current in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	0 | [1-9] | [1-9][0-9]*) ;;
- 	*)
- 	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 
- 	case $revision in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	0 | [1-9] | [1-9][0-9]*) ;;
- 	*)
- 	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 
- 	case $age in
--	0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
-+	0 | [1-9] | [1-9][0-9]*) ;;
- 	*)
- 	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 
--	if test $age -gt $current; then
-+	if test "$age" -gt "$current"; then
- 	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
- 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	# Calculate the version variables.
-@@ -2260,7 +3162,7 @@ compiler."
- 	  versuffix="$major.$age.$revision"
- 	  # Darwin ld doesn't like 0 for these options...
- 	  minor_current=`expr $current + 1`
--	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-+	  verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
- 	  ;;
- 
- 	freebsd-aout)
-@@ -2273,16 +3175,21 @@ compiler."
- 	  versuffix=".$current";
- 	  ;;
- 
--	irix)
-+	irix | nonstopux)
- 	  major=`expr $current - $age + 1`
--	  verstring="sgi$major.$revision"
-+
-+	  case $version_type in
-+	    nonstopux) verstring_prefix=nonstopux ;;
-+	    *)         verstring_prefix=sgi ;;
-+	  esac
-+	  verstring="$verstring_prefix$major.$revision"
- 
- 	  # Add in all the interfaces that we are compatible with.
- 	  loop=$revision
--	  while test $loop != 0; do
-+	  while test "$loop" -ne 0; do
- 	    iface=`expr $revision - $loop`
- 	    loop=`expr $loop - 1`
--	    verstring="sgi$major.$iface:$verstring"
-+	    verstring="$verstring_prefix$major.$iface:$verstring"
- 	  done
- 
- 	  # Before this point, $major must not contain `.'.
-@@ -2296,13 +3203,13 @@ compiler."
- 	  ;;
- 
- 	osf)
--	  major=`expr $current - $age`
-+	  major=.`expr $current - $age`
- 	  versuffix=".$current.$age.$revision"
- 	  verstring="$current.$age.$revision"
- 
- 	  # Add in all the interfaces that we are compatible with.
- 	  loop=$age
--	  while test $loop != 0; do
-+	  while test "$loop" -ne 0; do
- 	    iface=`expr $current - $loop`
- 	    loop=`expr $loop - 1`
- 	    verstring="$verstring:${iface}.0"
-@@ -2326,20 +3233,19 @@ compiler."
- 
- 	*)
- 	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
--	  echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
--	  exit 1
-+	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 
- 	# Clear the version info if we defaulted, and they specified a release.
- 	if test -z "$vinfo" && test -n "$release"; then
- 	  major=
--	  verstring="0.0"
- 	  case $version_type in
- 	  darwin)
- 	    # we can't check for "0.0" in archive_cmds due to quoting
- 	    # problems, so we reset it completely
--	    verstring=""
-+	    verstring=
- 	    ;;
- 	  *)
- 	    verstring="0.0"
-@@ -2373,9 +3279,30 @@ compiler."
-       fi
- 
-       if test "$mode" != relink; then
--	# Remove our outputs.
--	$show "${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*"
--	$run ${rm}r $output_objdir/$outputname $output_objdir/$libname.* $output_objdir/${libname}${release}.*
-+	# Remove our outputs, but don't remove object files since they
-+	# may have been created when compiling PIC objects.
-+	removelist=
-+	tempremovelist=`$echo "$output_objdir/*"`
-+	for p in $tempremovelist; do
-+	  case $p in
-+	    *.$objext)
-+	       ;;
-+	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-+	       if test "X$precious_files_regex" != "X"; then
-+	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-+	         then
-+		   continue
-+		 fi
-+	       fi
-+	       removelist="$removelist $p"
-+	       ;;
-+	    *) ;;
-+	  esac
-+	done
-+	if test -n "$removelist"; then
-+	  $show "${rm}r $removelist"
-+	  $run ${rm}r $removelist
-+	fi
-       fi
- 
-       # Now set the variables for building old libraries.
-@@ -2388,9 +3315,9 @@ compiler."
- 
-       # Eliminate all temporary directories.
-       for path in $notinst_path; do
--	lib_search_path=`echo "$lib_search_path " | sed -e 's% $path % %g'`
--	deplibs=`echo "$deplibs " | sed -e 's% -L$path % %g'`
--	dependency_libs=`echo "$dependency_libs " | sed -e 's% -L$path % %g'`
-+	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-+	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-+	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-       done
- 
-       if test -n "$xrpath"; then
-@@ -2403,7 +3330,7 @@ compiler."
- 	  *) finalize_rpath="$finalize_rpath $libdir" ;;
- 	  esac
- 	done
--	if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
-+	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
- 	  dependency_libs="$temp_xrpath $dependency_libs"
- 	fi
-       fi
-@@ -2441,12 +3368,13 @@ compiler."
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
--	  *-*-openbsd*)
-+	  *-*-openbsd* | *-*-freebsd*)
- 	    # Do not include libc due to us having libc/libc_r.
-+	    test "X$arg" = "X-lc" && continue
- 	    ;;
--	  *)
-+ 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
--	    if test $build_libtool_need_lc = "yes"; then
-+	    if test "$build_libtool_need_lc" = "yes"; then
- 	      deplibs="$deplibs -lc"
- 	    fi
- 	    ;;
-@@ -2473,7 +3401,7 @@ compiler."
- 	  # 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
--	  # implementing what was already the behaviour.
-+	  # implementing what was already the behavior.
- 	  newdeplibs=$deplibs
- 	  ;;
- 	test_compile)
-@@ -2486,64 +3414,88 @@ compiler."
- 	  int main() { return 0; }
- EOF
- 	  $rm conftest
--	  $CC -o conftest conftest.c $deplibs
--	  if test $? -eq 0 ; then
-+	  $LTCC -o conftest conftest.c $deplibs
-+	  if test "$?" -eq 0 ; then
- 	    ldd_output=`ldd conftest`
- 	    for i in $deplibs; do
- 	      name="`expr $i : '-l\(.*\)'`"
- 	      # If $name is empty we are operating on a -L argument.
--	      if test -n "$name" && test "$name" != "0"; then
--		libname=`eval \\$echo \"$libname_spec\"`
--		deplib_matches=`eval \\$echo \"$library_names_spec\"`
--		set dummy $deplib_matches
--		deplib_match=$2
--		if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--		  newdeplibs="$newdeplibs $i"
--		else
--		  droppeddeps=yes
--		  echo
--		  echo "*** Warning: This library needs some functionality provided by $i."
--		  echo "*** I have the capability to make that library automatically link in when"
--		  echo "*** you link to this library.  But I can only do this if you have a"
--		  echo "*** shared version of the library, which you do not appear to have."
-+              if test "$name" != "" && test "$name" -ne "0"; then
-+		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+		  case " $predeps $postdeps " in
-+		  *" $i "*)
-+		    newdeplibs="$newdeplibs $i"
-+		    i=""
-+		    ;;
-+		  esac
-+	        fi
-+		if test -n "$i" ; then
-+		  libname=`eval \\$echo \"$libname_spec\"`
-+		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-+		  set dummy $deplib_matches
-+		  deplib_match=$2
-+		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		    newdeplibs="$newdeplibs $i"
-+		  else
-+		    droppeddeps=yes
-+		    $echo
-+		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-+		    $echo "*** I have the capability to make that library automatically link in when"
-+		    $echo "*** you link to this library.  But I can only do this if you have a"
-+		    $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."
-+		  fi
- 		fi
- 	      else
- 		newdeplibs="$newdeplibs $i"
- 	      fi
- 	    done
- 	  else
--	    # Error occured in the first compile.  Let's try to salvage the situation:
--	    # Compile a seperate program for each library.
-+	    # Error occurred in the first compile.  Let's try to salvage
-+	    # the situation: Compile a separate program for each library.
- 	    for i in $deplibs; do
- 	      name="`expr $i : '-l\(.*\)'`"
--	     # If $name is empty we are operating on a -L argument.
--	      if test -n "$name" && test "$name" != "0"; then
-+	      # If $name is empty we are operating on a -L argument.
-+              if test "$name" != "" && test "$name" != "0"; then
- 		$rm conftest
--		$CC -o conftest conftest.c $i
-+		$LTCC -o conftest conftest.c $i
- 		# Did it work?
--		if test $? -eq 0 ; then
-+		if test "$?" -eq 0 ; then
- 		  ldd_output=`ldd conftest`
--		  libname=`eval \\$echo \"$libname_spec\"`
--		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
--		  set dummy $deplib_matches
--		  deplib_match=$2
--		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
--		    newdeplibs="$newdeplibs $i"
--		  else
--		    droppeddeps=yes
--		    echo
--		    echo "*** Warning: This library needs some functionality provided by $i."
--		    echo "*** I have the capability to make that library automatically link in when"
--		    echo "*** you link to this library.  But I can only do this if you have a"
--		    echo "*** shared version of the library, which you do not appear to have."
-+		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+		    case " $predeps $postdeps " in
-+		    *" $i "*)
-+		      newdeplibs="$newdeplibs $i"
-+		      i=""
-+		      ;;
-+		    esac
-+		  fi
-+		  if test -n "$i" ; then
-+		    libname=`eval \\$echo \"$libname_spec\"`
-+		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-+		    set dummy $deplib_matches
-+		    deplib_match=$2
-+		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-+		      newdeplibs="$newdeplibs $i"
-+		    else
-+		      droppeddeps=yes
-+		      $echo
-+		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-+		      $echo "*** I have the capability to make that library automatically link in when"
-+		      $echo "*** you link to this library.  But I can only do this if you have a"
-+		      $echo "*** shared version of the library, which you do not appear to have"
-+		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-+		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-+		    fi
- 		  fi
- 		else
- 		  droppeddeps=yes
--		  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 "*** library that it depends on before this library will be fully"
--		  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 "*** 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"
-@@ -2557,11 +3509,20 @@ EOF
- 	  for a_deplib in $deplibs; do
- 	    name="`expr $a_deplib : '-l\(.*\)'`"
- 	    # If $name is empty we are operating on a -L argument.
--	    if test -n "$name" && test "$name" != "0"; then
--	      libname=`eval \\$echo \"$libname_spec\"`
--	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
--		    potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
--		    for potent_lib in $potential_libs; do
-+            if test "$name" != "" && test  "$name" != "0"; then
-+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+		case " $predeps $postdeps " in
-+		*" $a_deplib "*)
-+		  newdeplibs="$newdeplibs $a_deplib"
-+		  a_deplib=""
-+		  ;;
-+		esac
-+	      fi
-+	      if test -n "$a_deplib" ; then
-+		libname=`eval \\$echo \"$libname_spec\"`
-+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		  for potent_lib in $potential_libs; do
- 		      # Follow soft links.
- 		      if ls -lLd "$potent_lib" 2>/dev/null \
- 			 | grep " -> " >/dev/null; then
-@@ -2574,28 +3535,36 @@ EOF
- 		      # but so what?
- 		      potlib="$potent_lib"
- 		      while test -h "$potlib" 2>/dev/null; do
--			potliblink=`ls -ld $potlib | sed 's/.* -> //'`
-+			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
- 			case $potliblink in
- 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- 			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
- 			esac
- 		      done
- 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
--			 | sed 10q \
--			 | egrep "$file_magic_regex" > /dev/null; then
-+			 | ${SED} 10q \
-+			 | $EGREP "$file_magic_regex" > /dev/null; then
- 			newdeplibs="$newdeplibs $a_deplib"
- 			a_deplib=""
- 			break 2
- 		      fi
--		    done
--	      done
-+		  done
-+		done
-+	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
--		echo
--		echo "*** Warning: This library needs some functionality provided by $a_deplib."
--		echo "*** I have the capability to make that library automatically link in when"
--		echo "*** you link to this library.  But I can only do this if you have a"
--		echo "*** shared version of the library, which you do not appear to have."
-+		$echo
-+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-+		$echo "*** I have the capability to make that library automatically link in when"
-+		$echo "*** you link to this library.  But I can only do this if you have a"
-+		$echo "*** shared version of the library, which you do not appear to have"
-+		$echo "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
-+		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-+		else
-+		  $echo "*** with $libname and none of the candidates passed a file format test"
-+		  $echo "*** using a file magic. Last file checked: $potlib"
-+		fi
- 	      fi
- 	    else
- 	      # Add a -L argument.
-@@ -2610,26 +3579,44 @@ EOF
- 	    name="`expr $a_deplib : '-l\(.*\)'`"
- 	    # If $name is empty we are operating on a -L argument.
- 	    if test -n "$name" && test "$name" != "0"; then
--	      libname=`eval \\$echo \"$libname_spec\"`
--	      for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
--		potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
--		for potent_lib in $potential_libs; do
--		  if eval echo \"$potent_lib\" 2>/dev/null \
--		      | sed 10q \
--		      | egrep "$match_pattern_regex" > /dev/null; then
--		    newdeplibs="$newdeplibs $a_deplib"
--		    a_deplib=""
--		    break 2
--		  fi
-+	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+		case " $predeps $postdeps " in
-+		*" $a_deplib "*)
-+		  newdeplibs="$newdeplibs $a_deplib"
-+		  a_deplib=""
-+		  ;;
-+		esac
-+	      fi
-+	      if test -n "$a_deplib" ; then
-+		libname=`eval \\$echo \"$libname_spec\"`
-+		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-+		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-+		  for potent_lib in $potential_libs; do
-+		    potlib="$potent_lib" # see symlink-check above in file_magic test
-+		    if eval $echo \"$potent_lib\" 2>/dev/null \
-+		        | ${SED} 10q \
-+		        | $EGREP "$match_pattern_regex" > /dev/null; then
-+		      newdeplibs="$newdeplibs $a_deplib"
-+		      a_deplib=""
-+		      break 2
-+		    fi
-+		  done
- 		done
--	      done
-+	      fi
- 	      if test -n "$a_deplib" ; then
- 		droppeddeps=yes
--		echo
--		echo "*** Warning: This library needs some functionality provided by $a_deplib."
--		echo "*** I have the capability to make that library automatically link in when"
--		echo "*** you link to this library.  But I can only do this if you have a"
--		echo "*** shared version of the library, which you do not appear to have."
-+		$echo
-+		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-+		$echo "*** I have the capability to make that library automatically link in when"
-+		$echo "*** you link to this library.  But I can only do this if you have a"
-+		$echo "*** shared version of the library, which you do not appear to have"
-+		$echo "*** because I did check the linker path looking for a file starting"
-+		if test -z "$potlib" ; then
-+		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-+		else
-+		  $echo "*** with $libname and none of the candidates passed a file format test"
-+		  $echo "*** using a regex pattern. Last file checked: $potlib"
-+		fi
- 	      fi
- 	    else
- 	      # Add a -L argument.
-@@ -2639,16 +3626,23 @@ EOF
- 	  ;;
- 	none | unknown | *)
- 	  newdeplibs=""
--	  if $echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
--	       -e 's/ -[LR][^ ]*//g' -e 's/[ 	]//g' |
--	     grep . >/dev/null; then
--	    echo
-+	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-+	    -e 's/ -[LR][^ ]*//g'`
-+	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-+	    for i in $predeps $postdeps ; do
-+	      # can't use Xsed below, because $i might contain '/'
-+	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-+	    done
-+	  fi
-+	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-+	    | grep . >/dev/null; then
-+	    $echo
- 	    if test "X$deplibs_check_method" = "Xnone"; then
--	      echo "*** Warning: inter-library dependencies are not supported in this platform."
-+	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
- 	    else
--	      echo "*** Warning: inter-library dependencies are not known to be supported."
-+	      $echo "*** Warning: inter-library dependencies are not known to be supported."
- 	    fi
--	    echo "*** All declared inter-library dependencies are being dropped."
-+	    $echo "*** All declared inter-library dependencies are being dropped."
- 	    droppeddeps=yes
- 	  fi
- 	  ;;
-@@ -2668,17 +3662,17 @@ EOF
- 
- 	if test "$droppeddeps" = yes; then
- 	  if test "$module" = yes; then
--	    echo
--	    echo "*** Warning: libtool could not satisfy all declared inter-library"
--	    echo "*** dependencies of module $libname.  Therefore, libtool will create"
--	    echo "*** a static module, that should work as long as the dlopening"
--	    echo "*** application is linked with the -dlopen flag."
-+	    $echo
-+	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-+	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-+	    $echo "*** a static module, that should work as long as the dlopening"
-+	    $echo "*** application is linked with the -dlopen flag."
- 	    if test -z "$global_symbol_pipe"; then
--	      echo
--	      echo "*** However, this would only work if libtool was able to extract symbol"
--	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
--	      echo "*** not find such a program.  So, this module is probably useless."
--	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
-+	      $echo
-+	      $echo "*** However, this would only work if libtool was able to extract symbol"
-+	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-+	      $echo "*** not find such a program.  So, this module is probably useless."
-+	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
- 	    fi
- 	    if test "$build_old_libs" = no; then
- 	      oldlibs="$output_objdir/$libname.$libext"
-@@ -2688,16 +3682,16 @@ EOF
- 	      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."
--
--	    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,"
-+	      $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."
- 	      if test "$build_old_libs" = no; then
- 		oldlibs="$output_objdir/$libname.$libext"
- 		build_libtool_libs=module
-@@ -2719,7 +3713,7 @@ EOF
- 
-       # Test again, we may have decided not to build it any more
-       if test "$build_libtool_libs" = yes; then
--	if test $hardcode_into_libs = yes; then
-+	if test "$hardcode_into_libs" = yes; then
- 	  # Hardcode the library paths
- 	  hardcode_libdirs=
- 	  dep_rpath=
-@@ -2755,7 +3749,11 @@ EOF
- 	  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\"
-+	    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.
-@@ -2775,6 +3773,7 @@ EOF
- 	fi
- 
- 	# Get the real and link names of the library.
-+	eval shared_ext=\"$shrext_cmds\"
- 	eval library_names=\"$library_names_spec\"
- 	set dummy $library_names
- 	realname="$2"
-@@ -2785,7 +3784,9 @@ EOF
- 	else
- 	  soname="$realname"
- 	fi
--	test -z "$dlname" && dlname=$soname
-+	if test -z "$dlname"; then
-+	  dlname=$soname
-+	fi
- 
- 	lib="$output_objdir/$realname"
- 	for link
-@@ -2793,23 +3794,6 @@ EOF
- 	  linknames="$linknames $link"
- 	done
- 
--	# Ensure that we have .o objects for linkers which dislike .lo
--	# (e.g. aix) in case we are running --disable-static
--	for obj in $libobjs; do
--	  xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
--	  if test "X$xdir" = "X$obj"; then
--	    xdir="."
--	  else
--	    xdir="$xdir"
--	  fi
--	  baseobj=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
--	  oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
--	  if test ! -f $xdir/$oldobj; then
--	    $show "(cd $xdir && ${LN_S} $baseobj $oldobj)"
--	    $run eval '(cd $xdir && ${LN_S} $baseobj $oldobj)' || exit $?
--	  fi
--	done
--
- 	# Use standard objects if they are pic
- 	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
- 
-@@ -2819,17 +3803,26 @@ EOF
- 	    $show "generating symbol list for \`$libname.la'"
- 	    export_symbols="$output_objdir/$libname.exp"
- 	    $run $rm $export_symbols
--	    eval cmds=\"$export_symbols_cmds\"
-+	    cmds=$export_symbols_cmds
- 	    save_ifs="$IFS"; IFS='~'
- 	    for cmd in $cmds; do
- 	      IFS="$save_ifs"
--	      $show "$cmd"
--	      $run eval "$cmd" || exit $?
-+	      eval cmd=\"$cmd\"
-+	      if len=`expr "X$cmd" : ".*"` &&
-+	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+	        $show "$cmd"
-+	        $run eval "$cmd" || exit $?
-+	        skipped_export=false
-+	      else
-+	        # The command line is too long to execute in one step.
-+	        $show "using reloadable object file for export list..."
-+	        skipped_export=:
-+	      fi
- 	    done
- 	    IFS="$save_ifs"
- 	    if test -n "$export_symbols_regex"; then
--	      $show "egrep -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
--	      $run eval 'egrep -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-+	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-+	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
- 	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
- 	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
- 	    fi
-@@ -2840,46 +3833,30 @@ EOF
- 	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
- 	fi
- 
-+	tmp_deplibs=
-+	for test_deplib in $deplibs; do
-+		case " $convenience " in
-+		*" $test_deplib "*) ;;
-+		*)
-+			tmp_deplibs="$tmp_deplibs $test_deplib"
-+			;;
-+		esac
-+	done
-+	deplibs="$tmp_deplibs"
-+
- 	if test -n "$convenience"; then
- 	  if test -n "$whole_archive_flag_spec"; then
-+	    save_libobjs=$libobjs
- 	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
- 	  else
- 	    gentop="$output_objdir/${outputname}x"
--	    $show "${rm}r $gentop"
--	    $run ${rm}r "$gentop"
--	    $show "mkdir $gentop"
--	    $run mkdir "$gentop"
--	    status=$?
--	    if test $status -ne 0 && test ! -d "$gentop"; then
--	      exit $status
--	    fi
- 	    generated="$generated $gentop"
- 
--	    for xlib in $convenience; do
--	      # Extract the objects.
--	      case $xlib in
--	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	      *) xabs=`pwd`"/$xlib" ;;
--	      esac
--	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	      xdir="$gentop/$xlib"
--
--	      $show "${rm}r $xdir"
--	      $run ${rm}r "$xdir"
--	      $show "mkdir $xdir"
--	      $run mkdir "$xdir"
--	      status=$?
--	      if test $status -ne 0 && test ! -d "$xdir"; then
--		exit $status
--	      fi
--	      $show "(cd $xdir && $AR x $xabs)"
--	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--
--	      libobjs="$libobjs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
--	    done
-+	    func_extract_archives $gentop $convenience
-+	    libobjs="$libobjs $func_extract_archives_result"
- 	  fi
- 	fi
--
-+	
- 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
- 	  eval flag=\"$thread_safe_flag_spec\"
- 	  linker_flags="$linker_flags $flag"
-@@ -2891,14 +3868,147 @@ EOF
- 	fi
- 
- 	# Do each of the archive commands.
-+	if test "$module" = yes && test -n "$module_cmds" ; then
-+	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-+	    eval test_cmds=\"$module_expsym_cmds\"
-+	    cmds=$module_expsym_cmds
-+	  else
-+	    eval test_cmds=\"$module_cmds\"
-+	    cmds=$module_cmds
-+	  fi
-+	else
- 	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
--	  eval cmds=\"$archive_expsym_cmds\"
-+	  eval test_cmds=\"$archive_expsym_cmds\"
-+	  cmds=$archive_expsym_cmds
- 	else
--	  eval cmds=\"$archive_cmds\"
-+	  eval test_cmds=\"$archive_cmds\"
-+	  cmds=$archive_cmds
-+	  fi
-+	fi
-+
-+	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
-+	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+	  :
-+	else
-+	  # The command line is too long to link in one step, link piecewise.
-+	  $echo "creating reloadable object files..."
-+
-+	  # Save the value of $output and $libobjs because we want to
-+	  # use them later.  If we have whole_archive_flag_spec, we
-+	  # want to use save_libobjs as it was before
-+	  # whole_archive_flag_spec was expanded, because we can't
-+	  # assume the linker understands whole_archive_flag_spec.
-+	  # This may have to be revisited, in case too many
-+	  # convenience libraries get linked in and end up exceeding
-+	  # the spec.
-+	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-+	    save_libobjs=$libobjs
-+	  fi
-+	  save_output=$output
-+
-+	  # Clear the reloadable object creation command queue and
-+	  # initialize k to one.
-+	  test_cmds=
-+	  concat_cmds=
-+	  objlist=
-+	  delfiles=
-+	  last_robj=
-+	  k=1
-+	  output=$output_objdir/$save_output-${k}.$objext
-+	  # Loop over the list of objects to be linked.
-+	  for obj in $save_libobjs
-+	  do
-+	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-+	    if test "X$objlist" = X ||
-+	       { len=`expr "X$test_cmds" : ".*"` &&
-+		 test "$len" -le "$max_cmd_len"; }; then
-+	      objlist="$objlist $obj"
-+	    else
-+	      # The command $test_cmds is almost too long, add a
-+	      # command to the queue.
-+	      if test "$k" -eq 1 ; then
-+		# The first file doesn't have a previous command to add.
-+		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-+	      else
-+		# All subsequent reloadable object files will link in
-+		# the last one created.
-+		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-+	      fi
-+	      last_robj=$output_objdir/$save_output-${k}.$objext
-+	      k=`expr $k + 1`
-+	      output=$output_objdir/$save_output-${k}.$objext
-+	      objlist=$obj
-+	      len=1
-+	    fi
-+	  done
-+	  # Handle the remaining objects by creating one last
-+	  # reloadable object file.  All subsequent reloadable object
-+	  # files will link in the last one created.
-+	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-+
-+	  if ${skipped_export-false}; then
-+	    $show "generating symbol list for \`$libname.la'"
-+	    export_symbols="$output_objdir/$libname.exp"
-+	    $run $rm $export_symbols
-+	    libobjs=$output
-+	    # Append the command to create the export file.
-+	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-+          fi
-+
-+	  # Set up a command to remove the reloadale object files
-+	  # after they are used.
-+	  i=0
-+	  while test "$i" -lt "$k"
-+	  do
-+	    i=`expr $i + 1`
-+	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-+	  done
-+
-+	  $echo "creating a temporary reloadable object file: $output"
-+
-+	  # Loop through the commands generated above and execute them.
-+	  save_ifs="$IFS"; IFS='~'
-+	  for cmd in $concat_cmds; do
-+	    IFS="$save_ifs"
-+	    $show "$cmd"
-+	    $run eval "$cmd" || exit $?
-+	  done
-+	  IFS="$save_ifs"
-+
-+	  libobjs=$output
-+	  # Restore the value of output.
-+	  output=$save_output
-+
-+	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-+	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-+	  fi
-+	  # Expand the library linking commands again to reset the
-+	  # value of $libobjs for piecewise linking.
-+
-+	  # Do each of the archive commands.
-+	  if test "$module" = yes && test -n "$module_cmds" ; then
-+	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-+	      cmds=$module_expsym_cmds
-+	    else
-+	      cmds=$module_cmds
-+	    fi
-+	  else
-+	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-+	    cmds=$archive_expsym_cmds
-+	  else
-+	    cmds=$archive_cmds
-+	    fi
-+	  fi
-+
-+	  # Append the command to remove the reloadable object files
-+	  # to the just-reset $cmds.
-+	  eval cmds=\"\$cmds~\$rm $delfiles\"
- 	fi
- 	save_ifs="$IFS"; IFS='~'
- 	for cmd in $cmds; do
- 	  IFS="$save_ifs"
-+	  eval cmd=\"$cmd\"
- 	  $show "$cmd"
- 	  $run eval "$cmd" || exit $?
- 	done
-@@ -2907,7 +4017,7 @@ EOF
- 	# Restore the uninstalled library and exit
- 	if test "$mode" = relink; then
- 	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
--	  exit 0
-+	  exit $EXIT_SUCCESS
- 	fi
- 
- 	# Create links to the real library.
-@@ -2955,7 +4065,7 @@ EOF
-       *.lo)
- 	if test -n "$objs$old_deplibs"; then
- 	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 	libobj="$output"
- 	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-@@ -2984,38 +4094,10 @@ EOF
- 	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
- 	else
- 	  gentop="$output_objdir/${obj}x"
--	  $show "${rm}r $gentop"
--	  $run ${rm}r "$gentop"
--	  $show "mkdir $gentop"
--	  $run mkdir "$gentop"
--	  status=$?
--	  if test $status -ne 0 && test ! -d "$gentop"; then
--	    exit $status
--	  fi
- 	  generated="$generated $gentop"
- 
--	  for xlib in $convenience; do
--	    # Extract the objects.
--	    case $xlib in
--	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	    *) xabs=`pwd`"/$xlib" ;;
--	    esac
--	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	    xdir="$gentop/$xlib"
--
--	    $show "${rm}r $xdir"
--	    $run ${rm}r "$xdir"
--	    $show "mkdir $xdir"
--	    $run mkdir "$xdir"
--	    status=$?
--	    if test $status -ne 0 && test ! -d "$xdir"; then
--	      exit $status
--	    fi
--	    $show "(cd $xdir && $AR x $xabs)"
--	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--
--	    reload_conv_objs="$reload_objs "`find $xdir -name \*.o -print -o -name \*.lo -print | $NL2SP`
--	  done
-+	  func_extract_archives $gentop $convenience
-+	  reload_conv_objs="$reload_objs $func_extract_archives_result"
- 	fi
-       fi
- 
-@@ -3023,10 +4105,11 @@ EOF
-       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"
--      eval cmds=\"$reload_cmds\"
-+      cmds=$reload_cmds
-       save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
- 	IFS="$save_ifs"
-+	eval cmd=\"$cmd\"
- 	$show "$cmd"
- 	$run eval "$cmd" || exit $?
-       done
-@@ -3039,7 +4122,7 @@ EOF
- 	  $run ${rm}r $gentop
- 	fi
- 
--	exit 0
-+	exit $EXIT_SUCCESS
-       fi
- 
-       if test "$build_libtool_libs" != yes; then
-@@ -3050,37 +4133,24 @@ EOF
- 
- 	# Create an invalid libtool object if no PIC, so that we don't
- 	# accidentally link it into a program.
--	$show "echo timestamp > $libobj"
--	$run eval "echo timestamp > $libobj" || exit $?
--	exit 0
-+	# $show "echo timestamp > $libobj"
-+	# $run eval "echo timestamp > $libobj" || exit $?
-+	exit $EXIT_SUCCESS
-       fi
- 
-       if test -n "$pic_flag" || test "$pic_mode" != default; then
- 	# Only do commands if we really have different PIC objects.
- 	reload_objs="$libobjs $reload_conv_objs"
- 	output="$libobj"
--	eval cmds=\"$reload_cmds\"
-+	cmds=$reload_cmds
- 	save_ifs="$IFS"; IFS='~'
- 	for cmd in $cmds; do
- 	  IFS="$save_ifs"
-+	  eval cmd=\"$cmd\"
- 	  $show "$cmd"
- 	  $run eval "$cmd" || exit $?
- 	done
- 	IFS="$save_ifs"
--      else
--	# Just create a symlink.
--	$show $rm $libobj
--	$run $rm $libobj
--	xdir=`$echo "X$libobj" | $Xsed -e 's%/[^/]*$%%'`
--	if test "X$xdir" = "X$libobj"; then
--	  xdir="."
--	else
--	  xdir="$xdir"
--	fi
--	baseobj=`$echo "X$libobj" | $Xsed -e 's%^.*/%%'`
--	oldobj=`$echo "X$baseobj" | $Xsed -e "$lo2o"`
--	$show "(cd $xdir && $LN_S $oldobj $baseobj)"
--	$run eval '(cd $xdir && $LN_S $oldobj $baseobj)' || exit $?
-       fi
- 
-       if test -n "$gentop"; then
-@@ -3088,12 +4158,12 @@ EOF
- 	$run ${rm}r $gentop
-       fi
- 
--      exit 0
-+      exit $EXIT_SUCCESS
-       ;;
- 
-     prog)
-       case $host in
--	*cygwin*) output=`echo $output | sed -e 's,.exe$,,;s,$,.exe,'` ;;
-+	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-       esac
-       if test -n "$vinfo"; then
- 	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-@@ -3118,6 +4188,16 @@ EOF
- 	;;
-       esac
- 
-+      case $host in
-+      *darwin*)
-+        # Don't allow lazy linking, it breaks C++ global constructors
-+        if test "$tagname" = CXX ; then
-+        compile_command="$compile_command ${wl}-bind_at_load"
-+        finalize_command="$finalize_command ${wl}-bind_at_load"
-+        fi
-+        ;;
-+      esac
-+
-       compile_command="$compile_command $compile_deplibs"
-       finalize_command="$finalize_command $finalize_deplibs"
- 
-@@ -3268,12 +4348,12 @@ extern \"C\" {
- 	    done
- 
- 	    if test -n "$exclude_expsyms"; then
--	      $run eval 'egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-+	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
- 	      $run eval '$mv "$nlist"T "$nlist"'
- 	    fi
- 
- 	    if test -n "$export_symbols_regex"; then
--	      $run eval 'egrep -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-+	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
- 	      $run eval '$mv "$nlist"T "$nlist"'
- 	    fi
- 
-@@ -3281,9 +4361,9 @@ extern \"C\" {
- 	    if test -z "$export_symbols"; then
- 	      export_symbols="$output_objdir/$output.exp"
- 	      $run $rm $export_symbols
--	      $run eval "sed -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-+	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
- 	    else
--	      $run eval "sed -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-+	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
- 	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
- 	      $run eval 'mv "$nlist"T "$nlist"'
- 	    fi
-@@ -3291,8 +4371,8 @@ extern \"C\" {
- 
- 	  for arg in $dlprefiles; do
- 	    $show "extracting global C symbols from \`$arg'"
--	    name=`echo "$arg" | sed -e 's%^.*/%%'`
--	    $run eval 'echo ": $name " >> "$nlist"'
-+	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-+	    $run eval '$echo ": $name " >> "$nlist"'
- 	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
- 	  done
- 
-@@ -3301,12 +4381,18 @@ extern \"C\" {
- 	    test -f "$nlist" || : > "$nlist"
- 
- 	    if test -n "$exclude_expsyms"; then
--	      egrep -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-+	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
- 	      $mv "$nlist"T "$nlist"
- 	    fi
- 
- 	    # Try sorting and uniquifying the output.
--	    if grep -v "^: " < "$nlist" | sort +2 | uniq > "$nlist"S; then
-+	    if grep -v "^: " < "$nlist" |
-+		if sort -k 3 </dev/null >/dev/null 2>&1; then
-+		  sort -k 3
-+		else
-+		  sort +2
-+		fi |
-+		uniq > "$nlist"S; then
- 	      :
- 	    else
- 	      grep -v "^: " < "$nlist" > "$nlist"S
-@@ -3315,7 +4401,7 @@ extern \"C\" {
- 	    if test -f "$nlist"S; then
- 	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
- 	    else
--	      echo '/* NONE */' >> "$output_objdir/$dlsyms"
-+	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
- 	    fi
- 
- 	    $echo >> "$output_objdir/$dlsyms" "\
-@@ -3367,18 +4453,18 @@ static const void *lt_preloaded_setup() {
- 	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
- 	    case "$compile_command " in
- 	    *" -static "*) ;;
--	    *) pic_flag_for_symtable=" $pic_flag -DPIC -DFREEBSD_WORKAROUND";;
-+	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
- 	    esac;;
- 	  *-*-hpux*)
- 	    case "$compile_command " in
- 	    *" -static "*) ;;
--	    *) pic_flag_for_symtable=" $pic_flag -DPIC";;
-+	    *) pic_flag_for_symtable=" $pic_flag";;
- 	    esac
- 	  esac
- 
- 	  # Now compile the dynamic symbol file.
--	  $show "(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
--	  $run eval '(cd $output_objdir && $CC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-+	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-+	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
- 
- 	  # Clean up the generated files.
- 	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-@@ -3390,7 +4476,7 @@ static const void *lt_preloaded_setup() {
- 	  ;;
- 	*)
- 	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
-       else
-@@ -3403,7 +4489,7 @@ static const void *lt_preloaded_setup() {
- 	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-       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'`
- 	link_command="$compile_command$compile_rpath"
-@@ -3478,7 +4564,7 @@ static const void *lt_preloaded_setup() {
- 	# Link the executable and exit
- 	$show "$link_command"
- 	$run eval "$link_command" || exit $?
--	exit 0
-+	exit $EXIT_SUCCESS
-       fi
- 
-       if test "$hardcode_action" = relink; then
-@@ -3528,15 +4614,15 @@ static const void *lt_preloaded_setup() {
- 	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
- 	  fi
- 	done
--	relink_command="cd `pwd`; $relink_command"
-+	relink_command="(cd `pwd`; $relink_command)"
- 	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-       fi
- 
-       # Quote $echo for shipping.
--      if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
--	case $0 in
--	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
--	*) qecho="$SHELL `pwd`/$0 --fallback-echo";;
-+      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-+	case $progpath in
-+	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-+	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
- 	esac
- 	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-       else
-@@ -3548,15 +4634,230 @@ static const void *lt_preloaded_setup() {
- 	# win32 will think the script is a binary if it has
- 	# a .exe suffix, so we strip it off here.
- 	case $output in
--	  *.exe) output=`echo $output|sed 's,.exe$,,'` ;;
-+	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
- 	esac
- 	# test for cygwin because mv fails w/o .exe extensions
- 	case $host in
--	  *cygwin*) exeext=.exe ;;
-+	  *cygwin*)
-+	    exeext=.exe
-+	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
- 	  *) exeext= ;;
- 	esac
-+	case $host in
-+	  *cygwin* | *mingw* )
-+	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-+	    cwrapper=`$echo ${output}.exe`
-+	    $rm $cwrappersource $cwrapper
-+	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-+
-+	    cat > $cwrappersource <<EOF
-+
-+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-+   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-+
-+   The $output program cannot be directly executed until all the libtool
-+   libraries that it depends on are installed.
-+
-+   This wrapper executable should never be moved out of the build directory.
-+   If it is, it will not operate correctly.
-+
-+   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-+   but could eventually absorb all of the scripts functionality and
-+   exec $objdir/$outputname directly.
-+*/
-+EOF
-+	    cat >> $cwrappersource<<"EOF"
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <unistd.h>
-+#include <malloc.h>
-+#include <stdarg.h>
-+#include <assert.h>
-+
-+#if defined(PATH_MAX)
-+# define LT_PATHMAX PATH_MAX
-+#elif defined(MAXPATHLEN)
-+# define LT_PATHMAX MAXPATHLEN
-+#else
-+# define LT_PATHMAX 1024
-+#endif
-+
-+#ifndef DIR_SEPARATOR
-+#define DIR_SEPARATOR '/'
-+#endif
-+
-+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-+  defined (__OS2__)
-+#define HAVE_DOS_BASED_FILE_SYSTEM
-+#ifndef DIR_SEPARATOR_2
-+#define DIR_SEPARATOR_2 '\\'
-+#endif
-+#endif
-+
-+#ifndef DIR_SEPARATOR_2
-+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-+#else /* DIR_SEPARATOR_2 */
-+# define IS_DIR_SEPARATOR(ch) \
-+        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-+#endif /* DIR_SEPARATOR_2 */
-+
-+#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-+#define XFREE(stale) do { \
-+  if (stale) { free ((void *) stale); stale = 0; } \
-+} while (0)
-+
-+const char *program_name = NULL;
-+
-+void * xmalloc (size_t num);
-+char * xstrdup (const char *string);
-+char * basename (const char *name);
-+char * fnqualify(const char *path);
-+char * strendzap(char *str, const char *pat);
-+void lt_fatal (const char *message, ...);
-+
-+int
-+main (int argc, char *argv[])
-+{
-+  char **newargz;
-+  int i;
-+
-+  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-+  newargz = XMALLOC(char *, argc+2);
-+EOF
-+
-+	    cat >> $cwrappersource <<EOF
-+  newargz[0] = "$SHELL";
-+EOF
-+
-+	    cat >> $cwrappersource <<"EOF"
-+  newargz[1] = fnqualify(argv[0]);
-+  /* we know the script has the same name, without the .exe */
-+  /* so make sure newargz[1] doesn't end in .exe */
-+  strendzap(newargz[1],".exe");
-+  for (i = 1; i < argc; i++)
-+    newargz[i+1] = xstrdup(argv[i]);
-+  newargz[argc+1] = NULL;
-+EOF
-+
-+	    cat >> $cwrappersource <<EOF
-+  execv("$SHELL",newargz);
-+EOF
-+
-+	    cat >> $cwrappersource <<"EOF"
-+}
-+
-+void *
-+xmalloc (size_t num)
-+{
-+  void * p = (void *) malloc (num);
-+  if (!p)
-+    lt_fatal ("Memory exhausted");
-+
-+  return p;
-+}
-+
-+char *
-+xstrdup (const char *string)
-+{
-+  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-+;
-+}
-+
-+char *
-+basename (const char *name)
-+{
-+  const char *base;
-+
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+  /* Skip over the disk name in MSDOS pathnames. */
-+  if (isalpha (name[0]) && name[1] == ':')
-+    name += 2;
-+#endif
-+
-+  for (base = name; *name; name++)
-+    if (IS_DIR_SEPARATOR (*name))
-+      base = name + 1;
-+  return (char *) base;
-+}
-+
-+char *
-+fnqualify(const char *path)
-+{
-+  size_t size;
-+  char *p;
-+  char tmp[LT_PATHMAX + 1];
-+
-+  assert(path != NULL);
-+
-+  /* Is it qualified already? */
-+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-+  if (isalpha (path[0]) && path[1] == ':')
-+    return xstrdup (path);
-+#endif
-+  if (IS_DIR_SEPARATOR (path[0]))
-+    return xstrdup (path);
-+
-+  /* prepend the current directory */
-+  /* doesn't handle '~' */
-+  if (getcwd (tmp, LT_PATHMAX) == NULL)
-+    lt_fatal ("getcwd failed");
-+  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-+  p = XMALLOC(char, size);
-+  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-+  return p;
-+}
-+
-+char *
-+strendzap(char *str, const char *pat)
-+{
-+  size_t len, patlen;
-+
-+  assert(str != NULL);
-+  assert(pat != NULL);
-+
-+  len = strlen(str);
-+  patlen = strlen(pat);
-+
-+  if (patlen <= len)
-+  {
-+    str += len - patlen;
-+    if (strcmp(str, pat) == 0)
-+      *str = '\0';
-+  }
-+  return str;
-+}
-+
-+static void
-+lt_error_core (int exit_status, const char * mode,
-+          const char * message, va_list ap)
-+{
-+  fprintf (stderr, "%s: %s: ", program_name, mode);
-+  vfprintf (stderr, message, ap);
-+  fprintf (stderr, ".\n");
-+
-+  if (exit_status >= 0)
-+    exit (exit_status);
-+}
-+
-+void
-+lt_fatal (const char *message, ...)
-+{
-+  va_list ap;
-+  va_start (ap, message);
-+  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-+  va_end (ap);
-+}
-+EOF
-+	  # we should really use a build-platform specific compiler
-+	  # here, but OTOH, the wrappers (shell script and this C one)
-+	  # are only useful if you want to execute the "real" binary.
-+	  # Since the "real" binary is built for $host, then this
-+	  # wrapper might as well be built for $host, too.
-+	  $run $LTCC -s -o $cwrapper $cwrappersource
-+	  ;;
-+	esac
- 	$rm $output
--	trap "$rm $output; exit 1" 1 2 15
-+	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
- 
- 	$echo > $output "\
- #! $SHELL
-@@ -3572,12 +4873,12 @@ static const void *lt_preloaded_setup() {
- 
- # Sed substitution that helps us do robust quoting.  It backslashifies
- # metacharacters that are still active within double-quoted strings.
--Xsed='sed -e 1s/^X//'
-+Xsed='${SED} -e 1s/^X//'
- sed_quote_subst='$sed_quote_subst'
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- relink_command=\"$relink_command\"
- 
-@@ -3610,7 +4911,7 @@ else
-   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
- 
-   # Follow symbolic links until we get to the real thisdir.
--  file=\`ls -ld \"\$file\" | sed -n 's/.*-> //p'\`
-+  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-   while test -n \"\$file\"; do
-     destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
- 
-@@ -3623,7 +4924,7 @@ else
-     fi
- 
-     file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
--    file=\`ls -ld \"\$thisdir/\$file\" | sed -n 's/.*-> //p'\`
-+    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-   done
- 
-   # Try to get the absolute directory name.
-@@ -3632,12 +4933,12 @@ else
- "
- 
- 	if test "$fast_install" = yes; then
--	  echo >> $output "\
-+	  $echo >> $output "\
-   program=lt-'$outputname'$exeext
-   progdir=\"\$thisdir/$objdir\"
- 
-   if test ! -f \"\$progdir/\$program\" || \\
--     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | sed 1q\`; \\
-+     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-        test \"X\$file\" != \"X\$progdir/\$program\"; }; then
- 
-     file=\"\$\$-\$program\"
-@@ -3648,7 +4949,7 @@ else
-       $rm \"\$progdir/\$file\"
-     fi"
- 
--	  echo >> $output "\
-+	  $echo >> $output "\
- 
-     # relink executable if necessary
-     if test -n \"\$relink_command\"; then
-@@ -3656,7 +4957,7 @@ else
-       else
- 	$echo \"\$relink_command_output\" >&2
- 	$rm \"\$progdir/\$file\"
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
-     fi
- 
-@@ -3666,13 +4967,13 @@ else
-     $rm \"\$progdir/\$file\"
-   fi"
- 	else
--	  echo >> $output "\
-+	  $echo >> $output "\
-   program='$outputname'
-   progdir=\"\$thisdir/$objdir\"
- "
- 	fi
- 
--	echo >> $output "\
-+	$echo >> $output "\
- 
-   if test -f \"\$progdir/\$program\"; then"
- 
-@@ -3703,14 +5004,6 @@ else
-       # Run the actual program with our arguments.
- "
- 	case $host in
--	# win32 systems need to use the prog path for dll
--	# lookup to work
--	*-*-cygwin* | *-*-pw32*)
--	  $echo >> $output "\
--      exec \$progdir/\$program \${1+\"\$@\"}
--"
--	  ;;
--
- 	# Backslashes separate directories on plain windows
- 	*-*-mingw | *-*-os2*)
- 	  $echo >> $output "\
-@@ -3720,30 +5013,26 @@ else
- 
- 	*)
- 	  $echo >> $output "\
--      # Export the path to the program.
--      PATH=\"\$progdir:\$PATH\"
--      export PATH
--
--      exec \$program \${1+\"\$@\"}
-+      exec \$progdir/\$program \${1+\"\$@\"}
- "
- 	  ;;
- 	esac
- 	$echo >> $output "\
-       \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
-   else
-     # The program doesn't exist.
-     \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-     \$echo \"This script is just a wrapper for \$program.\" 1>&2
--    echo \"See the $PACKAGE documentation for more information.\" 1>&2
--    exit 1
-+    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-+    exit $EXIT_FAILURE
-   fi
- fi\
- "
- 	chmod +x $output
-       fi
--      exit 0
-+      exit $EXIT_SUCCESS
-       ;;
-     esac
- 
-@@ -3759,74 +5048,86 @@ fi\
- 	  oldobjs="$libobjs_save"
- 	  build_libtool_libs=no
- 	else
--	  oldobjs="$objs$old_deplibs "`$echo "X$libobjs_save" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`
-+	  oldobjs="$old_deplibs $non_pic_objects"
- 	fi
- 	addlibs="$old_convenience"
-       fi
- 
-       if test -n "$addlibs"; then
- 	gentop="$output_objdir/${outputname}x"
--	$show "${rm}r $gentop"
--	$run ${rm}r "$gentop"
--	$show "mkdir $gentop"
--	$run mkdir "$gentop"
--	status=$?
--	if test $status -ne 0 && test ! -d "$gentop"; then
--	  exit $status
--	fi
- 	generated="$generated $gentop"
- 
--	# Add in members from convenience archives.
--	for xlib in $addlibs; do
--	  # Extract the objects.
--	  case $xlib in
--	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
--	  *) xabs=`pwd`"/$xlib" ;;
--	  esac
--	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
--	  xdir="$gentop/$xlib"
--
--	  $show "${rm}r $xdir"
--	  $run ${rm}r "$xdir"
--	  $show "mkdir $xdir"
--	  $run mkdir "$xdir"
--	  status=$?
--	  if test $status -ne 0 && test ! -d "$xdir"; then
--	    exit $status
--	  fi
--	  $show "(cd $xdir && $AR x $xabs)"
--	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
--
--	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
--	done
-+	func_extract_archives $gentop $addlibs
-+	oldobjs="$oldobjs $func_extract_archives_result"
-       fi
- 
-       # Do each command in the archive commands.
-       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
--	eval cmds=\"$old_archive_from_new_cmds\"
-+       cmds=$old_archive_from_new_cmds
-       else
--	# Ensure that we have .o objects in place in case we decided
--	# not to build a shared library, and have fallen back to building
--	# static libs even though --disable-static was passed!
--	for oldobj in $oldobjs; do
--	  if test ! -f $oldobj; then
--	    xdir=`$echo "X$oldobj" | $Xsed -e 's%/[^/]*$%%'`
--	    if test "X$xdir" = "X$oldobj"; then
--	      xdir="."
-+	eval cmds=\"$old_archive_cmds\"
-+
-+	if len=`expr "X$cmds" : ".*"` &&
-+	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-+	  cmds=$old_archive_cmds
-+	else
-+	  # the command line is too long to link in one step, link in parts
-+	  $echo "using piecewise archive linking..."
-+	  save_RANLIB=$RANLIB
-+	  RANLIB=:
-+	  objlist=
-+	  concat_cmds=
-+	  save_oldobjs=$oldobjs
-+	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-+	  # encoded into archives.  This makes 'ar r' malfunction in
-+	  # this piecewise linking case whenever conflicting object
-+	  # names appear in distinct ar calls; check, warn and compensate.
-+	    if (for obj in $save_oldobjs
-+	    do
-+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-+	    done | sort | sort -uc >/dev/null 2>&1); then
-+	    :
-+	  else
-+	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-+	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-+	    AR_FLAGS=cq
-+	  fi
-+	  # Is there a better way of finding the last object in the list?
-+	  for obj in $save_oldobjs
-+	  do
-+	    last_oldobj=$obj
-+	  done
-+	  for obj in $save_oldobjs
-+	  do
-+	    oldobjs="$objlist $obj"
-+	    objlist="$objlist $obj"
-+	    eval test_cmds=\"$old_archive_cmds\"
-+	    if len=`expr "X$test_cmds" : ".*"` &&
-+	       test "$len" -le "$max_cmd_len"; then
-+	      :
- 	    else
--	      xdir="$xdir"
-+	      # the above command should be used before it gets too long
-+	      oldobjs=$objlist
-+	      if test "$obj" = "$last_oldobj" ; then
-+	        RANLIB=$save_RANLIB
-+	      fi
-+	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-+	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-+	      objlist=
- 	    fi
--	    baseobj=`$echo "X$oldobj" | $Xsed -e 's%^.*/%%'`
--	    obj=`$echo "X$baseobj" | $Xsed -e "$o2lo"`
--	    $show "(cd $xdir && ${LN_S} $obj $baseobj)"
--	    $run eval '(cd $xdir && ${LN_S} $obj $baseobj)' || exit $?
-+	  done
-+	  RANLIB=$save_RANLIB
-+	  oldobjs=$objlist
-+	  if test "X$oldobjs" = "X" ; then
-+	    eval cmds=\"\$concat_cmds\"
-+	  else
-+	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
- 	  fi
--	done
--
--	eval cmds=\"$old_archive_cmds\"
-+	fi
-       fi
-       save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
-+        eval cmd=\"$cmd\"
- 	IFS="$save_ifs"
- 	$show "$cmd"
- 	$run eval "$cmd" || exit $?
-@@ -3858,8 +5159,12 @@ fi\
- 	fi
-       done
-       # Quote the link command for shipping.
--      relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
-+      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"`
-+      if test "$hardcode_automatic" = yes ; then
-+	relink_command=
-+      fi
-+
- 
-       # Only create the output if not a dry run.
-       if test -z "$run"; then
-@@ -3872,13 +5177,17 @@ fi\
- 	    # Replace all uninstalled libtool libraries with the installed ones
- 	    newdependency_libs=
- 	    for deplib in $dependency_libs; do
-+              # Replacing uninstalled with installed can easily break crosscompilation,
-+              # since the installed path is generally the wrong architecture.  -CL
-+              newdependency_libs="$newdependency_libs $deplib"
-+              continue
- 	      case $deplib in
- 	      *.la)
- 		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
--		eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-+		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
--		  exit 1
-+		  exit $EXIT_FAILURE
- 		fi
- 		newdependency_libs="$newdependency_libs $libdir/$name"
- 		;;
-@@ -3889,10 +5198,10 @@ fi\
- 	    newdlfiles=
- 	    for lib in $dlfiles; do
- 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
--	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+	      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
--		exit 1
-+		exit $EXIT_FAILURE
- 	      fi
- 	      newdlfiles="$newdlfiles $libdir/$name"
- 	    done
-@@ -3900,20 +5209,39 @@ fi\
- 	    newdlprefiles=
- 	    for lib in $dlprefiles; do
- 	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
--	      eval libdir=`sed -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-+	      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
--		exit 1
-+		exit $EXIT_FAILURE
- 	      fi
- 	      newdlprefiles="$newdlprefiles $libdir/$name"
- 	    done
- 	    dlprefiles="$newdlprefiles"
-+	  else
-+	    newdlfiles=
-+	    for lib in $dlfiles; do
-+	      case $lib in
-+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+		*) abs=`pwd`"/$lib" ;;
-+	      esac
-+	      newdlfiles="$newdlfiles $abs"
-+	    done
-+	    dlfiles="$newdlfiles"
-+	    newdlprefiles=
-+	    for lib in $dlprefiles; do
-+	      case $lib in
-+		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-+		*) abs=`pwd`"/$lib" ;;
-+	      esac
-+	      newdlprefiles="$newdlprefiles $abs"
-+	    done
-+	    dlprefiles="$newdlprefiles"
- 	  fi
- 	  $rm $output
- 	  # place dlname in correct position for cygwin
- 	  tdlname=$dlname
- 	  case $host,$output,$installed,$module,$dlname in
--	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
- 	  esac
- 	  $echo > $output "\
- # $outputname - a libtool library file
-@@ -3942,13 +5270,16 @@ revision=$revision
- # Is this an already installed library?
- installed=$installed
- 
-+# Should we warn about portability when linking against -modules?
-+shouldnotlink=$module
-+
- # Files to dlopen/dlpreopen
- dlopen='$dlfiles'
- dlpreopen='$dlprefiles'
- 
- # Directory that this library needs to be installed in:
- libdir='$install_libdir'"
--	  if test "$installed" = no && test $need_relink = yes; then
-+	  if test "$installed" = no && test "$need_relink" = yes; then
- 	    $echo >> $output "\
- relink_command=\"$relink_command\""
- 	  fi
-@@ -3961,7 +5292,7 @@ relink_command=\"$relink_command\""
-       $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-       ;;
-     esac
--    exit 0
-+    exit $EXIT_SUCCESS
-     ;;
- 
-   # libtool install mode
-@@ -4050,13 +5381,13 @@ relink_command=\"$relink_command\""
-     if test -z "$install_prog"; then
-       $echo "$modename: you must specify an install program" 1>&2
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     if test -n "$prev"; then
-       $echo "$modename: the \`$prev' option requires an argument" 1>&2
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     if test -z "$files"; then
-@@ -4066,7 +5397,7 @@ relink_command=\"$relink_command\""
- 	$echo "$modename: you must specify a destination" 1>&2
-       fi
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     # Strip any trailing slash from the destination.
-@@ -4084,10 +5415,10 @@ relink_command=\"$relink_command\""
- 
-       # Not a directory, so check to see that there is only one file specified.
-       set dummy $files
--      if test $# -gt 2; then
-+      if test "$#" -gt 2; then
- 	$echo "$modename: \`$dest' is not a directory" 1>&2
- 	$echo "$help" 1>&2
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
-     fi
-     case $destdir in
-@@ -4099,7 +5430,7 @@ relink_command=\"$relink_command\""
- 	*)
- 	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
-       done
-@@ -4124,11 +5455,11 @@ relink_command=\"$relink_command\""
- 
-       *.la)
- 	# Check to see that this really is a libtool archive.
--	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
- 	else
- 	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	library_names=
-@@ -4159,12 +5490,36 @@ relink_command=\"$relink_command\""
- 	dir="$dir$objdir"
- 
- 	if test -n "$relink_command"; then
-+	  # Determine the prefix the user has applied to our future dir.
-+	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-+
-+	  # Don't allow the user to place us outside of our expected
-+	  # location b/c this prevents finding dependent libraries that
-+	  # are installed to the same prefix.
-+	  # At present, this check doesn't affect windows .dll's that
-+	  # are installed into $libdir/../bin (currently, that works fine)
-+	  # but it's something to keep an eye on.
-+	  #
-+	  # This breaks install into our staging area.  -PB
-+	  # 
-+	  # if test "$inst_prefix_dir" = "$destdir"; then
-+	  #   $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-+	  #   exit $EXIT_FAILURE
-+	  # fi
-+
-+	  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%"`
-+	  else
-+	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-+	  fi
-+
- 	  $echo "$modename: warning: relinking \`$file'" 1>&2
- 	  $show "$relink_command"
- 	  if $run eval "$relink_command"; then :
- 	  else
- 	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
--	    continue
-+	    exit $EXIT_FAILURE
- 	  fi
- 	fi
- 
-@@ -4186,7 +5541,7 @@ relink_command=\"$relink_command\""
- 	    $run eval "$striplib $destdir/$realname" || exit $?
- 	  fi
- 
--	  if test $# -gt 0; then
-+	  if test "$#" -gt 0; then
- 	    # Delete the old symlinks, and create new ones.
- 	    for linkname
- 	    do
-@@ -4199,10 +5554,11 @@ relink_command=\"$relink_command\""
- 
- 	  # Do each command in the postinstall commands.
- 	  lib="$destdir/$realname"
--	  eval cmds=\"$postinstall_cmds\"
-+	  cmds=$postinstall_cmds
- 	  save_ifs="$IFS"; IFS='~'
- 	  for cmd in $cmds; do
- 	    IFS="$save_ifs"
-+	    eval cmd=\"$cmd\"
- 	    $show "$cmd"
- 	    $run eval "$cmd" || exit $?
- 	  done
-@@ -4242,7 +5598,7 @@ relink_command=\"$relink_command\""
- 	*)
- 	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	  ;;
- 	esac
- 
-@@ -4260,7 +5616,7 @@ relink_command=\"$relink_command\""
- 	  $show "$install_prog $staticobj $staticdest"
- 	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
- 	fi
--	exit 0
-+	exit $EXIT_SUCCESS
- 	;;
- 
-       *)
-@@ -4272,21 +5628,49 @@ relink_command=\"$relink_command\""
- 	  destfile="$destdir/$destfile"
- 	fi
- 
-+	# If the file is missing, and there is a .exe on the end, strip it
-+	# because it is most likely a libtool script we actually want to
-+	# install
-+	stripped_ext=""
-+	case $file in
-+	  *.exe)
-+	    if test ! -f "$file"; then
-+	      file=`$echo $file|${SED} 's,.exe$,,'`
-+	      stripped_ext=".exe"
-+	    fi
-+	    ;;
-+	esac
-+
- 	# Do a test to see if this is really a libtool program.
--	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	case $host in
-+	*cygwin*|*mingw*)
-+	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-+	    ;;
-+	*)
-+	    wrapper=$file
-+	    ;;
-+	esac
-+	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
- 	  notinst_deplibs=
- 	  relink_command=
- 
-+	  # To insure that "foo" is sourced, and not "foo.exe",
-+	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-+	  # which disallows the automatic-append-.exe behavior.
-+	  case $build in
-+	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-+	  *) wrapperdot=${wrapper} ;;
-+	  esac
- 	  # If there is no directory component, then add one.
- 	  case $file in
--	  */* | *\\*) . $file ;;
--	  *) . ./$file ;;
-+	  */* | *\\*) . ${wrapperdot} ;;
-+	  *) . ./${wrapperdot} ;;
- 	  esac
- 
- 	  # Check the variables that should have been set.
- 	  if test -z "$notinst_deplibs"; then
--	    $echo "$modename: invalid libtool wrapper script \`$file'" 1>&2
--	    exit 1
-+	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-+	    exit $EXIT_FAILURE
- 	  fi
- 
- 	  finalize=yes
-@@ -4308,10 +5692,17 @@ relink_command=\"$relink_command\""
- 	  done
- 
- 	  relink_command=
-+	  # To insure that "foo" is sourced, and not "foo.exe",
-+	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-+	  # which disallows the automatic-append-.exe behavior.
-+	  case $build in
-+	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-+	  *) wrapperdot=${wrapper} ;;
-+	  esac
- 	  # If there is no directory component, then add one.
- 	  case $file in
--	  */* | *\\*) . $file ;;
--	  *) . ./$file ;;
-+	  */* | *\\*) . ${wrapperdot} ;;
-+	  *) . ./${wrapperdot} ;;
- 	  esac
- 
- 	  outputname=
-@@ -4320,12 +5711,16 @@ relink_command=\"$relink_command\""
- 	      tmpdir="/tmp"
- 	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
- 	      tmpdir="$tmpdir/libtool-$$"
--	      if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
-+	      save_umask=`umask`
-+	      umask 0077
-+	      if $mkdir "$tmpdir"; then
-+	        umask $save_umask
- 	      else
-+	        umask $save_umask
- 		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
- 		continue
- 	      fi
--	      file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-+	      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'`
-@@ -4343,14 +5738,14 @@ relink_command=\"$relink_command\""
- 	    fi
- 	  else
- 	    # Install the binary that we compiled earlier.
--	    file=`$echo "X$file" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-+	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
- 	  fi
- 	fi
- 
- 	# remove .exe since cygwin /usr/bin/install will append another
- 	# one anyways
- 	case $install_prog,$host in
--	/usr/bin/install*,*cygwin*)
-+	*/usr/bin/install*,*cygwin*)
- 	  case $file:$destfile in
- 	  *.exe:*.exe)
- 	    # this is ok
-@@ -4359,7 +5754,7 @@ relink_command=\"$relink_command\""
- 	    destfile=$destfile.exe
- 	    ;;
- 	  *:*.exe)
--	    destfile=`echo $destfile | sed -e 's,.exe$,,'`
-+	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
- 	    ;;
- 	  esac
- 	  ;;
-@@ -4380,16 +5775,17 @@ relink_command=\"$relink_command\""
-       $show "$install_prog $file $oldlib"
-       $run eval "$install_prog \$file \$oldlib" || exit $?
- 
--      if test -n "$stripme" && test -n "$striplib"; then
-+      if test -n "$stripme" && test -n "$old_striplib"; then
- 	$show "$old_striplib $oldlib"
- 	$run eval "$old_striplib $oldlib" || exit $?
-       fi
- 
-       # Do each command in the postinstall commands.
--      eval cmds=\"$old_postinstall_cmds\"
-+      cmds=$old_postinstall_cmds
-       save_ifs="$IFS"; IFS='~'
-       for cmd in $cmds; do
- 	IFS="$save_ifs"
-+	eval cmd=\"$cmd\"
- 	$show "$cmd"
- 	$run eval "$cmd" || exit $?
-       done
-@@ -4403,9 +5799,9 @@ relink_command=\"$relink_command\""
-     if test -n "$current_libdirs"; then
-       # Maybe just do a dry run.
-       test -n "$run" && current_libdirs=" -n$current_libdirs"
--      exec_cmd='$SHELL $0 --finish$current_libdirs'
-+      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-     else
--      exit 0
-+      exit $EXIT_SUCCESS
-     fi
-     ;;
- 
-@@ -4424,10 +5820,11 @@ relink_command=\"$relink_command\""
-       for libdir in $libdirs; do
- 	if test -n "$finish_cmds"; then
- 	  # Do each command in the finish commands.
--	  eval cmds=\"$finish_cmds\"
-+	  cmds=$finish_cmds
- 	  save_ifs="$IFS"; IFS='~'
- 	  for cmd in $cmds; do
- 	    IFS="$save_ifs"
-+	    eval cmd=\"$cmd\"
- 	    $show "$cmd"
- 	    $run eval "$cmd" || admincmds="$admincmds
-        $cmd"
-@@ -4444,43 +5841,43 @@ relink_command=\"$relink_command\""
-     fi
- 
-     # Exit here if they wanted silent mode.
--    test "$show" = ":" && exit 0
-+    test "$show" = : && exit $EXIT_SUCCESS
- 
--    echo "----------------------------------------------------------------------"
--    echo "Libraries have been installed in:"
-+    $echo "----------------------------------------------------------------------"
-+    $echo "Libraries have been installed in:"
-     for libdir in $libdirs; do
--      echo "   $libdir"
-+      $echo "   $libdir"
-     done
--    echo
--    echo "If you ever happen to want to link against installed libraries"
--    echo "in a given directory, LIBDIR, you must either use libtool, and"
--    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    echo "flag during linking and do at least one of the following:"
-+    $echo
-+    $echo "If you ever happen to want to link against installed libraries"
-+    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-+    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-+    $echo "flag during linking and do at least one of the following:"
-     if test -n "$shlibpath_var"; then
--      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      echo "     during execution"
-+      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-+      $echo "     during execution"
-     fi
-     if test -n "$runpath_var"; then
--      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      echo "     during linking"
-+      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-+      $echo "     during linking"
-     fi
-     if test -n "$hardcode_libdir_flag_spec"; then
-       libdir=LIBDIR
-       eval flag=\"$hardcode_libdir_flag_spec\"
- 
--      echo "   - use the \`$flag' linker flag"
-+      $echo "   - use the \`$flag' linker flag"
-     fi
-     if test -n "$admincmds"; then
--      echo "   - have your system administrator run these commands:$admincmds"
-+      $echo "   - have your system administrator run these commands:$admincmds"
-     fi
-     if test -f /etc/ld.so.conf; then
--      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-+      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-     fi
--    echo
--    echo "See any operating system documentation about shared libraries for"
--    echo "more information, such as the ld(1) and ld.so(8) manual pages."
--    echo "----------------------------------------------------------------------"
--    exit 0
-+    $echo
-+    $echo "See any operating system documentation about shared libraries for"
-+    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-+    $echo "----------------------------------------------------------------------"
-+    exit $EXIT_SUCCESS
-     ;;
- 
-   # libtool execute mode
-@@ -4492,7 +5889,7 @@ relink_command=\"$relink_command\""
-     if test -z "$cmd"; then
-       $echo "$modename: you must specify a COMMAND" 1>&2
-       $echo "$help"
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     # Handle -dlopen flags immediately.
-@@ -4500,18 +5897,18 @@ relink_command=\"$relink_command\""
-       if test ! -f "$file"; then
- 	$echo "$modename: \`$file' is not a file" 1>&2
- 	$echo "$help" 1>&2
--	exit 1
-+	exit $EXIT_FAILURE
-       fi
- 
-       dir=
-       case $file in
-       *.la)
- 	# Check to see that this really is a libtool archive.
--	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
- 	else
- 	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
- 	  $echo "$help" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 
- 	# Read the libtool library.
-@@ -4538,7 +5935,7 @@ relink_command=\"$relink_command\""
- 	  dir="$dir/$objdir"
- 	else
- 	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
--	  exit 1
-+	  exit $EXIT_FAILURE
- 	fi
- 	;;
- 
-@@ -4578,7 +5975,7 @@ relink_command=\"$relink_command\""
-       -*) ;;
-       *)
- 	# Do a test to see if this is really a libtool program.
--	if (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- 	  # If there is no directory component, then add one.
- 	  case $file in
- 	  */* | *\\*) . $file ;;
-@@ -4601,7 +5998,7 @@ relink_command=\"$relink_command\""
- 	eval "export $shlibpath_var"
-       fi
- 
--      # Restore saved enviroment variables
-+      # Restore saved environment variables
-       if test "${save_LC_ALL+set}" = set; then
- 	LC_ALL="$save_LC_ALL"; export LC_ALL
-       fi
-@@ -4610,7 +6007,7 @@ relink_command=\"$relink_command\""
-       fi
- 
-       # Now prepare to actually exec the command.
--      exec_cmd='"$cmd"$args'
-+      exec_cmd="\$cmd$args"
-     else
-       # Display what would be done.
-       if test -n "$shlibpath_var"; then
-@@ -4618,7 +6015,7 @@ relink_command=\"$relink_command\""
- 	$echo "export $shlibpath_var"
-       fi
-       $echo "$cmd$args"
--      exit 0
-+      exit $EXIT_SUCCESS
-     fi
-     ;;
- 
-@@ -4646,24 +6043,25 @@ relink_command=\"$relink_command\""
-     if test -z "$rm"; then
-       $echo "$modename: you must specify an RM program" 1>&2
-       $echo "$help" 1>&2
--      exit 1
-+      exit $EXIT_FAILURE
-     fi
- 
-     rmdirs=
- 
-+    origobjdir="$objdir"
-     for file in $files; do
-       dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-       if test "X$dir" = "X$file"; then
- 	dir=.
--	objdir="$objdir"
-+	objdir="$origobjdir"
-       else
--	objdir="$dir/$objdir"
-+	objdir="$dir/$origobjdir"
-       fi
-       name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
--      test $mode = uninstall && objdir="$dir"
-+      test "$mode" = uninstall && objdir="$dir"
- 
-       # Remember objdir for removal later, being careful to avoid duplicates
--      if test $mode = clean; then
-+      if test "$mode" = clean; then
- 	case " $rmdirs " in
- 	  *" $objdir "*) ;;
- 	  *) rmdirs="$rmdirs $objdir" ;;
-@@ -4687,7 +6085,7 @@ relink_command=\"$relink_command\""
-       case $name in
-       *.la)
- 	# Possibly a libtool archive, so verify it.
--	if (sed -e '2q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
- 	  . $dir/$name
- 
- 	  # Delete the libtool libraries and symlinks.
-@@ -4695,18 +6093,19 @@ relink_command=\"$relink_command\""
- 	    rmfiles="$rmfiles $objdir/$n"
- 	  done
- 	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
--	  test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-+	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
- 
--	  if test $mode = uninstall; then
-+	  if test "$mode" = uninstall; then
- 	    if test -n "$library_names"; then
- 	      # Do each command in the postuninstall commands.
--	      eval cmds=\"$postuninstall_cmds\"
-+	      cmds=$postuninstall_cmds
- 	      save_ifs="$IFS"; IFS='~'
- 	      for cmd in $cmds; do
- 		IFS="$save_ifs"
-+		eval cmd=\"$cmd\"
- 		$show "$cmd"
- 		$run eval "$cmd"
--		if test $? != 0 && test "$rmforce" != yes; then
-+		if test "$?" -ne 0 && test "$rmforce" != yes; then
- 		  exit_status=1
- 		fi
- 	      done
-@@ -4715,13 +6114,14 @@ relink_command=\"$relink_command\""
- 
- 	    if test -n "$old_library"; then
- 	      # Do each command in the old_postuninstall commands.
--	      eval cmds=\"$old_postuninstall_cmds\"
-+	      cmds=$old_postuninstall_cmds
- 	      save_ifs="$IFS"; IFS='~'
- 	      for cmd in $cmds; do
- 		IFS="$save_ifs"
-+		eval cmd=\"$cmd\"
- 		$show "$cmd"
- 		$run eval "$cmd"
--		if test $? != 0 && test "$rmforce" != yes; then
-+		if test "$?" -ne 0 && test "$rmforce" != yes; then
- 		  exit_status=1
- 		fi
- 	      done
-@@ -4733,22 +6133,52 @@ relink_command=\"$relink_command\""
- 	;;
- 
-       *.lo)
--	if test "$build_old_libs" = yes; then
--	  oldobj=`$echo "X$name" | $Xsed -e "$lo2o"`
--	  rmfiles="$rmfiles $dir/$oldobj"
-+	# Possibly a libtool object, so verify it.
-+	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+
-+	  # Read the .lo file
-+	  . $dir/$name
-+
-+	  # Add PIC object to the list of files to remove.
-+	  if test -n "$pic_object" \
-+	     && test "$pic_object" != none; then
-+	    rmfiles="$rmfiles $dir/$pic_object"
-+	  fi
-+
-+	  # Add non-PIC object to the list of files to remove.
-+	  if test -n "$non_pic_object" \
-+	     && test "$non_pic_object" != none; then
-+	    rmfiles="$rmfiles $dir/$non_pic_object"
-+	  fi
- 	fi
- 	;;
- 
-       *)
--	# Do a test to see if this is a libtool program.
--	if test $mode = clean &&
--	   (sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
--	  relink_command=
--	  . $dir/$file
-+	if test "$mode" = clean ; then
-+	  noexename=$name
-+	  case $file in
-+	  *.exe)
-+	    file=`$echo $file|${SED} 's,.exe$,,'`
-+	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-+	    # $file with .exe has already been added to rmfiles,
-+	    # add $file without .exe
-+	    rmfiles="$rmfiles $file"
-+	    ;;
-+	  esac
-+	  # Do a test to see if this is a libtool program.
-+	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-+	    relink_command=
-+	    . $dir/$noexename
- 
--	  rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
--	  if test "$fast_install" = yes && test -n "$relink_command"; then
--	    rmfiles="$rmfiles $objdir/lt-$name"
-+	    # note $name still contains .exe if it was in $file originally
-+	    # as does the version of $file that was added into $rmfiles
-+	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-+	    if test "$fast_install" = yes && test -n "$relink_command"; then
-+	      rmfiles="$rmfiles $objdir/lt-$name"
-+	    fi
-+	    if test "X$noexename" != "X$name" ; then
-+	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-+	    fi
- 	  fi
- 	fi
- 	;;
-@@ -4756,6 +6186,7 @@ relink_command=\"$relink_command\""
-       $show "$rm $rmfiles"
-       $run $rm $rmfiles || exit_status=1
-     done
-+    objdir="$origobjdir"
- 
-     # Try to remove the ${objdir}s in the directories where we deleted files
-     for dir in $rmdirs; do
-@@ -4771,20 +6202,20 @@ relink_command=\"$relink_command\""
-   "")
-     $echo "$modename: you must specify a MODE" 1>&2
-     $echo "$generic_help" 1>&2
--    exit 1
-+    exit $EXIT_FAILURE
-     ;;
-   esac
- 
-   if test -z "$exec_cmd"; then
-     $echo "$modename: invalid operation mode \`$mode'" 1>&2
-     $echo "$generic_help" 1>&2
--    exit 1
-+    exit $EXIT_FAILURE
-   fi
- fi # test -z "$show_help"
- 
- if test -n "$exec_cmd"; then
-   eval exec $exec_cmd
--  exit 1
-+  exit $EXIT_FAILURE
- fi
- 
- # We need to display help for each of the modes.
-@@ -4803,6 +6234,7 @@ Provide generalized library-building support services.
-     --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-     --quiet           same as \`--silent'
-     --silent          don't print informational messages
-+    --tag=TAG         use configuration variables from tag TAG
-     --version         print version information
- 
- MODE must be one of the following:
-@@ -4816,8 +6248,10 @@ MODE must be one of the following:
-       uninstall       remove libraries from an installed directory
- 
- MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
--a more detailed description of MODE."
--  exit 0
-+a more detailed description of MODE.
-+
-+Report bugs to <bug-libtool@gnu.org>."
-+  exit $EXIT_SUCCESS
-   ;;
- 
- clean)
-@@ -4928,6 +6362,9 @@ The following components of LINK-COMMAND are treated specially:
-   -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
-+  -objectlist FILE  Use a list of object files found in FILE to specify objects
-+  -precious-files-regex REGEX
-+                    don't remove output files matching REGEX
-   -release RELEASE  specify package release information
-   -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-   -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-@@ -4969,14 +6406,34 @@ Otherwise, only FILE itself is deleted using RM."
- *)
-   $echo "$modename: invalid operation mode \`$mode'" 1>&2
-   $echo "$help" 1>&2
--  exit 1
-+  exit $EXIT_FAILURE
-   ;;
- esac
- 
--echo
-+$echo
- $echo "Try \`$modename --help' for more information about other modes."
- 
--exit 0
-+exit $EXIT_SUCCESS
-+
-+# The TAGs below are defined such that we never get into a situation
-+# in which we disable both kinds of libraries.  Given conflicting
-+# choices, we go for a static library, that is the most portable,
-+# since we can't tell whether shared libraries were disabled because
-+# the user asked for that or because the platform doesn't support
-+# them.  This is particularly important on AIX, because we don't
-+# support having both static and shared libraries enabled at the same
-+# time on that platform, so we default to a shared-only configuration.
-+# If a disable-shared tag is given, we'll fallback to a static-only
-+# configuration.  But we'll never go from static-only to shared-only.
-+
-+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-+build_libtool_libs=no
-+build_old_libs=yes
-+# ### END LIBTOOL TAG CONFIG: disable-shared
-+
-+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-+build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-+# ### END LIBTOOL TAG CONFIG: disable-static
- 
- # Local Variables:
- # mode:shell-script
-diff --git a/platforms/unix/config/make.cfg.in b/platforms/unix/config/make.cfg.in
-index 8eb0e64..f5735a9 100644
---- a/platforms/unix/config/make.cfg.in
-+++ b/platforms/unix/config/make.cfg.in
-@@ -65,7 +65,7 @@ datadir=	@datadir@
- mandir=		@mandir@
- imgdir=		@imgdir@
- plgdir=		@plgdir@
--docdir=		$(prefix)/doc/squeak
-+docdir=		@docdir@
- 
- SHELL=		@SHELL@
- MKINSTALLDIRS=	$(SHELL) $(cfgdir)/mkinstalldirs
-diff --git a/platforms/unix/config/mkconfig.in b/platforms/unix/config/mkconfig.in
-index 3042d66..35e7a60 100644
---- a/platforms/unix/config/mkconfig.in
-+++ b/platforms/unix/config/mkconfig.in
-@@ -2,8 +2,8 @@
- 
- int_modules="@int_modules@"
- ext_modules="@ext_modules@"
--int_plugins="@int_plugins@ `tail -1 @vmmdir@/plugins.int | sed 's,.* =,,'`"
--ext_plugins="@ext_plugins@ `tail -1 @vmmdir@/plugins.ext | sed 's,.* =,,'`"
-+int_plugins="@int_plugins@ `tail -n 1 @vmmdir@/plugins.int | sed 's,.* =,,'`"
-+ext_plugins="@ext_plugins@ `tail -n 1 @vmmdir@/plugins.ext | sed 's,.* =,,'`"
- 
- if test -f plugins.exc; then
-   nlsp='tr \012\015 \040\040'
-diff --git a/platforms/unix/plugins/MIDIPlugin/acinclude.m4 b/platforms/unix/plugins/MIDIPlugin/acinclude.m4
-index db37ba2..ddfe4d6 100644
---- a/platforms/unix/plugins/MIDIPlugin/acinclude.m4
-+++ b/platforms/unix/plugins/MIDIPlugin/acinclude.m4
-@@ -3,7 +3,7 @@ AC_TRY_COMPILE([
-   #include <alsa/asoundlib.h>
- ],[;],[
-   AC_MSG_RESULT(yes)
--  AC_DEFINE(USE_MIDI_ALSA, 1)
-+  AC_DEFINE(USE_MIDI_ALSA, 1, "MIDI support via alsa")
- ],[
-   AC_MSG_RESULT(no)
-   AC_PLUGIN_DISABLE
-diff --git a/platforms/unix/plugins/PseudoTTYPlugin/acinclude.m4 b/platforms/unix/plugins/PseudoTTYPlugin/acinclude.m4
-index 2240122..c17fc43 100644
---- a/platforms/unix/plugins/PseudoTTYPlugin/acinclude.m4
-+++ b/platforms/unix/plugins/PseudoTTYPlugin/acinclude.m4
-@@ -1,7 +1,7 @@
- AC_HAVE_HEADERS(util.h libutil.h pty.h stropts.h)
- 
- AC_SEARCH_LIBS(openpty, util,
--  AC_DEFINE(HAVE_OPENPTY, 1),[
-+  AC_DEFINE(HAVE_OPENPTY, 1, "openpty present"),[
-   if test -r /dev/ptmx; then
--    AC_CHECK_FUNC(grantpt, AC_DEFINE(HAVE_UNIX98_PTYS, 1))
-+    AC_CHECK_FUNC(grantpt, AC_DEFINE(HAVE_UNIX98_PTYS, 1, "unix98 ptys"))
-   fi])
-diff --git a/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c b/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c
-index ee8251e..a5cef31 100644
---- a/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c
-+++ b/platforms/unix/plugins/SqueakFFIPrims/any-libffi.c
-@@ -26,6 +26,7 @@
- #if defined(FFI_TEST)
-   static int primitiveFail(void) { puts("primitive fail"); exit(1); return 0; }
- #else
-+  #include <sqVirtualMachine.h>
-   extern struct VirtualMachine *interpreterProxy;
- # define primitiveFail() interpreterProxy->primitiveFail();
- #endif
-diff --git a/platforms/unix/plugins/UnixOSProcessPlugin/acinclude.m4 b/platforms/unix/plugins/UnixOSProcessPlugin/acinclude.m4
-index 4e79cb2..42046a5 100644
---- a/platforms/unix/plugins/UnixOSProcessPlugin/acinclude.m4
-+++ b/platforms/unix/plugins/UnixOSProcessPlugin/acinclude.m4
-@@ -1,2 +1,2 @@
--AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV, 1))
-+AC_CHECK_FUNC(unsetenv, AC_DEFINE(HAVE_UNSETENV, 1, "unsetenv available"))
- AC_PLUGIN_CHECK_LIB(pthread, pthread_kill)
-diff --git a/platforms/unix/vm-display-Quartz/acinclude.m4 b/platforms/unix/vm-display-Quartz/acinclude.m4
-index f0c7026..e95d322 100644
---- a/platforms/unix/vm-display-Quartz/acinclude.m4
-+++ b/platforms/unix/vm-display-Quartz/acinclude.m4
-@@ -11,11 +11,11 @@ case $host_os in
- esac
- 
- if test "$have_quartz" = "yes"; then
--  AC_DEFINE(USE_QUARTZ, [1])
-+  AC_DEFINE(USE_QUARTZ, [1], "Use quartz")
-   if test "$have_gl" = ""; then have_gl="no"; fi
-   AC_CHECK_HEADERS(OpenGL/gl.h, [
-     have_gl=yes
--    AC_DEFINE(USE_QUARTZ_CGL, [1])
-+    AC_DEFINE(USE_QUARTZ_CGL, [1], "Use quartz CGL")
-   ])
- else
-   AC_PLUGIN_DISABLE
-diff --git a/platforms/unix/vm-display-X11/acinclude.m4 b/platforms/unix/vm-display-X11/acinclude.m4
-index ed53dea..2aa5725 100644
---- a/platforms/unix/vm-display-X11/acinclude.m4
-+++ b/platforms/unix/vm-display-X11/acinclude.m4
-@@ -29,8 +29,8 @@ if test "$have_x" = "yes"; then
-     X_INCLUDES="-I${x_includes}"
-   fi
-   AC_CHECK_LIB(X11, XOpenDisplay, [
--    AC_DEFINE(USE_X11, [1])
--    AC_DEFINE_UNQUOTED(VM_X11DIR, "${x_libraries}")
-+    AC_DEFINE(USE_X11, [1], "Use X11")
-+    AC_DEFINE_UNQUOTED(VM_X11DIR, "${x_libraries}", "VM X11 Dir")
-     LIBS="${LIBS} -lX11"
-     AC_CHECK_LIB(Xext, XShmAttach)
-     if test "$have_gl" = "yes"; then 
-@@ -38,7 +38,7 @@ if test "$have_x" = "yes"; then
-       AC_CHECK_HEADERS(GL/gl.h, [
-         AC_CHECK_HEADERS(GL/glx.h, [
-           have_gl=yes
--          AC_DEFINE(USE_X11_GLX, [1])
-+          AC_DEFINE(USE_X11_GLX, [1], "Use GLX")
-           AC_CHECK_LIB(GL,glIsEnabled)
-         ])
-       ])
-diff --git a/platforms/unix/vm-display-custom/acinclude.m4 b/platforms/unix/vm-display-custom/acinclude.m4
-index ae35abd..855a309 100644
---- a/platforms/unix/vm-display-custom/acinclude.m4
-+++ b/platforms/unix/vm-display-custom/acinclude.m4
-@@ -12,5 +12,5 @@ if test "$have_dpy_custom" = "yes"; then
-   AC_MSG_RESULT([yes])
- else
-   AC_MSG_RESULT([no])
--  AC_PLUGIN_DISABLE
-+  AC_PLUGIN_DISABLE()
- fi
-diff --git a/platforms/unix/vm-sound-Sun/acinclude.m4 b/platforms/unix/vm-sound-Sun/acinclude.m4
-index a0cea63..ae8f24a 100644
---- a/platforms/unix/vm-sound-Sun/acinclude.m4
-+++ b/platforms/unix/vm-sound-Sun/acinclude.m4
-@@ -3,11 +3,11 @@
- AC_MSG_CHECKING([for SunOS/Solaris audio])
- AC_TRY_COMPILE([#include <sys/audioio.h>],[AUDIO_SUNVTS;],[
-   AC_MSG_RESULT(yes)
--  AC_DEFINE_UNQUOTED(HAVE_SYS_AUDIOIO_H,1)
-+  AC_DEFINE_UNQUOTED(HAVE_SYS_AUDIOIO_H,1, "solaris audio")
- ],[
-   AC_TRY_COMPILE([#include <sun/audioio.h>],[AUDIO_SUNVTS;],[
-     AC_MSG_RESULT(yes)
--    AC_DEFINE_UNQUOTED(HAVE_SUN_AUDIOIO_H,1)
-+    AC_DEFINE_UNQUOTED(HAVE_SUN_AUDIOIO_H,1, "solaris audio")
-   ],[
-     AC_MSG_RESULT(no)
-     AC_PLUGIN_DISABLE
-diff --git a/platforms/unix/vm/acinclude.m4 b/platforms/unix/vm/acinclude.m4
-index bffca29..99ce430 100644
---- a/platforms/unix/vm/acinclude.m4
-+++ b/platforms/unix/vm/acinclude.m4
-@@ -42,6 +42,6 @@ else
- fi
- 
- AC_CHECK_FUNC(nanosleep, [
--  AC_DEFINE(HAVE_NANOSLEEP, 1)
-+  AC_DEFINE(HAVE_NANOSLEEP, 1, "is nanosleep available")
-   AC_SUBST(HAVE_NANOSLEEP)
- ])
diff --git a/packages/squeak/squeakvm_3.10.1.bb b/packages/squeak/squeakvm_3.10.1.bb
deleted file mode 100644
index 95d4399482..0000000000
--- a/packages/squeak/squeakvm_3.10.1.bb
+++ /dev/null
@@ -1,86 +0,0 @@
-DESCRIPTION = "Squeak VM"
-LICENSE = "Squeak License"
-HOMEPAGE = "http://www.squeakvm.org"
-DEPENDS = "virtual/libx11 libffi"
-
-EXTRA_OECONF += " --with-x --without-npsqueak --with-ffi=any-libffi --docdir=${docdir}/squeak"
-
-
-SRC_URI = "http://www.squeakvm.org/unix/release/Squeak-3.10-1.src.tar.gz \
-           file://configure-fixes.patch;patch=1"
-S = "${WORKDIR}/Squeak-3.10-1/platforms/unix/config"
-
-inherit autotools
-
-do_patch_prepend() {
-	import bb
-	bb.data.setVar('S', '${WORKDIR}/Squeak-3.10-1', d)
-}
-
-do_configure() {
-    mkdir -p ../bld
-    cd ../bld
-    oe_runconf
-}
-
-do_compile_prepend() {
-    cd ../bld
-}
-
-do_install_prepend() {
-    cd ../bld
-}
-
-do_install_append() {
-    # Help to install the binary into the right place
-    install -m 0755 ${S}/../bld/.libs/squeak ${D}${libdir}/squeak/3.10-1/
-}
-
-PACKAGES += "\
-    ${PN}-plugin-midi             ${PN}-plugin-midi-dbg\
-    ${PN}-plugin-tty              ${PN}-plugin-tty-dbg\
-    ${PN}-plugin-sound-alsa       ${PN}-plugin-sound-alsa-dbg\
-    ${PN}-plugin-sound-oss        ${PN}-plugin-sound-oss-dbg\
-    ${PN}-plugin-sound-null       ${PN}-plugin-sound-null-dbg\
-    ${PN}-plugin-xdisplaycontrol  ${PN}-plugin-xdisplaycontrol-dbg\
-    ${PN}-plugin-b3daccelerator   ${PN}-plugin-b3daccelerator-dbg\
-    ${PN}-plugin-display-x11      ${PN}-plugin-display-x11-dbg\
-    ${PN}-plugin-display-null     ${PN}-plugin-display-null-dbg\
-    ${PN}-plugin-display-fb       ${PN}-plugin-display-fb-dbg\
-    ${PN}-plugin-v4l              ${PN}-plugin-v4l-dbg\
-    ${PN}-plugin-squeak3d         ${PN}-plugin-squeak3d-dbg\
-    ${PN}-plugin-unix-process    ${PN}-plugin-unix-process-dbg\
-"
-
-FILES_${PN} += " ${libdir}/squeak/3.10-1/squeak"
-FILES_${PN}-dbg += " ${libdir}/squeak/3.10-1/.debug/squeak "
-
-# plugins
-FILES_${PN}-plugin-midi = "${libdir}/squeak/3.10-1/MIDIPlugin.so"
-FILES_${PN}-plugin-tty = "${libdir}/squeak/3.10-1/PseudoTTYPlugin.so"
-FILES_${PN}-plugin-sound-alsa = "${libdir}/squeak/3.10-1/vm-sound-ALSA.so"
-FILES_${PN}-plugin-sound-null = "${libdir}/squeak/3.10-1/vm-sound-null.so"
-FILES_${PN}-plugin-sound-oss = "${libdir}/squeak/3.10-1/vm-sound-OSS.so"
-FILES_${PN}-plugin-xdisplaycontrol = "${libdir}/squeak/3.10-1/XDisplayControlPlugin.so"
-FILES_${PN}-plugin-b3daccelerator = "${libdir}/squeak/3.10-1/B3DAcceleratorPlugin.so"
-FILES_${PN}-plugin-display-x11 = "${libdir}/squeak/3.10-1/vm-display-X11.so"
-FILES_${PN}-plugin-display-null = "${libdir}/squeak/3.10-1/vm-display-null.so"
-FILES_${PN}-plugin-display-fb = "${libdir}/squeak/3.10-1/vm-display-fbdev.so"
-FILES_${PN}-plugin-v4l = "${libdir}/squeak/3.10-1/VideoForLinuxPlugin.so"
-FILES_${PN}-plugin-squeak3d = "${libdir}/squeak/3.10-1/Squeak3D.so"
-FILES_${PN}-plugin-unix-process = "${libdir}/squeak/3.10-1/UnixOSProcessPlugin.so"
-
-# debug package
-FILES_${PN}-plugin-midi-dbg = "${libdir}/squeak/3.10-1/.debug/MIDIPlugin.so"
-FILES_${PN}-plugin-tty-dbg = "${libdir}/squeak/3.10-1/.debug/PseudoTTYPlugin.so"
-FILES_${PN}-plugin-sound-alsa-dbg = "${libdir}/squeak/3.10-1/.debug/vm-sound-ALSA.so"
-FILES_${PN}-plugin-sound-null-dbg = "${libdir}/squeak/3.10-1/.debug/vm-sound-null.so"
-FILES_${PN}-plugin-sound-oss-dbg = "${libdir}/squeak/3.10-1/.debug/vm-sound-OSS.so"
-FILES_${PN}-plugin-xdisplaycontrol-dbg = "${libdir}/squeak/3.10-1/.debug/XDisplayControlPlugin.so"
-FILES_${PN}-plugin-b3daccelerator-dbg = "${libdir}/squeak/3.10-1/.debug/B3DAcceleratorPlugin.so"
-FILES_${PN}-plugin-display-x11-dbg = "${libdir}/squeak/3.10-1/.debug/vm-display-X11.so"
-FILES_${PN}-plugin-display-null-dbg = "${libdir}/squeak/3.10-1/.debug/vm-display-null.so"
-FILES_${PN}-plugin-display-fb-dbg = "${libdir}/squeak/3.10-1/.debug/vm-display-fbdev.so"
-FILES_${PN}-plugin-v4l-dbg = "${libdir}/squeak/3.10-1/.debug/VideoForLinuxPlugin.so"
-FILES_${PN}-plugin-squeak3d-dbg = "${libdir}/squeak/3.10-1/.debug/Squeak3D.so"
-FILES_${PN}-plugin-unix-process-dbg = "${libdir}/squeak/3.10-1/.debug/UnixOSProcessPlugin.so"
author	Denys Dmytriyenko <denis@denix.org>	2009-03-17 14:32:59 -0400
committer	Denys Dmytriyenko <denis@denix.org>	2009-03-17 14:32:59 -0400
commit	709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree	37ee08b1eb308f3b2b6426d5793545c38396b838 /packages/squeak
parent	fa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
download	openembedded-709c4d66e0b107ca606941b988bad717c0b45d9b.tar.gz