[SCM] ghostess/master: Remove quilt patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Sep 9 15:44:19 UTC 2010


The following commit has been merged in the master branch:
commit 8099c70e20766ca044a8d0d46cf9b5c91e34c0fc
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Sep 9 17:44:17 2010 +0200

    Remove quilt patches.

diff --git a/debian/patches/debian-changes-20100326-1 b/debian/patches/debian-changes-20100326-1
deleted file mode 100644
index 96b9ebb..0000000
--- a/debian/patches/debian-changes-20100326-1
+++ /dev/null
@@ -1,11638 +0,0 @@
-Description: Upstream changes introduced in version 20100326-1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- ghostess (20100326-1) unstable; urgency=low
- .
-   * Initial release (Closes: #594364)
- .
- The person named in the Author field signed this changelog entry.
-Author: rosea grammostola <rosea.grammostola at gmail.com>
-Bug-Debian: http://bugs.debian.org/594364
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- ghostess-20100326.orig/config.h.in
-+++ ghostess-20100326/config.h.in
-@@ -67,6 +67,9 @@
- /* Define to the one symbol short name of this package. */
- #undef PACKAGE_TARNAME
- 
-+/* Define to the home page for this package. */
-+#undef PACKAGE_URL
-+
- /* Define to the version of this package. */
- #undef PACKAGE_VERSION
- 
---- ghostess-20100326.orig/Makefile.in
-+++ ghostess-20100326/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -57,6 +57,31 @@ RECURSIVE_TARGETS = all-recursive check-
- 	install-pdf-recursive install-ps-recursive install-recursive \
- 	installcheck-recursive installdirs-recursive pdf-recursive \
- 	ps-recursive uninstall-recursive
-+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-+am__vpath_adj = case $$p in \
-+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-+    *) f=$$p;; \
-+  esac;
-+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-+am__install_max = 40
-+am__nobase_strip_setup = \
-+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-+am__nobase_strip = \
-+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-+am__nobase_list = $(am__nobase_strip_setup); \
-+  for p in $$list; do echo "$$p $$p"; done | \
-+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
-+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
-+    if (++n[$$2] == $(am__install_max)) \
-+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
-+    END { for (dir in files) print dir, files[dir] }'
-+am__base_list = \
-+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
-+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-+man1dir = $(mandir)/man1
-+am__installdirs = "$(DESTDIR)$(man1dir)"
-+NROFF = nroff
-+MANS = $(man_MANS)
- RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-   distclean-recursive maintainer-clean-recursive
- AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-@@ -159,6 +184,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
-@@ -221,8 +247,10 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = src
-+man_MANS = ghostess.1
- EXTRA_DIST = \
--	autogen.sh
-+	autogen.sh \
-+	ghostess.1
- 
- AUTOMAKE_OPTIONS = foreign
- all: config.h
-@@ -289,6 +317,44 @@ clean-libtool:
- 
- distclean-libtool:
- 	-rm -f libtool config.lt
-+install-man1: $(man_MANS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-+	@list=''; test -n "$(man1dir)" || exit 0; \
-+	{ for i in $$list; do echo "$$i"; done; \
-+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+	  sed -n '/\.1[a-z]*$$/p'; \
-+	} | while read p; do \
-+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; echo "$$p"; \
-+	done | \
-+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
-+	sed 'N;N;s,\n, ,g' | { \
-+	list=; while read file base inst; do \
-+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
-+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
-+	  fi; \
-+	done; \
-+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
-+	while read files; do \
-+	  test -z "$$files" || { \
-+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
-+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
-+	done; }
-+
-+uninstall-man1:
-+	@$(NORMAL_UNINSTALL)
-+	@list=''; test -n "$(man1dir)" || exit 0; \
-+	files=`{ for i in $$list; do echo "$$i"; done; \
-+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
-+	  sed -n '/\.1[a-z]*$$/p'; \
-+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
-+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-+	test -z "$$files" || { \
-+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -297,7 +363,7 @@ distclean-libtool:
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -322,7 +388,7 @@ $(RECURSIVE_TARGETS):
- 	fi; test -z "$$fail"
- 
- $(RECURSIVE_CLEAN_TARGETS):
--	@failcom='exit 1'; \
-+	@fail= failcom='exit 1'; \
- 	for f in x $$MAKEFLAGS; do \
- 	  case $$f in \
- 	    *=* | --[!k]*);; \
-@@ -426,6 +492,19 @@ distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
- 
- distdir: $(DISTFILES)
-+	@list='$(MANS)'; if test -n "$$list"; then \
-+	  list=`for p in $$list; do \
-+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
-+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
-+	  if test -n "$$list" && \
-+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
-+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
-+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
-+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
-+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
-+	    exit 1; \
-+	  else :; fi; \
-+	else :; fi
- 	$(am__remove_distdir)
- 	test -d "$(distdir)" || mkdir "$(distdir)"
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-@@ -486,7 +565,8 @@ distdir: $(DISTFILES)
- 	  fi; \
- 	done
- 	-test -n "$(am__skip_mode_fix)" \
--	|| find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-+	|| find "$(distdir)" -type d ! -perm -755 \
-+		-exec chmod u+rwx,go+rx {} \; -o \
- 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- 	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
-@@ -530,17 +610,17 @@ dist dist-all: distdir
- distcheck: dist
- 	case '$(DIST_ARCHIVES)' in \
- 	*.tar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
- 	*.tar.bz2*) \
--	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
- 	*.tar.lzma*) \
--	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
-+	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
- 	*.tar.xz*) \
- 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
- 	*.tar.Z*) \
- 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- 	*.shar.gz*) \
--	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
- 	*.zip*) \
- 	  unzip $(distdir).zip ;;\
- 	esac
-@@ -601,9 +681,12 @@ distcleancheck: distclean
- 	       exit 1; } >&2
- check-am: all-am
- check: check-recursive
--all-am: Makefile config.h
-+all-am: Makefile $(MANS) config.h
- installdirs: installdirs-recursive
- installdirs-am:
-+	for dir in "$(DESTDIR)$(man1dir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -651,7 +734,7 @@ info: info-recursive
- 
- info-am:
- 
--install-data-am:
-+install-data-am: install-man
- 
- install-dvi: install-dvi-recursive
- 
-@@ -667,7 +750,7 @@ install-info: install-info-recursive
- 
- install-info-am:
- 
--install-man:
-+install-man: install-man1
- 
- install-pdf: install-pdf-recursive
- 
-@@ -697,7 +780,9 @@ ps: ps-recursive
- 
- ps-am:
- 
--uninstall-am:
-+uninstall-am: uninstall-man
-+
-+uninstall-man: uninstall-man1
- 
- .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
- 	ctags-recursive install-am install-strip tags-recursive
-@@ -712,11 +797,12 @@ uninstall-am:
- 	install install-am install-data install-data-am install-dvi \
- 	install-dvi-am install-exec install-exec-am install-html \
- 	install-html-am install-info install-info-am install-man \
--	install-pdf install-pdf-am install-ps install-ps-am \
--	install-strip installcheck installcheck-am installdirs \
--	installdirs-am maintainer-clean maintainer-clean-generic \
--	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
--	ps ps-am tags tags-recursive uninstall uninstall-am
-+	install-man1 install-pdf install-pdf-am install-ps \
-+	install-ps-am install-strip installcheck installcheck-am \
-+	installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic \
-+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-man uninstall-man1
- 
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
---- ghostess-20100326.orig/configure.ac
-+++ ghostess-20100326/configure.ac
-@@ -1,6 +1,6 @@
- dnl Process this file with autoconf to produce a configure script.
- 
--AC_INIT(ghostess, 20100326, musound-at-jps-dot-net)
-+AC_INIT(ghostess, 20100905, musound-at-jps-dot-net)
- 
- AC_CONFIG_SRCDIR(src/ghostess.c)
- AM_INIT_AUTOMAKE
---- ghostess-20100326.orig/config.guess
-+++ ghostess-20100326/config.guess
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Attempt to guess a canonical system name.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- #   Free Software Foundation, Inc.
- 
--timestamp='2009-04-27'
-+timestamp='2009-06-10'
- 
- # This file is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by
-@@ -170,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
- 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
- 		eval $set_cc_for_build
- 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
--			| grep __ELF__ >/dev/null
-+			| grep -q __ELF__
- 		then
- 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
- 		    # Return netbsd for either.  FIX?
-@@ -656,7 +656,7 @@ EOF
- 	    # => hppa64-hp-hpux11.23
- 
- 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
--		grep __LP64__ >/dev/null
-+		grep -q __LP64__
- 	    then
- 		HP_ARCH="hppa2.0w"
- 	    else
-@@ -822,6 +822,9 @@ EOF
-     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
- 	echo i${UNAME_MACHINE}-pc-mks
- 	exit ;;
-+    8664:Windows_NT:*)
-+	echo x86_64-pc-mks
-+	exit ;;
-     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
- 	# How do we know it's Interix rather than the generic POSIX subsystem?
- 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -882,40 +885,17 @@ EOF
-     m68*:Linux:*:*)
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu
- 	exit ;;
--    mips:Linux:*:*)
-+    mips:Linux:*:* | mips64:Linux:*:*)
- 	eval $set_cc_for_build
- 	sed 's/^	//' << EOF >$dummy.c
- 	#undef CPU
--	#undef mips
--	#undef mipsel
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
- 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mipsel
-+	CPU=${UNAME_MACHINE}el
- 	#else
- 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips
--	#else
--	CPU=
--	#endif
--	#endif
--EOF
--	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
--	    /^CPU/{
--		s: ::g
--		p
--	    }'`"
--	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
--	;;
--    mips64:Linux:*:*)
--	eval $set_cc_for_build
--	sed 's/^	//' << EOF >$dummy.c
--	#undef CPU
--	#undef mips64
--	#undef mips64el
--	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
--	CPU=mips64el
--	#else
--	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
--	CPU=mips64
-+	CPU=${UNAME_MACHINE}
- 	#else
- 	CPU=
- 	#endif
-@@ -947,7 +927,7 @@ EOF
- 	  EV67)  UNAME_MACHINE=alphaev67 ;;
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
--	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- 	exit ;;
-@@ -1001,14 +981,6 @@ EOF
- 	  elf32-i386)
- 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- 		;;
--	  a.out-i386-linux)
--		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
--		exit ;;
--	  "")
--		# Either a pre-BFD a.out linker (linux-gnuoldld) or
--		# one that does not give us useful --help.
--		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
--		exit ;;
- 	esac
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
-@@ -1074,7 +1046,7 @@ EOF
-     i*86:syllable:*:*)
- 	echo ${UNAME_MACHINE}-pc-syllable
- 	exit ;;
--    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
- 	echo i386-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-     i*86:*DOS:*:*)
-@@ -1182,7 +1154,7 @@ EOF
-     rs6000:LynxOS:2.*:*)
- 	echo rs6000-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
--    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
- 	echo powerpc-unknown-lynxos${UNAME_RELEASE}
- 	exit ;;
-     SM[BE]S:UNIX_SV:*:*)
---- ghostess-20100326.orig/config.sub
-+++ ghostess-20100326/config.sub
-@@ -1,10 +1,10 @@
- #! /bin/sh
- # Configuration validation subroutine script.
- #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
--#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
- #   Free Software Foundation, Inc.
- 
--timestamp='2009-04-17'
-+timestamp='2009-06-11'
- 
- # This file is (in principle) common to ALL GNU software.
- # The presence of a machine in this file suggests that SOME GNU software
-@@ -153,6 +153,9 @@ case $os in
- 		os=
- 		basic_machine=$1
- 		;;
-+        -bluegene*)
-+	        os=-cnk
-+		;;
- 	-sim | -cisco | -oki | -wec | -winbond)
- 		os=
- 		basic_machine=$1
-@@ -467,6 +470,10 @@ case $basic_machine in
- 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
- 		os=-linux
- 		;;
-+	bluegene*)
-+		basic_machine=powerpc-ibm
-+		os=-cnk
-+		;;
- 	c90)
- 		basic_machine=c90-cray
- 		os=-unicos
-@@ -1260,7 +1267,7 @@ case $os in
- 	# Each alternative MUST END IN A *, to match a version number.
- 	# -sysv* is not here because it comes later, after sysvr4.
- 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
--	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- 	      | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-@@ -1613,7 +1620,7 @@ case $basic_machine in
- 			-sunos*)
- 				vendor=sun
- 				;;
--			-aix*)
-+			-cnk*|-aix*)
- 				vendor=ibm
- 				;;
- 			-beos*)
---- ghostess-20100326.orig/configure
-+++ ghostess-20100326/configure
-@@ -1,20 +1,24 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.63 for ghostess 20100326.
-+# Generated by GNU Autoconf 2.65 for ghostess 20100905.
- #
- # Report bugs to <musound-at-jps-dot-net>.
- #
-+#
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
-+#
-+#
- # This configure script is free software; the Free Software Foundation
- # gives unlimited permission to copy, distribute and modify it.
--## --------------------- ##
--## M4sh Initialization.  ##
--## --------------------- ##
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
- 
- # Be more Bourne compatible
- DUALCASE=1; export DUALCASE # for MKS sh
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-   emulate sh
-   NULLCMD=:
-   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -22,23 +26,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in
--  *posix*) set -o posix ;;
-+  case `(set -o) 2>/dev/null` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
- esac
--
- fi
- 
- 
--
--
--# PATH needs CR
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
- as_nl='
- '
- export as_nl
-@@ -46,7 +42,13 @@ export as_nl
- as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
--if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-   as_echo='printf %s\n'
-   as_echo_n='printf %s'
- else
-@@ -57,7 +59,7 @@ else
-     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-     as_echo_n_body='eval
-       arg=$1;
--      case $arg in
-+      case $arg in #(
-       *"$as_nl"*)
- 	expr "X$arg" : "X\\(.*\\)$as_nl";
- 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -80,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set;
-   }
- fi
- 
--# Support unset when possible.
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
--fi
--
- 
- # IFS
- # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -96,15 +91,15 @@ fi
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
--case $0 in
-+case $0 in #((
-   *[\\/]* ) as_myself=$0 ;;
-   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
- IFS=$as_save_IFS
- 
-      ;;
-@@ -116,12 +111,16 @@ if test "x$as_myself" = x; then
- fi
- if test ! -f "$as_myself"; then
-   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
--  { (exit 1); exit 1; }
-+  exit 1
- fi
- 
--# Work around bugs in pre-3.0 UWIN ksh.
--for as_var in ENV MAIL MAILPATH
--do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
- done
- PS1='$ '
- PS2='> '
-@@ -133,330 +132,300 @@ export LC_ALL
- LANGUAGE=C
- export LANGUAGE
- 
--# Required to use basename.
--if expr a : '\(a\)' >/dev/null 2>&1 &&
--   test "X`expr 00001 : '.*\(...\)'`" = X001; then
--  as_expr=expr
--else
--  as_expr=false
--fi
--
--if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
--  as_basename=basename
--else
--  as_basename=false
--fi
--
--
--# Name of the executable.
--as_me=`$as_basename -- "$0" ||
--$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
--	 X"$0" : 'X\(//\)$' \| \
--	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X/"$0" |
--    sed '/^.*\/\([^/][^/]*\)\/*$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\/\(\/\/\)$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\/\(\/\).*/{
--	    s//\1/
--	    q
--	  }
--	  s/.*/./; q'`
--
- # CDPATH.
--$as_unset CDPATH
--
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test "x$CONFIG_SHELL" = x; then
--  if (eval ":") 2>/dev/null; then
--  as_have_required=yes
-+  as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-+  emulate sh
-+  NULLCMD=:
-+  # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '\${1+\"\$@\"}'='\"\$@\"'
-+  setopt NO_GLOB_SUBST
- else
--  as_have_required=no
-+  case \`(set -o) 2>/dev/null\` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
-+esac
- fi
--
--  if test $as_have_required = yes &&	 (eval ":
--(as_func_return () {
--  (exit \$1)
--}
--as_func_success () {
--  as_func_return 0
--}
--as_func_failure () {
--  as_func_return 1
--}
--as_func_ret_success () {
--  return 0
--}
--as_func_ret_failure () {
--  return 1
--}
-+"
-+  as_required="as_fn_return () { (exit \$1); }
-+as_fn_success () { as_fn_return 0; }
-+as_fn_failure () { as_fn_return 1; }
-+as_fn_ret_success () { return 0; }
-+as_fn_ret_failure () { return 1; }
- 
- exitcode=0
--if as_func_success; then
--  :
--else
--  exitcode=1
--  echo as_func_success failed.
--fi
--
--if as_func_failure; then
--  exitcode=1
--  echo as_func_failure succeeded.
--fi
--
--if as_func_ret_success; then
--  :
--else
--  exitcode=1
--  echo as_func_ret_success failed.
--fi
--
--if as_func_ret_failure; then
--  exitcode=1
--  echo as_func_ret_failure succeeded.
--fi
--
--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
--  :
-+as_fn_success || { exitcode=1; echo as_fn_success failed.; }
-+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
-+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
-+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
-+
-+else
-+  exitcode=1; echo positional parameters were not saved.
-+fi
-+test x\$exitcode = x0 || exit 1"
-+  as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-+  as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-+  eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
-+  test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
-+test \$(( 1 + 1 )) = 2 || exit 1"
-+  if (eval "$as_required") 2>/dev/null; then :
-+  as_have_required=yes
- else
--  exitcode=1
--  echo positional parameters were not saved.
-+  as_have_required=no
- fi
-+  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
- 
--test \$exitcode = 0) || { (exit 1); exit 1; }
--
--(
--  as_lineno_1=\$LINENO
--  as_lineno_2=\$LINENO
--  test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" &&
--  test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; }
--") 2> /dev/null; then
--  :
- else
--  as_candidate_shells=
--    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+as_found=false
- for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  case $as_dir in
-+  as_found=:
-+  case $as_dir in #(
- 	 /*)
- 	   for as_base in sh bash ksh sh5; do
--	     as_candidate_shells="$as_candidate_shells $as_dir/$as_base"
-+	     # Try only shells that exist, to save several forks.
-+	     as_shell=$as_dir/$as_base
-+	     if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-+		    { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$as_shell as_have_required=yes
-+		   if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
-+  break 2
-+fi
-+fi
- 	   done;;
-        esac
-+  as_found=false
- done
-+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-+	      { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
-+  CONFIG_SHELL=$SHELL as_have_required=yes
-+fi; }
- IFS=$as_save_IFS
- 
- 
--      for as_shell in $as_candidate_shells $SHELL; do
--	 # 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
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
--  emulate sh
--  NULLCMD=:
--  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
--  # is contrary to our usage.  Disable this feature.
--  alias -g '${1+"$@"}'='"$@"'
--  setopt NO_GLOB_SUBST
--else
--  case `(set -o) 2>/dev/null` in
--  *posix*) set -o posix ;;
--esac
--
--fi
--
--
--:
--_ASEOF
--}; then
--  CONFIG_SHELL=$as_shell
--	       as_have_required=yes
--	       if { "$as_shell" 2> /dev/null <<\_ASEOF
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
--  emulate sh
--  NULLCMD=:
--  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
--  # is contrary to our usage.  Disable this feature.
--  alias -g '${1+"$@"}'='"$@"'
--  setopt NO_GLOB_SUBST
--else
--  case `(set -o) 2>/dev/null` in
--  *posix*) set -o posix ;;
--esac
--
--fi
--
--
--:
--(as_func_return () {
--  (exit $1)
--}
--as_func_success () {
--  as_func_return 0
--}
--as_func_failure () {
--  as_func_return 1
--}
--as_func_ret_success () {
--  return 0
--}
--as_func_ret_failure () {
--  return 1
--}
--
--exitcode=0
--if as_func_success; then
--  :
--else
--  exitcode=1
--  echo as_func_success failed.
--fi
--
--if as_func_failure; then
--  exitcode=1
--  echo as_func_failure succeeded.
--fi
--
--if as_func_ret_success; then
--  :
--else
--  exitcode=1
--  echo as_func_ret_success failed.
--fi
--
--if as_func_ret_failure; then
--  exitcode=1
--  echo as_func_ret_failure succeeded.
--fi
--
--if ( set x; as_func_ret_success y && test x = "$1" ); then
--  :
--else
--  exitcode=1
--  echo positional parameters were not saved.
--fi
--
--test $exitcode = 0) || { (exit 1); exit 1; }
--
--(
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; }
--
--_ASEOF
--}; then
--  break
--fi
--
--fi
--
--      done
--
--      if test "x$CONFIG_SHELL" != x; then
--  for as_var in BASH_ENV ENV
--	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
--	done
-+      if test "x$CONFIG_SHELL" != x; then :
-+  # We cannot yet assume a decent shell, so we have to provide a
-+	# neutralization value for shells without unset; and this also
-+	# works around shells that cannot unset nonexistent variables.
-+	BASH_ENV=/dev/null
-+	ENV=/dev/null
-+	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
- 	export CONFIG_SHELL
- 	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
- fi
- 
--
--    if test $as_have_required = no; then
--  echo This script requires a shell more modern than all the
--      echo shells that I found on your system.  Please install a
--      echo modern shell, or manually run the script under such a
--      echo shell if you do have one.
--      { (exit 1); exit 1; }
-+    if test x$as_have_required = xno; then :
-+  $as_echo "$0: This script requires a shell more modern than all"
-+  $as_echo "$0: the shells that I found on your system."
-+  if test x${ZSH_VERSION+set} = xset ; then
-+    $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
-+    $as_echo "$0: be upgraded to zsh 4.3.4 or later."
-+  else
-+    $as_echo "$0: Please tell bug-autoconf at gnu.org and
-+$0: musound-at-jps-dot-net about your system, including any
-+$0: error possibly output before this message. Then install
-+$0: a modern shell, or manually run the script under such a
-+$0: shell if you do have one."
-+  fi
-+  exit 1
- fi
--
--
- fi
--
- fi
-+SHELL=${CONFIG_SHELL-/bin/sh}
-+export SHELL
-+# Unset more variables known to interfere with behavior of common tools.
-+CLICOLOR_FORCE= GREP_OPTIONS=
-+unset CLICOLOR_FORCE GREP_OPTIONS
- 
-+## --------------------- ##
-+## M4sh Shell Functions. ##
-+## --------------------- ##
-+# as_fn_unset VAR
-+# ---------------
-+# Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
-+}
-+as_unset=as_fn_unset
-+
-+# as_fn_set_status STATUS
-+# -----------------------
-+# Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} # as_fn_set_status
-+
-+# as_fn_exit STATUS
-+# -----------------
-+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
-+{
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} # as_fn_exit
-+
-+# as_fn_mkdir_p
-+# -------------
-+# Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
- 
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
- 
--(eval "as_func_return () {
--  (exit \$1)
--}
--as_func_success () {
--  as_func_return 0
--}
--as_func_failure () {
--  as_func_return 1
--}
--as_func_ret_success () {
--  return 0
--}
--as_func_ret_failure () {
--  return 1
--}
- 
--exitcode=0
--if as_func_success; then
--  :
-+} # as_fn_mkdir_p
-+# as_fn_append VAR VALUE
-+# ----------------------
-+# Append the text in VALUE to the end of the definition contained in VAR. Take
-+# advantage of any shell optimizations that allow amortized linear growth over
-+# repeated appends, instead of the typical quadratic growth present in naive
-+# implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
- else
--  exitcode=1
--  echo as_func_success failed.
--fi
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
- 
--if as_func_failure; then
--  exitcode=1
--  echo as_func_failure succeeded.
--fi
-+# as_fn_arith ARG...
-+# ------------------
-+# Perform arithmetic evaluation on the ARGs, and store the result in the
-+# global $as_val. Take advantage of shells that can avoid forks. The arguments
-+# must be portable across $(()) and expr.
-+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-+  eval 'as_fn_arith ()
-+  {
-+    as_val=$(( $* ))
-+  }'
-+else
-+  as_fn_arith ()
-+  {
-+    as_val=`expr "$@" || test $? -eq 1`
-+  }
-+fi # as_fn_arith
- 
--if as_func_ret_success; then
--  :
-+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
-+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
-+as_fn_error ()
-+{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} # as_fn_error
-+
-+if expr a : '\(a\)' >/dev/null 2>&1 &&
-+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
-+  as_expr=expr
- else
--  exitcode=1
--  echo as_func_ret_success failed.
-+  as_expr=false
- fi
- 
--if as_func_ret_failure; then
--  exitcode=1
--  echo as_func_ret_failure succeeded.
-+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
-+  as_basename=basename
-+else
-+  as_basename=false
- fi
- 
--if ( set x; as_func_ret_success y && test x = \"\$1\" ); then
--  :
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
- else
--  exitcode=1
--  echo positional parameters were not saved.
-+  as_dirname=false
- fi
- 
--test \$exitcode = 0") || {
--  echo No shell found that supports shell functions.
--  echo Please tell bug-autoconf at gnu.org about your system,
--  echo including any error possibly output before this message.
--  echo This can help us improve future autoconf versions.
--  echo Configuration will now proceed without shell functions.
--}
-+as_me=`$as_basename -- "$0" ||
-+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-+	 X"$0" : 'X\(//\)$' \| \
-+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X/"$0" |
-+    sed '/^.*\/\([^/][^/]*\)\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\/\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
- 
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
- 
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
--
--  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
--  # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line after each line using $LINENO; the second 'sed'
--  # does the real work.  The second script uses 'N' to pair each
--  # line-number line with the line containing $LINENO, and appends
--  # trailing '-' during substitution so that $LINENO is not a special
--  # case at line end.
--  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # scripts with optimization help from Paolo Bonzini.  Blame Lee
--  # E. McMahon (1931-1989) for sed's syntax.  :-)
-+  as_lineno_1=$LINENO as_lineno_1a=$LINENO
-+  as_lineno_2=$LINENO as_lineno_2a=$LINENO
-+  eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
-+  test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || {
-+  # Blame Lee E. McMahon (1931-1989) for sed's syntax.  :-)
-   sed -n '
-     p
-     /[$]LINENO/=
-@@ -473,8 +442,7 @@ test \$exitcode = 0") || {
-       s/-\n.*//
-     ' >$as_me.lineno &&
-   chmod +x "$as_me.lineno" ||
--    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
--   { (exit 1); exit 1; }; }
-+    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
- 
-   # Don't try to exec as it changes $[0], causing all sort of problems
-   # (the dirname of $[0] is not the place where we might find the
-@@ -484,29 +452,18 @@ test \$exitcode = 0") || {
-   exit
- }
- 
--
--if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
--  as_dirname=dirname
--else
--  as_dirname=false
--fi
--
- ECHO_C= ECHO_N= ECHO_T=
--case `echo -n x` in
-+case `echo -n x` in #(((((
- -n*)
--  case `echo 'x\c'` in
-+  case `echo 'xy\c'` in
-   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
--  *)   ECHO_C='\c';;
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-   esac;;
- *)
-   ECHO_N='-n';;
- esac
--if expr a : '\(a\)' >/dev/null 2>&1 &&
--   test "X`expr 00001 : '.*\(...\)'`" = X001; then
--  as_expr=expr
--else
--  as_expr=false
--fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
- if test -d conf$$.dir; then
-@@ -536,7 +493,7 @@ rm -f conf$$ conf$$.exe conf$$.dir/conf$
- rmdir conf$$.dir 2>/dev/null
- 
- if mkdir -p . 2>/dev/null; then
--  as_mkdir_p=:
-+  as_mkdir_p='mkdir -p "$as_dir"'
- else
-   test -d ./-p && rmdir ./-p
-   as_mkdir_p=false
-@@ -555,10 +512,10 @@ else
-       if test -d "$1"; then
- 	test -d "$1/.";
-       else
--	case $1 in
-+	case $1 in #(
- 	-*)set "./$1";;
- 	esac;
--	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- 	???[sx]*):;;*)false;;esac;fi
-     '\'' sh
-   '
-@@ -573,7 +530,6 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
- 
- 
- 
--
- # Check that we are running under the correct shell.
- SHELL=${CONFIG_SHELL-/bin/sh}
- 
-@@ -722,7 +678,8 @@ fi
- 
- 
- 
--exec 7<&0 </dev/null 6>&1
-+test -n "$DJDIR" || exec 7<&0 </dev/null
-+exec 6>&1
- 
- # Name of the host.
- # hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-@@ -740,14 +697,14 @@ cross_compiling=no
- subdirs=
- MFLAGS=
- MAKEFLAGS=
--SHELL=${CONFIG_SHELL-/bin/sh}
- 
- # Identity of this package.
- PACKAGE_NAME='ghostess'
- PACKAGE_TARNAME='ghostess'
--PACKAGE_VERSION='20100326'
--PACKAGE_STRING='ghostess 20100326'
-+PACKAGE_VERSION='20100905'
-+PACKAGE_STRING='ghostess 20100905'
- PACKAGE_BUGREPORT='musound-at-jps-dot-net'
-+PACKAGE_URL=''
- 
- ac_unique_file="src/ghostess.c"
- # Factoring default headers for most tests.
-@@ -900,6 +857,7 @@ bindir
- program_transform_name
- prefix
- exec_prefix
-+PACKAGE_URL
- PACKAGE_BUGREPORT
- PACKAGE_STRING
- PACKAGE_VERSION
-@@ -1044,8 +1002,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
--   { (exit 1); exit 1; }; }
-+      as_fn_error "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1071,8 +1028,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
--   { (exit 1); exit 1; }; }
-+      as_fn_error "invalid feature name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1276,8 +1232,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
--   { (exit 1); exit 1; }; }
-+      as_fn_error "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1293,8 +1248,7 @@ do
-     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
-     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
--      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
--   { (exit 1); exit 1; }; }
-+      as_fn_error "invalid package name: $ac_useropt"
-     ac_useropt_orig=$ac_useropt
-     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
-     case $ac_user_opts in
-@@ -1324,17 +1278,17 @@ do
-   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-     x_libraries=$ac_optarg ;;
- 
--  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
--Try \`$0 --help' for more information." >&2
--   { (exit 1); exit 1; }; }
-+  -*) as_fn_error "unrecognized option: \`$ac_option'
-+Try \`$0 --help' for more information."
-     ;;
- 
-   *=*)
-     ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
--      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
--   { (exit 1); exit 1; }; }
-+    case $ac_envvar in #(
-+      '' | [0-9]* | *[!_$as_cr_alnum]* )
-+      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
-+    esac
-     eval $ac_envvar=\$ac_optarg
-     export $ac_envvar ;;
- 
-@@ -1351,15 +1305,13 @@ done
- 
- if test -n "$ac_prev"; then
-   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
--  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
--   { (exit 1); exit 1; }; }
-+  as_fn_error "missing argument to $ac_option"
- fi
- 
- if test -n "$ac_unrecognized_opts"; then
-   case $enable_option_checking in
-     no) ;;
--    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
--   { (exit 1); exit 1; }; } ;;
-+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-   esac
- fi
-@@ -1382,8 +1334,7 @@ do
-     [\\/$]* | ?:[\\/]* )  continue;;
-     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-   esac
--  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
--   { (exit 1); exit 1; }; }
-+  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
- done
- 
- # There might be people who depend on the old broken behavior: `$host'
-@@ -1413,11 +1364,9 @@ test "$silent" = yes && exec 6>/dev/null
- ac_pwd=`pwd` && test -n "$ac_pwd" &&
- ac_ls_di=`ls -di .` &&
- ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
--  { $as_echo "$as_me: error: working directory cannot be determined" >&2
--   { (exit 1); exit 1; }; }
-+  as_fn_error "working directory cannot be determined"
- test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
--  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
--   { (exit 1); exit 1; }; }
-+  as_fn_error "pwd does not report name of working directory"
- 
- 
- # Find the source files, if location was not specified.
-@@ -1456,13 +1405,11 @@ else
- fi
- if test ! -r "$srcdir/$ac_unique_file"; then
-   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
--  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
--   { (exit 1); exit 1; }; }
-+  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
- fi
- ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
- ac_abs_confdir=`(
--	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
--   { (exit 1); exit 1; }; }
-+	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
- 	pwd)`
- # When building in place, set srcdir=.
- if test "$ac_abs_confdir" = "$ac_pwd"; then
-@@ -1488,7 +1435,7 @@ if test "$ac_init_help" = "long"; then
-   # Omit some internal or obsolete options to make the list less imposing.
-   # This message is too long to be a string in the A/UX 3.1 sh.
-   cat <<_ACEOF
--\`configure' configures ghostess 20100326 to adapt to many kinds of systems.
-+\`configure' configures ghostess 20100905 to adapt to many kinds of systems.
- 
- Usage: $0 [OPTION]... [VAR=VALUE]...
- 
-@@ -1558,7 +1505,7 @@ fi
- 
- if test -n "$ac_init_help"; then
-   case $ac_init_help in
--     short | recursive ) echo "Configuration of ghostess 20100326:";;
-+     short | recursive ) echo "Configuration of ghostess 20100905:";;
-    esac
-   cat <<\_ACEOF
- 
-@@ -1589,7 +1536,7 @@ Some influential environment variables:
-   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
-+  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
-   PKG_CONFIG  path to pkg-config utility
-@@ -1664,25 +1611,382 @@ ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_
-   done
- fi
- 
--test -n "$ac_init_help" && exit $ac_status
--if $ac_init_version; then
--  cat <<\_ACEOF
--ghostess configure 20100326
--generated by GNU Autoconf 2.63
--
--Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
--This configure script is free software; the Free Software Foundation
--gives unlimited permission to copy, distribute and modify it.
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+  cat <<\_ACEOF
-+ghostess configure 20100905
-+generated by GNU Autoconf 2.65
-+
-+Copyright (C) 2009 Free Software Foundation, Inc.
-+This configure script is free software; the Free Software Foundation
-+gives unlimited permission to copy, distribute and modify it.
-+_ACEOF
-+  exit
-+fi
-+
-+## ------------------------ ##
-+## Autoconf initialization. ##
-+## ------------------------ ##
-+
-+# ac_fn_c_try_compile LINENO
-+# --------------------------
-+# Try to compile conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_compile ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compile") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_retval=1
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_try_compile
-+
-+# ac_fn_c_try_link LINENO
-+# -----------------------
-+# Try to link conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_link ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  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 ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_retval=1
-+fi
-+  # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
-+  # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
-+  # interfere with the next link command; also delete a directory that is
-+  # left behind by Apple's compiler.  We do this before executing the actions.
-+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_try_link
-+
-+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
-+# -------------------------------------------------------
-+# Tests whether HEADER exists and can be compiled using the include files in
-+# INCLUDES, setting the cache variable VAR accordingly.
-+ac_fn_c_check_header_compile ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+#include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} # ac_fn_c_check_header_compile
-+
-+# ac_fn_c_try_cpp LINENO
-+# ----------------------
-+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-+ac_fn_c_try_cpp ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { { ac_try="$ac_cpp conftest.$ac_ext"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
-+  ac_status=$?
-+  if test -s conftest.err; then
-+    grep -v '^ *+' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+    mv -f conftest.er1 conftest.err
-+  fi
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } >/dev/null && {
-+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+    ac_retval=1
-+fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_try_cpp
-+
-+# ac_fn_c_try_run LINENO
-+# ----------------------
-+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-+# that executables *can* be run.
-+ac_fn_c_try_run ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then :
-+  ac_retval=0
-+else
-+  $as_echo "$as_me: program exited with status $ac_status" >&5
-+       $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+       ac_retval=$ac_status
-+fi
-+  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+  as_fn_set_status $ac_retval
-+
-+} # ac_fn_c_try_run
-+
-+# ac_fn_c_check_func LINENO FUNC VAR
-+# ----------------------------------
-+# Tests whether FUNC exists, setting the cache variable VAR accordingly
-+ac_fn_c_check_func ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
-+   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-+#define $2 innocuous_$2
-+
-+/* System header to define __stub macros and hopefully few prototypes,
-+    which can conflict with char $2 (); 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 $2
-+
-+/* 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 $2 ();
-+/* 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_$2 || defined __stub___$2
-+choke me
-+#endif
-+
-+int
-+main ()
-+{
-+return $2 ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  eval "$3=yes"
-+else
-+  eval "$3=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} # ac_fn_c_check_func
-+
-+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-+# -------------------------------------------------------
-+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-+# the include files in INCLUDES and setting the cache variable VAR
-+# accordingly.
-+ac_fn_c_check_header_mongrel ()
-+{
-+  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+else
-+  # Is the header compilable?
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-+$as_echo_n "checking $2 usability... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+$4
-+#include <$2>
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_header_compiler=yes
-+else
-+  ac_header_compiler=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-+$as_echo "$ac_header_compiler" >&6; }
-+
-+# Is the header present?
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-+$as_echo_n "checking $2 presence... " >&6; }
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <$2>
- _ACEOF
--  exit
-+if ac_fn_c_try_cpp "$LINENO"; then :
-+  ac_header_preproc=yes
-+else
-+  ac_header_preproc=no
-+fi
-+rm -f conftest.err conftest.$ac_ext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-+$as_echo "$ac_header_preproc" >&6; }
-+
-+# So?  What about this header?
-+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
-+  yes:no: )
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-+    ;;
-+  no:yes:* )
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     check for missing prerequisite headers?" >&5
-+$as_echo "$as_me: WARNING: $2:     check for missing prerequisite headers?" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&5
-+$as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-+( cat <<\_ASBOX
-+## ------------------------------------- ##
-+## Report this to musound-at-jps-dot-net ##
-+## ------------------------------------- ##
-+_ASBOX
-+     ) | sed "s/^/$as_me: WARNING:     /" >&2
-+    ;;
-+esac
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-+$as_echo_n "checking for $2... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  eval "$3=\$ac_header_compiler"
-+fi
-+eval ac_res=\$$3
-+	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
- fi
-+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
-+
-+} # ac_fn_c_check_header_mongrel
- cat >config.log <<_ACEOF
- This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
--It was created by ghostess $as_me 20100326, which was
--generated by GNU Autoconf 2.63.  Invocation command line was
-+It was created by ghostess $as_me 20100905, which was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -1718,8 +2022,8 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  $as_echo "PATH: $as_dir"
--done
-+    $as_echo "PATH: $as_dir"
-+  done
- IFS=$as_save_IFS
- 
- } >&5
-@@ -1756,9 +2060,9 @@ do
-       ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
-     case $ac_pass in
--    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-+    1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
-     2)
--      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-+      as_fn_append ac_configure_args1 " '$ac_arg'"
-       if test $ac_must_keep_next = true; then
- 	ac_must_keep_next=false # Got value, back to normal.
-       else
-@@ -1774,13 +2078,13 @@ do
- 	  -* ) ac_must_keep_next=true ;;
- 	esac
-       fi
--      ac_configure_args="$ac_configure_args '$ac_arg'"
-+      as_fn_append ac_configure_args " '$ac_arg'"
-       ;;
-     esac
-   done
- done
--$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
--$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-+{ ac_configure_args0=; unset ac_configure_args0;}
-+{ ac_configure_args1=; unset ac_configure_args1;}
- 
- # When interrupted or exit'd, cleanup temporary files, and complete
- # config.log.  We remove comments because anyway the quotes in there
-@@ -1805,13 +2109,13 @@ _ASBOX
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
- $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
--      *) $as_unset $ac_var ;;
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-       esac ;;
-     esac
-   done
-@@ -1883,39 +2187,41 @@ _ASBOX
-     exit $exit_status
- ' 0
- for ac_signal in 1 2 13 15; do
--  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-+  trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
- done
- ac_signal=0
- 
- # confdefs.h avoids OS command line length limits that DEFS can exceed.
- rm -f -r conftest* confdefs.h
- 
-+$as_echo "/* confdefs.h */" > confdefs.h
-+
- # Predefined preprocessor variables.
- 
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE_NAME "$PACKAGE_NAME"
- _ACEOF
- 
--
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
- _ACEOF
- 
--
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE_VERSION "$PACKAGE_VERSION"
- _ACEOF
- 
--
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE_STRING "$PACKAGE_STRING"
- _ACEOF
- 
--
- cat >>confdefs.h <<_ACEOF
- #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
- _ACEOF
- 
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_URL "$PACKAGE_URL"
-+_ACEOF
-+
- 
- # Let the site file select an alternate cache file if it wants to.
- # Prefer an explicitly selected file to automatically selected ones.
-@@ -1933,8 +2239,8 @@ fi
- for ac_site_file in "$ac_site_file1" "$ac_site_file2"
- do
-   test "x$ac_site_file" = xNONE && continue
--  if test -r "$ac_site_file"; then
--    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-+  if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
- $as_echo "$as_me: loading site script $ac_site_file" >&6;}
-     sed 's/^/| /' "$ac_site_file" >&5
-     . "$ac_site_file"
-@@ -1942,10 +2248,10 @@ $as_echo "$as_me: loading site script $a
- done
- 
- if test -r "$cache_file"; then
--  # Some versions of bash will fail to source /dev/null (special
--  # files actually), so we avoid doing that.
--  if test -f "$cache_file"; then
--    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
-+  # Some versions of bash will fail to source /dev/null (special files
-+  # actually), so we avoid doing that.  DJGPP emulates it as a regular file.
-+  if test /dev/null != "$cache_file" && test -f "$cache_file"; then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
- $as_echo "$as_me: loading cache $cache_file" >&6;}
-     case $cache_file in
-       [\\/]* | ?:[\\/]* ) . "$cache_file";;
-@@ -1953,7 +2259,7 @@ $as_echo "$as_me: loading cache $cache_f
-     esac
-   fi
- else
--  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
- $as_echo "$as_me: creating cache $cache_file" >&6;}
-   >$cache_file
- fi
-@@ -1968,11 +2274,11 @@ for ac_var in $ac_precious_vars; do
-   eval ac_new_val=\$ac_env_${ac_var}_value
-   case $ac_old_set,$ac_new_set in
-     set,)
--      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
- $as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,set)
--      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
- $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-       ac_cache_corrupted=: ;;
-     ,);;
-@@ -1982,17 +2288,17 @@ $as_echo "$as_me: error: \`$ac_var' was
- 	ac_old_val_w=`echo x $ac_old_val`
- 	ac_new_val_w=`echo x $ac_new_val`
- 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
--	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
- $as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- 	  ac_cache_corrupted=:
- 	else
--	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-+	  { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
- $as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
- 	  eval $ac_var=\$ac_old_val
- 	fi
--	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   former value:  \`$ac_old_val'" >&5
- $as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
--	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}:   current value: \`$ac_new_val'" >&5
- $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
-       fi;;
-   esac
-@@ -2004,43 +2310,20 @@ $as_echo "$as_me:   current value: \`$ac
-     esac
-     case " $ac_configure_args " in
-       *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
--      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-+      *) as_fn_append ac_configure_args " '$ac_arg'" ;;
-     esac
-   fi
- done
- if $ac_cache_corrupted; then
--  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
- $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
--  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
--$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
- fi
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
-+## -------------------- ##
-+## Main body of script. ##
-+## -------------------- ##
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -2055,24 +2338,16 @@ am__api_version='1.11'
- 
- ac_aux_dir=
- for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
--  if test -f "$ac_dir/install-sh"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/install-sh -c"
--    break
--  elif test -f "$ac_dir/install.sh"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/install.sh -c"
--    break
--  elif test -f "$ac_dir/shtool"; then
--    ac_aux_dir=$ac_dir
--    ac_install_sh="$ac_aux_dir/shtool install -c"
--    break
--  fi
-+  for ac_t in install-sh install.sh shtool; do
-+    if test -f "$ac_dir/$ac_t"; then
-+      ac_aux_dir=$ac_dir
-+      ac_install_sh="$ac_aux_dir/$ac_t -c"
-+      break 2
-+    fi
-+  done
- done
- if test -z "$ac_aux_dir"; then
--  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
--$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
- fi
- 
- # These three variables are undocumented and unsupported,
-@@ -2098,10 +2373,10 @@ ac_configure="$SHELL $ac_aux_dir/configu
- # OS/2's system install, which has a completely different semantic
- # ./install, which can be erroneously created by make from ./install.sh.
- # Reject install programs that cannot install multiple files.
--{ $as_echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
- $as_echo_n "checking for a BSD-compatible install... " >&6; }
- if test -z "$INSTALL"; then
--if test "${ac_cv_path_install+set}" = set; then
-+if test "${ac_cv_path_install+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2109,11 +2384,11 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  # Account for people who put trailing slashes in PATH elements.
--case $as_dir/ in
--  ./ | .// | /cC/* | \
-+    # Account for people who put trailing slashes in PATH elements.
-+case $as_dir/ in #((
-+  ./ | .// | /[cC]/* | \
-   /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
--  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-   /usr/ucb/* ) ;;
-   *)
-     # OSF1 and SCO ODT 3.0 have their own names for install.
-@@ -2150,7 +2425,7 @@ case $as_dir/ in
-     ;;
- esac
- 
--done
-+  done
- IFS=$as_save_IFS
- 
- rm -rf conftest.one conftest.two conftest.dir
-@@ -2166,7 +2441,7 @@ fi
-     INSTALL=$ac_install_sh
-   fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
- $as_echo "$INSTALL" >&6; }
- 
- # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-@@ -2177,7 +2452,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
- 
- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
- 
--{ $as_echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
- $as_echo_n "checking whether build environment is sane... " >&6; }
- # Just in case
- sleep 1
-@@ -2188,15 +2463,11 @@ am_lf='
- '
- case `pwd` in
-   *[\\\"\#\$\&\'\`$am_lf]*)
--    { { $as_echo "$as_me:$LINENO: error: unsafe absolute working directory name" >&5
--$as_echo "$as_me: error: unsafe absolute working directory name" >&2;}
--   { (exit 1); exit 1; }; };;
-+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
- esac
- case $srcdir in
-   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
--    { { $as_echo "$as_me:$LINENO: error: unsafe srcdir value: \`$srcdir'" >&5
--$as_echo "$as_me: error: unsafe srcdir value: \`$srcdir'" >&2;}
--   { (exit 1); exit 1; }; };;
-+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
- esac
- 
- # Do `set' in a subshell so we don't clobber the current shell's
-@@ -2218,11 +2489,8 @@ if (
-       # if, for instance, CONFIG_SHELL is bash and it inherits a
-       # broken ls alias from the environment.  This has actually
-       # happened.  Such a system could not be considered "sane".
--      { { $as_echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
--alias in your environment" >&5
--$as_echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
--alias in your environment" >&2;}
--   { (exit 1); exit 1; }; }
-+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment" "$LINENO" 5
-    fi
- 
-    test "$2" = conftest.file
-@@ -2231,13 +2499,10 @@ then
-    # Ok.
-    :
- else
--   { { $as_echo "$as_me:$LINENO: error: newly created file is older than distributed files!
--Check your system clock" >&5
--$as_echo "$as_me: error: newly created file is older than distributed files!
--Check your system clock" >&2;}
--   { (exit 1); exit 1; }; }
-+   as_fn_error "newly created file is older than distributed files!
-+Check your system clock" "$LINENO" 5
- fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- test "$program_prefix" != NONE &&
-   program_transform_name="s&^&$program_prefix&;$program_transform_name"
-@@ -2265,7 +2530,7 @@ if eval "$MISSING --run true"; then
-   am_missing_run="$MISSING --run "
- else
-   am_missing_run=
--  { $as_echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
- $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
- fi
- 
-@@ -2286,9 +2551,9 @@ if test "$cross_compiling" != no; then
-   if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$STRIP"; then
-@@ -2299,24 +2564,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
- $as_echo "$STRIP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2326,9 +2591,9 @@ if test -z "$ac_cv_prog_STRIP"; then
-   ac_ct_STRIP=$STRIP
-   # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_STRIP"; then
-@@ -2339,24 +2604,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
- $as_echo "$ac_ct_STRIP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2365,7 +2630,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -2378,10 +2643,10 @@ fi
- fi
- INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
- 
--{ $as_echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
- $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
- if test -z "$MKDIR_P"; then
--  if test "${ac_cv_path_mkdir+set}" = set; then
-+  if test "${ac_cv_path_mkdir+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-@@ -2389,7 +2654,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/s
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in mkdir gmkdir; do
-+    for ac_prog in mkdir gmkdir; do
- 	 for ac_exec_ext in '' $ac_executable_extensions; do
- 	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
- 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-@@ -2401,11 +2666,12 @@ do
- 	   esac
- 	 done
-        done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- 
-+  test -d ./--version && rmdir ./--version
-   if test "${ac_cv_path_mkdir+set}" = set; then
-     MKDIR_P="$ac_cv_path_mkdir -p"
-   else
-@@ -2413,11 +2679,10 @@ fi
-     # value for MKDIR_P within a source directory, because that will
-     # break other packages using the cache if that directory is
-     # removed, or if the value is a relative name.
--    test -d ./--version && rmdir ./--version
-     MKDIR_P="$ac_install_sh -d"
-   fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $MKDIR_P" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
- $as_echo "$MKDIR_P" >&6; }
- 
- mkdir_p="$MKDIR_P"
-@@ -2430,9 +2695,9 @@ for ac_prog in gawk mawk nawk awk
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_AWK+set}" = set; then
-+if test "${ac_cv_prog_AWK+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$AWK"; then
-@@ -2443,24 +2708,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- AWK=$ac_cv_prog_AWK
- if test -n "$AWK"; then
--  { $as_echo "$as_me:$LINENO: result: $AWK" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
- $as_echo "$AWK" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2468,11 +2733,11 @@ fi
-   test -n "$AWK" && break
- done
- 
--{ $as_echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
- $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
- set x ${MAKE-make}
- ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
--if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then
-+if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
-   $as_echo_n "(cached) " >&6
- else
-   cat >conftest.make <<\_ACEOF
-@@ -2490,11 +2755,11 @@ esac
- rm -f conftest.make
- fi
- if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-   SET_MAKE=
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-   SET_MAKE="MAKE=${MAKE-make}"
- fi
-@@ -2514,9 +2779,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
-   am__isrc=' -I$(srcdir)'
-   # test to see if srcdir already configured
-   if test -f $srcdir/config.status; then
--    { { $as_echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
--$as_echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-   fi
- fi
- 
-@@ -2532,7 +2795,7 @@ fi
- 
- # Define the identity of the package.
-  PACKAGE='ghostess'
-- VERSION='20100326'
-+ VERSION='20100905'
- 
- 
- cat >>confdefs.h <<_ACEOF
-@@ -2583,9 +2846,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -2596,24 +2859,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2623,9 +2886,9 @@ if test -z "$ac_cv_prog_CC"; then
-   ac_ct_CC=$CC
-   # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -2636,24 +2899,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2662,7 +2925,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -2676,9 +2939,9 @@ if test -z "$CC"; then
-           if test -n "$ac_tool_prefix"; then
-     # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
- set dummy ${ac_tool_prefix}cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -2689,24 +2952,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2716,9 +2979,9 @@ fi
- if test -z "$CC"; then
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -2730,18 +2993,18 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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
-      fi
-     ac_cv_prog_CC="cc"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- if test $ac_prog_rejected = yes; then
-@@ -2760,10 +3023,10 @@ fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2775,9 +3038,9 @@ if test -z "$CC"; then
-   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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_CC+set}" = set; then
-+if test "${ac_cv_prog_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$CC"; then
-@@ -2788,24 +3051,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- CC=$ac_cv_prog_CC
- if test -n "$CC"; then
--  { $as_echo "$as_me:$LINENO: result: $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
- $as_echo "$CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2819,9 +3082,9 @@ if test -z "$CC"; then
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_CC"; then
-@@ -2832,24 +3095,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_CC=$ac_cv_prog_ac_ct_CC
- if test -n "$ac_ct_CC"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
- $as_echo "$ac_ct_CC" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -2862,7 +3125,7 @@ done
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -2873,57 +3136,37 @@ fi
- fi
- 
- 
--test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "no acceptable C compiler found in \$PATH
-+See \`config.log' for more details." "$LINENO" 5; }
- 
- # Provide some information about the compiler.
--$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
-+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
- set X $ac_compile
- ac_compiler=$2
--{ (ac_try="$ac_compiler --version >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler --version >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -v >&5"
--case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -v >&5") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
--{ (ac_try="$ac_compiler -V >&5"
-+for ac_option in --version -v -V -qversion; do
-+  { { ac_try="$ac_compiler $ac_option >&5"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_compiler -V >&5") 2>&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
-+  if test -s conftest.err; then
-+    sed '10a\
-+... rest of stderr output deleted ...
-+         10q' conftest.err >conftest.er1
-+    cat conftest.er1 >&5
-+  fi
-+  rm -f conftest.er1 conftest.err
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+done
- 
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -2939,8 +3182,8 @@ ac_clean_files="$ac_clean_files a.out a.
- # Try to create an executable without -o first, disregard a.out.
- # It will help us diagnose broken compilers, and finding out an intuition
- # of exeext.
--{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
--$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-+$as_echo_n "checking whether the C compiler works... " >&6; }
- ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
- 
- # The possible output files:
-@@ -2956,17 +3199,17 @@ do
- done
- rm -f $ac_rmfiles
- 
--if { (ac_try="$ac_link_default"
-+if { { ac_try="$ac_link_default"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_link_default") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-   # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
- # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
- # in a Makefile.  We should not override ac_cv_exeext if it was cached,
-@@ -2983,7 +3226,7 @@ do
- 	# certainly right.
- 	break;;
-     *.* )
--        if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
-+	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
- 	then :; else
- 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
- 	fi
-@@ -3002,84 +3245,42 @@ test "$ac_cv_exeext" = no && ac_cv_exeex
- else
-   ac_file=''
- fi
--
--{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
--$as_echo "$ac_file" >&6; }
--if test -z "$ac_file"; then
--  $as_echo "$as_me: failed program was:" >&5
-+if test -z "$ac_file"; then :
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+$as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C compiler cannot create executables
--See \`config.log' for more details." >&2;}
--   { (exit 77); exit 77; }; }; }
-+{ as_fn_set_status 77
-+as_fn_error "C compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
- fi
--
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-+$as_echo_n "checking for C compiler default output file name... " >&6; }
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-+$as_echo "$ac_file" >&6; }
- ac_exeext=$ac_cv_exeext
- 
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
--$as_echo_n "checking whether the C compiler works... " >&6; }
--# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
--# If not cross compiling, check that we can run a simple program.
--if test "$cross_compiling" != yes; then
--  if { ac_try='./$ac_file'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--    cross_compiling=no
--  else
--    if test "$cross_compiling" = maybe; then
--	cross_compiling=yes
--    else
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot run C compiled programs.
--If you meant to cross compile, use \`--host'.
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
--    fi
--  fi
--fi
--{ $as_echo "$as_me:$LINENO: result: yes" >&5
--$as_echo "yes" >&6; }
--
- rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
- ac_clean_files=$ac_clean_files_save
--# Check that the compiler produces executables we can run.  If not, either
--# the compiler is broken, or we cross compile.
--{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
--$as_echo_n "checking whether we are cross compiling... " >&6; }
--{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
--$as_echo "$cross_compiling" >&6; }
--
--{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
- $as_echo_n "checking for suffix of executables... " >&6; }
--if { (ac_try="$ac_link"
-+if { { ac_try="$ac_link"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_link") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-   # If both `conftest.exe' and `conftest' are `present' (well, observable)
- # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
- # work properly (i.e., refer to `conftest.exe'), while it won't with
-@@ -3094,32 +3295,83 @@ for ac_file in conftest.exe conftest con
-   esac
- done
- else
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
--
--rm -f conftest$ac_cv_exeext
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-+rm -f conftest conftest$ac_cv_exeext
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
- $as_echo "$ac_cv_exeext" >&6; }
- 
- rm -f conftest.$ac_ext
- EXEEXT=$ac_cv_exeext
- ac_exeext=$EXEEXT
--{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#include <stdio.h>
-+int
-+main ()
-+{
-+FILE *f = fopen ("conftest.out", "w");
-+ return ferror (f) || fclose (f) != 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files="$ac_clean_files conftest.out"
-+# Check that the compiler produces executables we can run.  If not, either
-+# the compiler is broken, or we cross compile.
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-+$as_echo_n "checking whether we are cross compiling... " >&6; }
-+if test "$cross_compiling" != yes; then
-+  { { ac_try="$ac_link"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_link") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-+  if { ac_try='./conftest$ac_cv_exeext'
-+  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-+  (eval "$ac_try") 2>&5
-+  ac_status=$?
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; }; then
-+    cross_compiling=no
-+  else
-+    if test "$cross_compiling" = maybe; then
-+	cross_compiling=yes
-+    else
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+as_fn_error "cannot run C compiled programs.
-+If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
-+    fi
-+  fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-+$as_echo "$cross_compiling" >&6; }
-+
-+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
-+ac_clean_files=$ac_clean_files_save
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
- $as_echo_n "checking for suffix of object files... " >&6; }
--if test "${ac_cv_objext+set}" = set; then
-+if test "${ac_cv_objext+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3131,17 +3383,17 @@ main ()
- }
- _ACEOF
- rm -f conftest.o conftest.obj
--if { (ac_try="$ac_compile"
-+if { { ac_try="$ac_compile"
- case "(($ac_try" in
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
-+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-+$as_echo "$ac_try_echo"; } >&5
-   (eval "$ac_compile") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then :
-   for ac_file in conftest.o conftest.obj conftest.*; do
-   test -f "$ac_file" || continue;
-   case $ac_file in
-@@ -3154,31 +3406,23 @@ else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "cannot compute suffix of object files: cannot compile
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
--
- rm -f conftest.$ac_cv_objext conftest.$ac_ext
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
- $as_echo "$ac_cv_objext" >&6; }
- OBJEXT=$ac_cv_objext
- ac_objext=$OBJEXT
--{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
- $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
--if test "${ac_cv_c_compiler_gnu+set}" = set; then
-+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3192,37 +3436,16 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_compiler_gnu=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_compiler_gnu=no
-+  ac_compiler_gnu=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_c_compiler_gnu=$ac_compiler_gnu
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
- $as_echo "$ac_cv_c_compiler_gnu" >&6; }
- if test $ac_compiler_gnu = yes; then
-   GCC=yes
-@@ -3231,20 +3454,16 @@ else
- fi
- ac_test_CFLAGS=${CFLAGS+set}
- ac_save_CFLAGS=$CFLAGS
--{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
- $as_echo_n "checking whether $CC accepts -g... " >&6; }
--if test "${ac_cv_prog_cc_g+set}" = set; then
-+if test "${ac_cv_prog_cc_g+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_save_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-    ac_cv_prog_cc_g=no
-    CFLAGS="-g"
--   cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3255,35 +3474,11 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_prog_cc_g=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	CFLAGS=""
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  CFLAGS=""
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3294,36 +3489,12 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_compile "$LINENO"; then :
- 
--	ac_c_werror_flag=$ac_save_c_werror_flag
-+else
-+  ac_c_werror_flag=$ac_save_c_werror_flag
- 	 CFLAGS="-g"
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -3331,45 +3502,20 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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_prog_cc_g=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+  ac_cv_prog_cc_g=yes
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-    ac_c_werror_flag=$ac_save_c_werror_flag
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
- $as_echo "$ac_cv_prog_cc_g" >&6; }
- if test "$ac_test_CFLAGS" = set; then
-   CFLAGS=$ac_save_CFLAGS
-@@ -3386,18 +3532,14 @@ else
-     CFLAGS=
-   fi
- fi
--{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
- $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
--if test "${ac_cv_prog_cc_c89+set}" = set; then
-+if test "${ac_cv_prog_cc_c89+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_prog_cc_c89=no
- ac_save_CC=$CC
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdarg.h>
- #include <stdio.h>
-@@ -3454,32 +3596,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlang
- 	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
- do
-   CC="$ac_save_CC $ac_arg"
--  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+  if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_prog_cc_c89=$ac_arg
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext
-   test "x$ac_cv_prog_cc_c89" != "xno" && break
- done
-@@ -3490,17 +3609,19 @@ fi
- # AC_CACHE_VAL
- case "x$ac_cv_prog_cc_c89" in
-   x)
--    { $as_echo "$as_me:$LINENO: result: none needed" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
- $as_echo "none needed" >&6; } ;;
-   xno)
--    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
- $as_echo "unsupported" >&6; } ;;
-   *)
-     CC="$CC $ac_cv_prog_cc_c89"
--    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
- $as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
- esac
-+if test "x$ac_cv_prog_cc_c89" != xno; then :
- 
-+fi
- 
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -3519,7 +3640,7 @@ am__doit:
- .PHONY: am__doit
- END
- # If we don't find an include directive, just comment out the code.
--{ $as_echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
- $as_echo_n "checking for style of include used by $am_make... " >&6; }
- am__include="#"
- am__quote=
-@@ -3547,12 +3668,12 @@ if test "$am__include" = "#"; then
- fi
- 
- 
--{ $as_echo "$as_me:$LINENO: result: $_am_result" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
- $as_echo "$_am_result" >&6; }
- rm -f confinc confmf
- 
- # Check whether --enable-dependency-tracking was given.
--if test "${enable_dependency_tracking+set}" = set; then
-+if test "${enable_dependency_tracking+set}" = set; then :
-   enableval=$enable_dependency_tracking;
- fi
- 
-@@ -3572,9 +3693,9 @@ fi
- 
- depcc="$CC"   am_compiler_list=
- 
--{ $as_echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
- $as_echo_n "checking dependency style of $depcc... " >&6; }
--if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-@@ -3682,7 +3803,7 @@ else
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
- $as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
- CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
- 
-@@ -3704,14 +3825,14 @@ enable_dlopen=yes
- 
- case `pwd` in
-   *\ * | *\	*)
--    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
- $as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
- esac
- 
- 
- 
--macro_version='2.2.6'
--macro_revision='1.3012'
-+macro_version='2.2.6b'
-+macro_revision='1.3017'
- 
- 
- 
-@@ -3729,35 +3850,27 @@ ltmain="$ac_aux_dir/ltmain.sh"
- 
- # Make sure we can run config.sub.
- $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
--  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
--$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
- 
--{ $as_echo "$as_me:$LINENO: checking build system type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
- $as_echo_n "checking build system type... " >&6; }
--if test "${ac_cv_build+set}" = set; then
-+if test "${ac_cv_build+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_build_alias=$build_alias
- test "x$ac_build_alias" = x &&
-   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
- test "x$ac_build_alias" = x &&
--  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
--$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
- ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
--  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
--$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
- $as_echo "$ac_cv_build" >&6; }
- case $ac_cv_build in
- *-*-*) ;;
--*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
--$as_echo "$as_me: error: invalid value of canonical build" >&2;}
--   { (exit 1); exit 1; }; };;
-+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
- esac
- build=$ac_cv_build
- ac_save_IFS=$IFS; IFS='-'
-@@ -3773,28 +3886,24 @@ IFS=$ac_save_IFS
- case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
- 
- 
--{ $as_echo "$as_me:$LINENO: checking host system type" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
- $as_echo_n "checking host system type... " >&6; }
--if test "${ac_cv_host+set}" = set; then
-+if test "${ac_cv_host+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test "x$host_alias" = x; then
-   ac_cv_host=$ac_cv_build
- else
-   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
--    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
--$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
- $as_echo "$ac_cv_host" >&6; }
- case $ac_cv_host in
- *-*-*) ;;
--*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
--$as_echo "$as_me: error: invalid value of canonical host" >&2;}
--   { (exit 1); exit 1; }; };;
-+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
- esac
- host=$ac_cv_host
- ac_save_IFS=$IFS; IFS='-'
-@@ -3810,9 +3919,9 @@ IFS=$ac_save_IFS
- case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
- $as_echo_n "checking for a sed that does not truncate output... " >&6; }
--if test "${ac_cv_path_SED+set}" = set; then
-+if test "${ac_cv_path_SED+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
-@@ -3820,7 +3929,7 @@ else
-        ac_script="$ac_script$as_nl$ac_script"
-      done
-      echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
--     $as_unset ac_script || ac_script=
-+     { ac_script=; unset ac_script;}
-      if test -z "$SED"; then
-   ac_path_SED_found=false
-   # Loop through the user's path and test for each of PROGNAME-LIST
-@@ -3829,7 +3938,7 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in sed gsed; do
-+    for ac_prog in sed gsed; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-       { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-@@ -3849,7 +3958,7 @@ case `"$ac_path_SED" --version 2>&1` in
-     $as_echo '' >> "conftest.nl"
-     "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    ac_count=`expr $ac_count + 1`
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-     if test $ac_count -gt ${ac_path_SED_max-0}; then
-       # Best one so far, save it but keep looking for a better one
-       ac_cv_path_SED="$ac_path_SED"
-@@ -3864,19 +3973,17 @@ esac
-       $ac_path_SED_found && break 3
-     done
-   done
--done
-+  done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_SED"; then
--    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
--$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5
-   fi
- else
-   ac_cv_path_SED=$SED
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
- $as_echo "$ac_cv_path_SED" >&6; }
-  SED="$ac_cv_path_SED"
-   rm -f conftest.sed
-@@ -3894,9 +4001,9 @@ Xsed="$SED -e 1s/^X//"
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
- $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then
-+if test "${ac_cv_path_GREP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$GREP"; then
-@@ -3907,7 +4014,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in grep ggrep; 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_test_x "$ac_path_GREP"; } || continue
-@@ -3927,7 +4034,7 @@ case `"$ac_path_GREP" --version 2>&1` in
-     $as_echo 'GREP' >> "conftest.nl"
-     "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    ac_count=`expr $ac_count + 1`
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-     if test $ac_count -gt ${ac_path_GREP_max-0}; then
-       # Best one so far, save it but keep looking for a better one
-       ac_cv_path_GREP="$ac_path_GREP"
-@@ -3942,26 +4049,24 @@ esac
-       $ac_path_GREP_found && break 3
-     done
-   done
--done
-+  done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_GREP"; then
--    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_GREP=$GREP
- fi
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
- $as_echo "$ac_cv_path_GREP" >&6; }
-  GREP="$ac_cv_path_GREP"
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
- $as_echo_n "checking for egrep... " >&6; }
--if test "${ac_cv_path_EGREP+set}" = set; then
-+if test "${ac_cv_path_EGREP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
-@@ -3975,7 +4080,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in egrep; 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_test_x "$ac_path_EGREP"; } || continue
-@@ -3995,7 +4100,7 @@ case `"$ac_path_EGREP" --version 2>&1` i
-     $as_echo 'EGREP' >> "conftest.nl"
-     "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    ac_count=`expr $ac_count + 1`
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-     if test $ac_count -gt ${ac_path_EGREP_max-0}; then
-       # Best one so far, save it but keep looking for a better one
-       ac_cv_path_EGREP="$ac_path_EGREP"
-@@ -4010,12 +4115,10 @@ esac
-       $ac_path_EGREP_found && break 3
-     done
-   done
--done
-+  done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_EGREP"; then
--    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_EGREP=$EGREP
-@@ -4023,14 +4126,14 @@ fi
- 
-    fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
- $as_echo "$ac_cv_path_EGREP" >&6; }
-  EGREP="$ac_cv_path_EGREP"
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
- $as_echo_n "checking for fgrep... " >&6; }
--if test "${ac_cv_path_FGREP+set}" = set; then
-+if test "${ac_cv_path_FGREP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
-@@ -4044,7 +4147,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/x
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_prog in fgrep; do
-+    for ac_prog in fgrep; do
-     for ac_exec_ext in '' $ac_executable_extensions; do
-       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-       { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-@@ -4064,7 +4167,7 @@ case `"$ac_path_FGREP" --version 2>&1` i
-     $as_echo 'FGREP' >> "conftest.nl"
-     "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
-     diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
--    ac_count=`expr $ac_count + 1`
-+    as_fn_arith $ac_count + 1 && ac_count=$as_val
-     if test $ac_count -gt ${ac_path_FGREP_max-0}; then
-       # Best one so far, save it but keep looking for a better one
-       ac_cv_path_FGREP="$ac_path_FGREP"
-@@ -4079,12 +4182,10 @@ esac
-       $ac_path_FGREP_found && break 3
-     done
-   done
--done
-+  done
- IFS=$as_save_IFS
-   if test -z "$ac_cv_path_FGREP"; then
--    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
--$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
-   fi
- else
-   ac_cv_path_FGREP=$FGREP
-@@ -4092,7 +4193,7 @@ fi
- 
-    fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_FGREP" >&5
- $as_echo "$ac_cv_path_FGREP" >&6; }
-  FGREP="$ac_cv_path_FGREP"
- 
-@@ -4118,7 +4219,7 @@ test -z "$GREP" && GREP=grep
- 
- 
- # Check whether --with-gnu-ld was given.
--if test "${with_gnu_ld+set}" = set; then
-+if test "${with_gnu_ld+set}" = set; then :
-   withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
- else
-   with_gnu_ld=no
-@@ -4127,7 +4228,7 @@ fi
- ac_prog=ld
- if test "$GCC" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
--  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
- $as_echo_n "checking for ld used by $CC... " >&6; }
-   case $host in
-   *-*-mingw*)
-@@ -4157,13 +4258,13 @@ $as_echo_n "checking for ld used by $CC.
-     ;;
-   esac
- elif test "$with_gnu_ld" = yes; then
--  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
- $as_echo_n "checking for GNU ld... " >&6; }
- else
--  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
- $as_echo_n "checking for non-GNU ld... " >&6; }
- fi
--if test "${lt_cv_path_LD+set}" = set; then
-+if test "${lt_cv_path_LD+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -z "$LD"; then
-@@ -4194,18 +4295,16 @@ fi
- 
- LD="$lt_cv_path_LD"
- if test -n "$LD"; then
--  { $as_echo "$as_me:$LINENO: result: $LD" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
- $as_echo "$LD" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
--test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
--$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
--   { (exit 1); exit 1; }; }
--{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-+test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
- $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
--if test "${lt_cv_prog_gnu_ld+set}" = set; then
-+if test "${lt_cv_prog_gnu_ld+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   # I'd rather use --version here, but apparently some GNU lds only accept -v.
-@@ -4218,7 +4317,7 @@ case `$LD -v 2>&1 </dev/null` in
-   ;;
- esac
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_gnu_ld" >&5
- $as_echo "$lt_cv_prog_gnu_ld" >&6; }
- with_gnu_ld=$lt_cv_prog_gnu_ld
- 
-@@ -4230,9 +4329,9 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
- $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
--if test "${lt_cv_path_NM+set}" = set; then
-+if test "${lt_cv_path_NM+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$NM"; then
-@@ -4279,7 +4378,7 @@ else
-   : ${lt_cv_path_NM=no}
- fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_NM" >&5
- $as_echo "$lt_cv_path_NM" >&6; }
- if test "$lt_cv_path_NM" != "no"; then
-   NM="$lt_cv_path_NM"
-@@ -4290,9 +4389,9 @@ else
-   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
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_DUMPBIN+set}" = set; then
-+if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$DUMPBIN"; then
-@@ -4303,24 +4402,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- DUMPBIN=$ac_cv_prog_DUMPBIN
- if test -n "$DUMPBIN"; then
--  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUMPBIN" >&5
- $as_echo "$DUMPBIN" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -4334,9 +4433,9 @@ if test -z "$DUMPBIN"; then
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_DUMPBIN"; then
-@@ -4347,24 +4446,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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_DUMPBIN="$ac_prog"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
- if test -n "$ac_ct_DUMPBIN"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DUMPBIN" >&5
- $as_echo "$ac_ct_DUMPBIN" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -4377,7 +4476,7 @@ done
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -4397,44 +4496,44 @@ test -z "$NM" && NM=nm
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
- $as_echo_n "checking the name lister ($NM) interface... " >&6; }
--if test "${lt_cv_nm_interface+set}" = set; then
-+if test "${lt_cv_nm_interface+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_nm_interface="BSD nm"
-   echo "int some_variable = 0;" > conftest.$ac_ext
--  (eval echo "\"\$as_me:4407: $ac_compile\"" >&5)
-+  (eval echo "\"\$as_me:4506: $ac_compile\"" >&5)
-   (eval "$ac_compile" 2>conftest.err)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:4410: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-+  (eval echo "\"\$as_me:4509: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
-   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
-   cat conftest.err >&5
--  (eval echo "\"\$as_me:4413: output\"" >&5)
-+  (eval echo "\"\$as_me:4512: output\"" >&5)
-   cat conftest.out >&5
-   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
-     lt_cv_nm_interface="MS dumpbin"
-   fi
-   rm -f conftest*
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_nm_interface" >&5
- $as_echo "$lt_cv_nm_interface" >&6; }
- 
--{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
- $as_echo_n "checking whether ln -s works... " >&6; }
- LN_S=$as_ln_s
- if test "$LN_S" = "ln -s"; then
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
- $as_echo "no, using $LN_S" >&6; }
- fi
- 
- # find the maximum length of command line arguments
--{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
- $as_echo_n "checking the maximum length of command line arguments... " >&6; }
--if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-+if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-     i=0
-@@ -4552,10 +4651,10 @@ else
- fi
- 
- if test -n $lt_cv_sys_max_cmd_len ; then
--  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sys_max_cmd_len" >&5
- $as_echo "$lt_cv_sys_max_cmd_len" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: none" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5
- $as_echo "none" >&6; }
- fi
- max_cmd_len=$lt_cv_sys_max_cmd_len
-@@ -4569,7 +4668,7 @@ max_cmd_len=$lt_cv_sys_max_cmd_len
- : ${MV="mv -f"}
- : ${RM="rm -f"}
- 
--{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands some XSI constructs" >&5
- $as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
- # Try some XSI features
- xsi_shell=no
-@@ -4579,17 +4678,17 @@ xsi_shell=no
-     && eval 'test $(( 1 + 1 )) -eq 2 \
-     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
-   && xsi_shell=yes
--{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $xsi_shell" >&5
- $as_echo "$xsi_shell" >&6; }
- 
- 
--{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the shell understands \"+=\"" >&5
- $as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
- lt_shell_append=no
- ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
-     >/dev/null 2>&1 \
-   && lt_shell_append=yes
--{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_shell_append" >&5
- $as_echo "$lt_shell_append" >&6; }
- 
- 
-@@ -4624,14 +4723,14 @@ esac
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
- $as_echo_n "checking for $LD option to reload object files... " >&6; }
--if test "${lt_cv_ld_reload_flag+set}" = set; then
-+if test "${lt_cv_ld_reload_flag+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_ld_reload_flag='-r'
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_reload_flag" >&5
- $as_echo "$lt_cv_ld_reload_flag" >&6; }
- reload_flag=$lt_cv_ld_reload_flag
- case $reload_flag in
-@@ -4660,9 +4759,9 @@ esac
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
- set dummy ${ac_tool_prefix}objdump; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_OBJDUMP+set}" = set; then
-+if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$OBJDUMP"; then
-@@ -4673,24 +4772,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- OBJDUMP=$ac_cv_prog_OBJDUMP
- if test -n "$OBJDUMP"; then
--  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5
- $as_echo "$OBJDUMP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -4700,9 +4799,9 @@ if test -z "$ac_cv_prog_OBJDUMP"; then
-   ac_ct_OBJDUMP=$OBJDUMP
-   # Extract the first word of "objdump", so it can be a program name with args.
- set dummy objdump; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_OBJDUMP"; then
-@@ -4713,24 +4812,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_OBJDUMP="objdump"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
- if test -n "$ac_ct_OBJDUMP"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5
- $as_echo "$ac_ct_OBJDUMP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -4739,7 +4838,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -4759,9 +4858,9 @@ test -z "$OBJDUMP" && OBJDUMP=objdump
- 
- 
- 
--{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
- $as_echo_n "checking how to recognize dependent libraries... " >&6; }
--if test "${lt_cv_deplibs_check_method+set}" = set; then
-+if test "${lt_cv_deplibs_check_method+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_file_magic_cmd='$MAGIC_CMD'
-@@ -4876,11 +4975,11 @@ irix5* | irix6* | nonstopux*)
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-   else
-@@ -4955,7 +5054,7 @@ tpf*)
- esac
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
- $as_echo "$lt_cv_deplibs_check_method" >&6; }
- file_magic_cmd=$lt_cv_file_magic_cmd
- deplibs_check_method=$lt_cv_deplibs_check_method
-@@ -4975,9 +5074,9 @@ test -z "$deplibs_check_method" && depli
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ar; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_AR+set}" = set; then
-+if test "${ac_cv_prog_AR+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$AR"; then
-@@ -4988,24 +5087,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- AR=$ac_cv_prog_AR
- if test -n "$AR"; then
--  { $as_echo "$as_me:$LINENO: result: $AR" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
- $as_echo "$AR" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5015,9 +5114,9 @@ if test -z "$ac_cv_prog_AR"; then
-   ac_ct_AR=$AR
-   # Extract the first word of "ar", so it can be a program name with args.
- set dummy ar; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_AR"; then
-@@ -5028,24 +5127,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_AR=$ac_cv_prog_ac_ct_AR
- if test -n "$ac_ct_AR"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
- $as_echo "$ac_ct_AR" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5054,7 +5153,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -5080,9 +5179,9 @@ test -z "$AR_FLAGS" && AR_FLAGS=cru
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
- set dummy ${ac_tool_prefix}strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_STRIP+set}" = set; then
-+if test "${ac_cv_prog_STRIP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$STRIP"; then
-@@ -5093,24 +5192,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- STRIP=$ac_cv_prog_STRIP
- if test -n "$STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
- $as_echo "$STRIP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5120,9 +5219,9 @@ if test -z "$ac_cv_prog_STRIP"; then
-   ac_ct_STRIP=$STRIP
-   # Extract the first word of "strip", so it can be a program name with args.
- set dummy strip; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_STRIP"; then
-@@ -5133,24 +5232,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
- if test -n "$ac_ct_STRIP"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
- $as_echo "$ac_ct_STRIP" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5159,7 +5258,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -5179,9 +5278,9 @@ test -z "$STRIP" && STRIP=:
- if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
- set dummy ${ac_tool_prefix}ranlib; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_RANLIB+set}" = set; then
-+if test "${ac_cv_prog_RANLIB+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$RANLIB"; then
-@@ -5192,24 +5291,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- RANLIB=$ac_cv_prog_RANLIB
- if test -n "$RANLIB"; then
--  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
- $as_echo "$RANLIB" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5219,9 +5318,9 @@ if test -z "$ac_cv_prog_RANLIB"; then
-   ac_ct_RANLIB=$RANLIB
-   # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_RANLIB"; then
-@@ -5232,24 +5331,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
- if test -n "$ac_ct_RANLIB"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5
- $as_echo "$ac_ct_RANLIB" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5258,7 +5357,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -5336,9 +5435,9 @@ compiler=$CC
- 
- 
- # Check for command to grab the raw symbol name followed by C symbol from nm.
--{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
- $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
--if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-+if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
- 
-@@ -5454,18 +5553,18 @@ void nm_test_func(void){}
- int main(){nm_test_var='a';nm_test_func();return(0);}
- _LT_EOF
- 
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-     # Now try to grab the symbols.
-     nlist=conftest.nm
--    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s "$nlist"; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s "$nlist"; then
-       # Try sorting and uniquifying the output.
-       if sort "$nlist" | uniq > "$nlist"T; then
- 	mv -f "$nlist"T "$nlist"
-@@ -5518,11 +5617,11 @@ _LT_EOF
- 	  lt_save_CFLAGS="$CFLAGS"
- 	  LIBS="conftstm.$ac_objext"
- 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
--	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext}; then
- 	    pipe_works=yes
- 	  fi
- 	  LIBS="$lt_save_LIBS"
-@@ -5556,10 +5655,10 @@ if test -z "$lt_cv_sys_global_symbol_pip
-   lt_cv_sys_global_symbol_to_cdecl=
- fi
- if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
--  { $as_echo "$as_me:$LINENO: result: failed" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
- $as_echo "failed" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: ok" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
- $as_echo "ok" >&6; }
- fi
- 
-@@ -5586,7 +5685,7 @@ fi
- 
- 
- # Check whether --enable-libtool-lock was given.
--if test "${enable_libtool_lock+set}" = set; then
-+if test "${enable_libtool_lock+set}" = set; then :
-   enableval=$enable_libtool_lock;
- fi
- 
-@@ -5598,11 +5697,11 @@ case $host in
- ia64-*-hpux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-     case `/usr/bin/file conftest.$ac_objext` in
-       *ELF-32*)
- 	HPUX_IA64_MODE="32"
-@@ -5616,12 +5715,12 @@ ia64-*-hpux*)
-   ;;
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 5619 "configure"' > conftest.$ac_ext
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  echo '#line 5718 "configure"' > conftest.$ac_ext
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-     if test "$lt_cv_prog_gnu_ld" = yes; then
-       case `/usr/bin/file conftest.$ac_objext` in
- 	*32-bit*)
-@@ -5655,11 +5754,11 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc
- s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-     case `/usr/bin/file conftest.o` in
-       *32-bit*)
- 	case $host in
-@@ -5708,9 +5807,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
-   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-   SAVE_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -belf"
--  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
- $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
--if test "${lt_cv_cc_needs_belf+set}" = set; then
-+if test "${lt_cv_cc_needs_belf+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_ext=c
-@@ -5719,11 +5818,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
--     cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -5734,38 +5829,13 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   lt_cv_cc_needs_belf=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	lt_cv_cc_needs_belf=no
-+  lt_cv_cc_needs_belf=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-      ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -5773,7 +5843,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_cc_needs_belf" >&5
- $as_echo "$lt_cv_cc_needs_belf" >&6; }
-   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-@@ -5783,11 +5853,11 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
- sparc*-*solaris*)
-   # Find out which ABI we are using.
-   echo 'int i;' > conftest.$ac_ext
--  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-     case `/usr/bin/file conftest.o` in
-     *64-bit*)
-       case $lt_cv_prog_gnu_ld in
-@@ -5813,9 +5883,9 @@ need_locks="$enable_libtool_lock"
-     if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
- set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
-+if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$DSYMUTIL"; then
-@@ -5826,24 +5896,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- DSYMUTIL=$ac_cv_prog_DSYMUTIL
- if test -n "$DSYMUTIL"; then
--  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DSYMUTIL" >&5
- $as_echo "$DSYMUTIL" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5853,9 +5923,9 @@ if test -z "$ac_cv_prog_DSYMUTIL"; then
-   ac_ct_DSYMUTIL=$DSYMUTIL
-   # Extract the first word of "dsymutil", so it can be a program name with args.
- set dummy dsymutil; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_DSYMUTIL"; then
-@@ -5866,24 +5936,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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_DSYMUTIL="dsymutil"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
- if test -n "$ac_ct_DSYMUTIL"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DSYMUTIL" >&5
- $as_echo "$ac_ct_DSYMUTIL" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5892,7 +5962,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -5905,9 +5975,9 @@ fi
-     if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
- set dummy ${ac_tool_prefix}nmedit; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_NMEDIT+set}" = set; then
-+if test "${ac_cv_prog_NMEDIT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$NMEDIT"; then
-@@ -5918,24 +5988,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- NMEDIT=$ac_cv_prog_NMEDIT
- if test -n "$NMEDIT"; then
--  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NMEDIT" >&5
- $as_echo "$NMEDIT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5945,9 +6015,9 @@ if test -z "$ac_cv_prog_NMEDIT"; then
-   ac_ct_NMEDIT=$NMEDIT
-   # Extract the first word of "nmedit", so it can be a program name with args.
- set dummy nmedit; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_NMEDIT"; then
-@@ -5958,24 +6028,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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_NMEDIT="nmedit"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
- if test -n "$ac_ct_NMEDIT"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_NMEDIT" >&5
- $as_echo "$ac_ct_NMEDIT" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -5984,7 +6054,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -5997,9 +6067,9 @@ fi
-     if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
- set dummy ${ac_tool_prefix}lipo; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_LIPO+set}" = set; then
-+if test "${ac_cv_prog_LIPO+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$LIPO"; then
-@@ -6010,24 +6080,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- LIPO=$ac_cv_prog_LIPO
- if test -n "$LIPO"; then
--  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIPO" >&5
- $as_echo "$LIPO" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -6037,9 +6107,9 @@ if test -z "$ac_cv_prog_LIPO"; then
-   ac_ct_LIPO=$LIPO
-   # Extract the first word of "lipo", so it can be a program name with args.
- set dummy lipo; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_LIPO"; then
-@@ -6050,24 +6120,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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_LIPO="lipo"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
- if test -n "$ac_ct_LIPO"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_LIPO" >&5
- $as_echo "$ac_ct_LIPO" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -6076,7 +6146,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -6089,9 +6159,9 @@ fi
-     if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
- set dummy ${ac_tool_prefix}otool; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_OTOOL+set}" = set; then
-+if test "${ac_cv_prog_OTOOL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$OTOOL"; then
-@@ -6102,24 +6172,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- OTOOL=$ac_cv_prog_OTOOL
- if test -n "$OTOOL"; then
--  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL" >&5
- $as_echo "$OTOOL" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -6129,9 +6199,9 @@ if test -z "$ac_cv_prog_OTOOL"; then
-   ac_ct_OTOOL=$OTOOL
-   # Extract the first word of "otool", so it can be a program name with args.
- set dummy otool; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_OTOOL"; then
-@@ -6142,24 +6212,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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_OTOOL="otool"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
- if test -n "$ac_ct_OTOOL"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL" >&5
- $as_echo "$ac_ct_OTOOL" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -6168,7 +6238,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -6181,9 +6251,9 @@ fi
-     if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
- set dummy ${ac_tool_prefix}otool64; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_OTOOL64+set}" = set; then
-+if test "${ac_cv_prog_OTOOL64+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$OTOOL64"; then
-@@ -6194,24 +6264,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- OTOOL64=$ac_cv_prog_OTOOL64
- if test -n "$OTOOL64"; then
--  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OTOOL64" >&5
- $as_echo "$OTOOL64" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -6221,9 +6291,9 @@ if test -z "$ac_cv_prog_OTOOL64"; then
-   ac_ct_OTOOL64=$OTOOL64
-   # Extract the first word of "otool64", so it can be a program name with args.
- set dummy otool64; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
-+if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   if test -n "$ac_ct_OTOOL64"; then
-@@ -6234,24 +6304,24 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   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_OTOOL64="otool64"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
- fi
- fi
- ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
- if test -n "$ac_ct_OTOOL64"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OTOOL64" >&5
- $as_echo "$ac_ct_OTOOL64" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -6260,7 +6330,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -6296,9 +6366,9 @@ fi
- 
- 
- 
--    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
- $as_echo_n "checking for -single_module linker flag... " >&6; }
--if test "${lt_cv_apple_cc_single_mod+set}" = set; then
-+if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_apple_cc_single_mod=no
-@@ -6323,22 +6393,18 @@ else
- 	rm -f conftest.*
-       fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
- $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
--    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
- $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
--if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
-+if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_ld_exported_symbols_list=no
-       save_LDFLAGS=$LDFLAGS
-       echo "_main" > conftest.sym
-       LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -6349,42 +6415,17 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   lt_cv_ld_exported_symbols_list=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	lt_cv_ld_exported_symbols_list=no
-+  lt_cv_ld_exported_symbols_list=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- 	LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
- $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-     case $host_os in
-     rhapsody* | darwin1.[012])
-@@ -6426,14 +6467,14 @@ ac_cpp='$CPP $CPPFLAGS'
- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
--{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
- $as_echo_n "checking how to run the C preprocessor... " >&6; }
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-   CPP=
- fi
- if test -z "$CPP"; then
--  if test "${ac_cv_prog_CPP+set}" = set; then
-+  if test "${ac_cv_prog_CPP+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-       # Double quotes because CPP needs to be expanded
-@@ -6448,11 +6489,7 @@ do
-   # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #ifdef __STDC__
- # include <limits.h>
-@@ -6461,78 +6498,34 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
- 		     Syntax error
- _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_cpp "$LINENO"; then :
- 
-+else
-   # Broken: fails on valid input.
- continue
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ac_nonexistent.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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+if ac_fn_c_try_cpp "$LINENO"; then :
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-   # Passes both tests.
- ac_preproc_ok=:
- break
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
-+if $ac_preproc_ok; then :
-   break
- fi
- 
-@@ -6544,7 +6537,7 @@ fi
- else
-   ac_cv_prog_CPP=$CPP
- fi
--{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
- $as_echo "$CPP" >&6; }
- ac_preproc_ok=false
- for ac_c_preproc_warn_flag in '' yes
-@@ -6555,11 +6548,7 @@ do
-   # <limits.h> exists even on freestanding compilers.
-   # On the NeXT, cc -E runs the code through the compiler's parser,
-   # not just through cpp. "Syntax error" is here to catch this case.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #ifdef __STDC__
- # include <limits.h>
-@@ -6568,87 +6557,40 @@ cat >>conftest.$ac_ext <<_ACEOF
- #endif
- 		     Syntax error
- _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
--  :
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_cpp "$LINENO"; then :
- 
-+else
-   # Broken: fails on valid input.
- continue
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
-   # OK, works on sane cases.  Now check whether nonexistent headers
-   # can be detected and how.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ac_nonexistent.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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+if ac_fn_c_try_cpp "$LINENO"; then :
-   # Broken: success on invalid input.
- continue
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-   # Passes both tests.
- ac_preproc_ok=:
- break
- fi
--
- rm -f conftest.err conftest.$ac_ext
- 
- done
- # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
- rm -f conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then
--  :
-+if $ac_preproc_ok; then :
-+
- else
--  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+as_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
- fi
- 
- ac_ext=c
-@@ -6658,16 +6600,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLA
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
- 
- 
--{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
- $as_echo_n "checking for ANSI C header files... " >&6; }
--if test "${ac_cv_header_stdc+set}" = set; then
-+if test "${ac_cv_header_stdc+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- #include <stdarg.h>
-@@ -6682,48 +6620,23 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_header_stdc=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_header_stdc=no
-+  ac_cv_header_stdc=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- 
- if test $ac_cv_header_stdc = yes; then
-   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <string.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "memchr" >/dev/null 2>&1; then
--  :
-+  $EGREP "memchr" >/dev/null 2>&1; then :
-+
- else
-   ac_cv_header_stdc=no
- fi
-@@ -6733,18 +6646,14 @@ fi
- 
- if test $ac_cv_header_stdc = yes; then
-   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <stdlib.h>
- 
- _ACEOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
--  $EGREP "free" >/dev/null 2>&1; then
--  :
-+  $EGREP "free" >/dev/null 2>&1; then :
-+
- else
-   ac_cv_header_stdc=no
- fi
-@@ -6754,14 +6663,10 @@ fi
- 
- if test $ac_cv_header_stdc = yes; then
-   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
--  if test "$cross_compiling" = yes; then
-+  if test "$cross_compiling" = yes; then :
-   :
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <ctype.h>
- #include <stdlib.h>
-@@ -6786,120 +6691,36 @@ main ()
- 	|| toupper (i) != TOUPPER (i))
-       return 2;
-   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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--ac_cv_header_stdc=no
--fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--
--
--fi
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
--$as_echo "$ac_cv_header_stdc" >&6; }
--if test $ac_cv_header_stdc = yes; then
--
--cat >>confdefs.h <<\_ACEOF
--#define STDC_HEADERS 1
--_ACEOF
--
--fi
--
--# On IRIX 5.3, sys/types and inttypes.h are conflicting.
--
--
--
--
--
--
--
--
--
--for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
--		  inttypes.h stdint.h unistd.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&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
--
--#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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
--  eval "$as_ac_Header=yes"
-+if ac_fn_c_try_run "$LINENO"; then :
-+
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+  ac_cv_header_stdc=no
-+fi
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
- 
--	eval "$as_ac_Header=no"
- fi
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-+$as_echo "$ac_cv_header_stdc" >&6; }
-+if test $ac_cv_header_stdc = yes; then
-+
-+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
- 
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+
-+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-+		  inttypes.h stdint.h unistd.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-+"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
- #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-@@ -6909,62 +6730,13 @@ fi
- done
- 
- 
--
- for ac_header in dlfcn.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&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
--
--#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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
--  eval "$as_ac_Header=yes"
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	eval "$as_ac_Header=no"
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+do :
-+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-+"
-+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_DLFCN_H 1
- _ACEOF
- 
- fi
-@@ -6982,7 +6754,7 @@ done
- 
- 
-             # Check whether --enable-shared was given.
--if test "${enable_shared+set}" = set; then
-+if test "${enable_shared+set}" = set; then :
-   enableval=$enable_shared; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_shared=yes ;;
-@@ -7013,7 +6785,7 @@ fi
- 
- 
-   # Check whether --enable-static was given.
--if test "${enable_static+set}" = set; then
-+if test "${enable_static+set}" = set; then :
-   enableval=$enable_static; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_static=yes ;;
-@@ -7045,7 +6817,7 @@ fi
- 
- 
- # Check whether --with-pic was given.
--if test "${with_pic+set}" = set; then
-+if test "${with_pic+set}" = set; then :
-   withval=$with_pic; pic_mode="$withval"
- else
-   pic_mode=default
-@@ -7061,7 +6833,7 @@ test -z "$pic_mode" && pic_mode=default
- 
- 
-   # Check whether --enable-fast-install was given.
--if test "${enable_fast_install+set}" = set; then
-+if test "${enable_fast_install+set}" = set; then :
-   enableval=$enable_fast_install; p=${PACKAGE-default}
-     case $enableval in
-     yes) enable_fast_install=yes ;;
-@@ -7142,9 +6914,9 @@ if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
- fi
- 
--{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
- $as_echo_n "checking for objdir... " >&6; }
--if test "${lt_cv_objdir+set}" = set; then
-+if test "${lt_cv_objdir+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   rm -f .libs 2>/dev/null
-@@ -7157,7 +6929,7 @@ else
- fi
- rmdir .libs 2>/dev/null
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_objdir" >&5
- $as_echo "$lt_cv_objdir" >&6; }
- objdir=$lt_cv_objdir
- 
-@@ -7250,9 +7022,9 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file
- case $deplibs_check_method in
- file_magic*)
-   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
--    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
- $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
--if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $MAGIC_CMD in
-@@ -7303,10 +7075,10 @@ fi
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
- $as_echo "$MAGIC_CMD" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -7316,9 +7088,9 @@ fi
- 
- if test -z "$lt_cv_path_MAGIC_CMD"; then
-   if test -n "$ac_tool_prefix"; then
--    { $as_echo "$as_me:$LINENO: checking for file" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
- $as_echo_n "checking for file... " >&6; }
--if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-+if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $MAGIC_CMD in
-@@ -7369,10 +7141,10 @@ fi
- 
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
- if test -n "$MAGIC_CMD"; then
--  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAGIC_CMD" >&5
- $as_echo "$MAGIC_CMD" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -7449,9 +7221,9 @@ lt_prog_compiler_no_builtin_flag=
- if test "$GCC" = yes; then
-   lt_prog_compiler_no_builtin_flag=' -fno-builtin'
- 
--  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
- $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
--if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-+if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_rtti_exceptions=no
-@@ -7467,11 +7239,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7470: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7242: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7474: \$? = $ac_status" >&5
-+   echo "$as_me:7246: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7484,7 +7256,7 @@ else
-    $RM conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
- $as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
- 
- if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-@@ -7504,7 +7276,7 @@ fi
- lt_prog_compiler_pic=
- lt_prog_compiler_static=
- 
--{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
- $as_echo_n "checking for $compiler option to produce PIC... " >&6; }
- 
-   if test "$GCC" = yes; then
-@@ -7636,7 +7408,7 @@ $as_echo_n "checking for $compiler optio
-       lt_prog_compiler_static='-non_shared'
-       ;;
- 
--    linux* | k*bsd*-gnu)
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-       case $cc_basename in
-       # old Intel for x86_64 which still supported -KPIC.
-       ecc*)
-@@ -7776,7 +7548,7 @@ case $host_os in
-     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-     ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
- $as_echo "$lt_prog_compiler_pic" >&6; }
- 
- 
-@@ -7788,9 +7560,9 @@ $as_echo "$lt_prog_compiler_pic" >&6; }
- # Check to make sure the PIC flag actually works.
- #
- if test -n "$lt_prog_compiler_pic"; then
--  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
- $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
--if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_pic_works=no
-@@ -7806,11 +7578,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7809: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7581: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>conftest.err)
-    ac_status=$?
-    cat conftest.err >&5
--   echo "$as_me:7813: \$? = $ac_status" >&5
-+   echo "$as_me:7585: \$? = $ac_status" >&5
-    if (exit $ac_status) && test -s "$ac_outfile"; then
-      # The compiler can only warn and ignore the option if not recognized
-      # So say no if there are warnings other than the usual output.
-@@ -7823,7 +7595,7 @@ else
-    $RM conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_works" >&5
- $as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
- 
- if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
-@@ -7847,9 +7619,9 @@ fi
- # Check to make sure the static flag actually works.
- #
- wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
--{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
- $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
--if test "${lt_cv_prog_compiler_static_works+set}" = set; then
-+if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_static_works=no
-@@ -7875,7 +7647,7 @@ else
-    LDFLAGS="$save_LDFLAGS"
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_static_works" >&5
- $as_echo "$lt_cv_prog_compiler_static_works" >&6; }
- 
- if test x"$lt_cv_prog_compiler_static_works" = xyes; then
-@@ -7890,9 +7662,9 @@ fi
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
- $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
--if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o=no
-@@ -7911,11 +7683,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7914: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7686: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7918: \$? = $ac_status" >&5
-+   echo "$as_me:7690: \$? = $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
-@@ -7937,7 +7709,7 @@ else
-    $RM conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
- $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- 
- 
-@@ -7945,9 +7717,9 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
- $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
--if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-+if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   lt_cv_prog_compiler_c_o=no
-@@ -7966,11 +7738,11 @@ else
-    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-    -e 's:$: $lt_compiler_flag:'`
--   (eval echo "\"\$as_me:7969: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:7741: $lt_compile\"" >&5)
-    (eval "$lt_compile" 2>out/conftest.err)
-    ac_status=$?
-    cat out/conftest.err >&5
--   echo "$as_me:7973: \$? = $ac_status" >&5
-+   echo "$as_me:7745: \$? = $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
-@@ -7992,7 +7764,7 @@ else
-    $RM conftest*
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_c_o" >&5
- $as_echo "$lt_cv_prog_compiler_c_o" >&6; }
- 
- 
-@@ -8001,7 +7773,7 @@ $as_echo "$lt_cv_prog_compiler_c_o" >&6;
- hard_links="nottested"
- if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-   # do not overwrite the value of need_locks provided by the user
--  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we can lock with hard links" >&5
- $as_echo_n "checking if we can lock with hard links... " >&6; }
-   hard_links=yes
-   $RM conftest*
-@@ -8009,10 +7781,10 @@ $as_echo_n "checking if we can lock with
-   touch conftest.a
-   ln conftest.a conftest.b 2>&5 || hard_links=no
-   ln conftest.a conftest.b 2>/dev/null && hard_links=no
--  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $hard_links" >&5
- $as_echo "$hard_links" >&6; }
-   if test "$hard_links" = no; then
--    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
- $as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-     need_locks=warn
-   fi
-@@ -8025,7 +7797,7 @@ fi
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $compiler linker ($LD) supports shared libraries" >&5
- $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
- 
-   runpath_var=
-@@ -8085,6 +7857,9 @@ $as_echo_n "checking whether the $compil
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    link_all_deplibs=no
-+    ;;
-   esac
- 
-   ld_shlibs=yes
-@@ -8106,6 +7881,7 @@ $as_echo_n "checking whether the $compil
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-       *\ [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 ...
-@@ -8197,7 +7973,7 @@ _LT_EOF
-       archive_expsym_cmds='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
--    gnu* | linux* | tpf* | k*bsd*-gnu)
-+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-       tmp_diet=no
-       if test "$host_os" = linux-dietlibc; then
- 	case $cc_basename in
-@@ -8267,7 +8043,7 @@ _LT_EOF
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -8442,6 +8218,7 @@ _LT_EOF
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
-+	link_all_deplibs=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -8467,11 +8244,7 @@ _LT_EOF
- 	allow_undefined_flag='-berok'
-         # Determine the default libpath from the value encoded in an
-         # empty executable.
--        cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -8482,27 +8255,7 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -8516,16 +8269,9 @@ aix_libpath=`dump -H conftest$ac_exeext
- if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
-         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8538,11 +8284,7 @@ if test -z "$aix_libpath"; then aix_libp
- 	else
- 	 # Determine the default libpath from the value encoded in an
- 	 # empty executable.
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -8553,27 +8295,7 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
- 
- lt_aix_libpath_sed='
-     /Import File Strings/,/^$/ {
-@@ -8587,16 +8309,9 @@ aix_libpath=`dump -H conftest$ac_exeext
- if test -z "$aix_libpath"; then
-   aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
- fi
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
- 
- 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-@@ -8808,42 +8523,16 @@ if test -z "$aix_libpath"; then aix_libp
- 	# implicitly export all symbols.
-         save_LDFLAGS="$LDFLAGS"
-         LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
--        cat >conftest.$ac_ext <<_ACEOF
-+        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
- int foo(void) {}
- _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
- 
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-         LDFLAGS="$save_LDFLAGS"
-       else
- 	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-@@ -8856,7 +8545,7 @@ rm -f core conftest.err conftest.$ac_obj
-       link_all_deplibs=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -9099,7 +8788,7 @@ rm -f core conftest.err conftest.$ac_obj
-     fi
-   fi
- 
--{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs" >&5
- $as_echo "$ld_shlibs" >&6; }
- test "$ld_shlibs" = no && can_build_shared=no
- 
-@@ -9136,16 +8825,16 @@ x|xyes)
-       # Test whether the compiler implicitly links with -lc since on some
-       # systems, -lgcc has to come before -lc. If gcc already passes -lc
-       # to ld, don't add -lc before -lgcc.
--      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
- $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-       $RM conftest*
-       echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- 
--      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-+      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
-   (eval $ac_compile) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } 2>conftest.err; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } 2>conftest.err; then
-         soname=conftest
-         lib=conftest
-         libobjs=conftest.$ac_objext
-@@ -9159,11 +8848,11 @@ $as_echo_n "checking whether -lc should
-         libname=conftest
-         lt_save_allow_undefined_flag=$allow_undefined_flag
-         allow_undefined_flag=
--        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
-+        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
-   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }
-         then
- 	  archive_cmds_need_lc=no
-         else
-@@ -9174,7 +8863,7 @@ $as_echo_n "checking whether -lc should
-         cat conftest.err 1>&5
-       fi
-       $RM conftest*
--      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
- $as_echo "$archive_cmds_need_lc" >&6; }
-       ;;
-     esac
-@@ -9338,7 +9027,7 @@ esac
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
- $as_echo_n "checking dynamic linker characteristics... " >&6; }
- 
- if test "$GCC" = yes; then
-@@ -9746,7 +9435,7 @@ linux*oldld* | linux*aout* | linux*coff*
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -9760,11 +9449,7 @@ linux* | k*bsd*-gnu)
-   save_libdir=$libdir
-   eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-        LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- int
-@@ -9775,41 +9460,13 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then
-+if ac_fn_c_try_link "$LINENO"; then :
-+  if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-   shlibpath_overrides_runpath=yes
- fi
--
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-   LDFLAGS=$save_LDFLAGS
-   libdir=$save_libdir
- 
-@@ -9833,6 +9490,18 @@ rm -f core conftest.err conftest.$ac_obj
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -10021,7 +9690,7 @@ uts4*)
-   dynamic_linker=no
-   ;;
- esac
--{ $as_echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $dynamic_linker" >&5
- $as_echo "$dynamic_linker" >&6; }
- test "$dynamic_linker" = no && can_build_shared=no
- 
-@@ -10123,7 +9792,7 @@ fi
- 
- 
- 
--  { $as_echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
- $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
- hardcode_action=
- if test -n "$hardcode_libdir_flag_spec" ||
-@@ -10148,7 +9817,7 @@ else
-   # directories.
-   hardcode_action=unsupported
- fi
--{ $as_echo "$as_me:$LINENO: result: $hardcode_action" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $hardcode_action" >&5
- $as_echo "$hardcode_action" >&6; }
- 
- if test "$hardcode_action" = relink ||
-@@ -10193,18 +9862,14 @@ else
- 
-   darwin*)
-   # if libdl is installed we need to link against it
--    { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -10222,43 +9887,18 @@ return dlopen ();
-   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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dl_dlopen=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_dl_dlopen=no
-+  ac_cv_lib_dl_dlopen=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
- 
-@@ -10271,189 +9911,19 @@ fi
-     ;;
- 
-   *)
--    { $as_echo "$as_me:$LINENO: checking for shl_load" >&5
--$as_echo_n "checking for shl_load... " >&6; }
--if test "${ac_cv_func_shl_load+set}" = set; then
--  $as_echo_n "(cached) " >&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 shl_load to an innocuous variant, in case <limits.h> declares shl_load.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define shl_load innocuous_shl_load
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char shl_load (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef shl_load
--
--/* Override any 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 shl_load ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_shl_load || defined __stub___shl_load
--choke me
--#endif
--
--int
--main ()
--{
--return shl_load ();
--  ;
--  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_func_shl_load=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_shl_load=no
--fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
--$as_echo "$ac_cv_func_shl_load" >&6; }
--if test "x$ac_cv_func_shl_load" = x""yes; then
-+    ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-+if test "x$ac_cv_func_shl_load" = x""yes; then :
-   lt_cv_dlopen="shl_load"
- else
--  { $as_echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
--$as_echo_n "checking for shl_load in -ldld... " >&6; }
--if test "${ac_cv_lib_dld_shl_load+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  ac_check_lib_save_LIBS=$LIBS
--LIBS="-ldld  $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 shl_load ();
--int
--main ()
--{
--return shl_load ();
--  ;
--  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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_lib_dld_shl_load=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_dld_shl_load=no
--fi
--
--rm -rf conftest.dSYM
--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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
--$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
--if test "x$ac_cv_lib_dld_shl_load" = x""yes; then
--  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
--else
--  { $as_echo "$as_me:$LINENO: checking for dlopen" >&5
--$as_echo_n "checking for dlopen... " >&6; }
--if test "${ac_cv_func_dlopen+set}" = set; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
-+$as_echo_n "checking for shl_load in -ldld... " >&6; }
-+if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldld  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
--   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
--#define dlopen innocuous_dlopen
--
--/* System header to define __stub macros and hopefully few prototypes,
--    which can conflict with char dlopen (); below.
--    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
--    <limits.h> exists even on freestanding compilers.  */
--
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
--
--#undef dlopen
- 
- /* Override any GCC internal prototype to avoid an error.
-    Use char because int might match the return type of a GCC
-@@ -10461,72 +9931,41 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char dlopen ();
--/* The GNU C library defines this for functions which it implements
--    to always fail with ENOSYS.  Some functions are actually named
--    something starting with __ and the normal name is an alias.  */
--#if defined __stub_dlopen || defined __stub___dlopen
--choke me
--#endif
--
-+char shl_load ();
- int
- main ()
- {
--return dlopen ();
-+return shl_load ();
-   ;
-   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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_func_dlopen=yes
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_dld_shl_load=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_func_dlopen=no
-+  ac_cv_lib_dld_shl_load=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
--$as_echo "$ac_cv_func_dlopen" >&6; }
--if test "x$ac_cv_func_dlopen" = x""yes; then
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
-+$as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-+if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
-+  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
-+else
-+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-+if test "x$ac_cv_func_dlopen" = x""yes; then :
-   lt_cv_dlopen="dlopen"
- else
--  { $as_echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
- $as_echo_n "checking for dlopen in -ldl... " >&6; }
--if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-+if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldl  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -10544,57 +9983,28 @@ return dlopen ();
-   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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dl_dlopen=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_dl_dlopen=no
-+  ac_cv_lib_dl_dlopen=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
- $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
--if test "x$ac_cv_lib_dl_dlopen" = x""yes; then
-+if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
- else
--  { $as_echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
- $as_echo_n "checking for dlopen in -lsvld... " >&6; }
--if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-+if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-lsvld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -10612,57 +10022,28 @@ return dlopen ();
-   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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_svld_dlopen=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_svld_dlopen=no
-+  ac_cv_lib_svld_dlopen=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
- $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
--if test "x$ac_cv_lib_svld_dlopen" = x""yes; then
-+if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
-   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
- else
--  { $as_echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
- $as_echo_n "checking for dld_link in -ldld... " >&6; }
--if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-+if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ldld  $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -10680,43 +10061,18 @@ return dld_link ();
-   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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-   ac_cv_lib_dld_dld_link=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_dld_dld_link=no
-+  ac_cv_lib_dld_dld_link=no
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
- $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
--if test "x$ac_cv_lib_dld_dld_link" = x""yes; then
-+if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
-   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
- fi
- 
-@@ -10755,9 +10111,9 @@ fi
-     save_LIBS="$LIBS"
-     LIBS="$lt_cv_dlopen_libs $LIBS"
- 
--    { $as_echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
- $as_echo_n "checking whether a program can dlopen itself... " >&6; }
--if test "${lt_cv_dlopen_self+set}" = set; then
-+if test "${lt_cv_dlopen_self+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-@@ -10766,7 +10122,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10769 "configure"
-+#line 10125 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10825,11 +10181,11 @@ int main ()
-   return status;
- }
- _LT_EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-@@ -10846,14 +10202,14 @@ rm -fr conftest*
- 
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self" >&5
- $as_echo "$lt_cv_dlopen_self" >&6; }
- 
-     if test "x$lt_cv_dlopen_self" = xyes; then
-       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
--      { $as_echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
- $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
--if test "${lt_cv_dlopen_self_static+set}" = set; then
-+if test "${lt_cv_dlopen_self_static+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   	  if test "$cross_compiling" = yes; then :
-@@ -10862,7 +10218,7 @@ else
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 10865 "configure"
-+#line 10221 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -10921,11 +10277,11 @@ int main ()
-   return status;
- }
- _LT_EOF
--  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
-   (eval $ac_link) 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } && test -s conftest${ac_exeext} 2>/dev/null; then
-     (./conftest; exit; ) >&5 2>/dev/null
-     lt_status=$?
-     case x$lt_status in
-@@ -10942,7 +10298,7 @@ rm -fr conftest*
- 
- 
- fi
--{ $as_echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_dlopen_self_static" >&5
- $as_echo "$lt_cv_dlopen_self_static" >&6; }
-     fi
- 
-@@ -10981,12 +10337,12 @@ fi
- 
- striplib=
- old_striplib=
--{ $as_echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
- $as_echo_n "checking whether stripping libraries is possible... " >&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"
--  { $as_echo "$as_me:$LINENO: result: yes" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
- # FIXME - insert some real tests, host_os isn't really good enough
-@@ -10995,15 +10351,15 @@ else
-     if test -n "$STRIP" ; then
-       striplib="$STRIP -x"
-       old_striplib="$STRIP -S"
--      { $as_echo "$as_me:$LINENO: result: yes" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-     else
--      { $as_echo "$as_me:$LINENO: result: no" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-     fi
-     ;;
-   *)
--    { $as_echo "$as_me:$LINENO: result: no" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-     ;;
-   esac
-@@ -11021,12 +10377,12 @@ fi
- 
- 
-   # Report which library types will actually be built
--  { $as_echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libtool supports shared libraries" >&5
- $as_echo_n "checking if libtool supports shared libraries... " >&6; }
--  { $as_echo "$as_me:$LINENO: result: $can_build_shared" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $can_build_shared" >&5
- $as_echo "$can_build_shared" >&6; }
- 
--  { $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build shared libraries" >&5
- $as_echo_n "checking whether to build shared libraries... " >&6; }
-   test "$can_build_shared" = "no" && enable_shared=no
- 
-@@ -11047,14 +10403,14 @@ $as_echo_n "checking whether to build sh
-     fi
-     ;;
-   esac
--  { $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_shared" >&5
- $as_echo "$enable_shared" >&6; }
- 
--  { $as_echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build static libraries" >&5
- $as_echo_n "checking whether to build static libraries... " >&6; }
-   # Make sure either enable_shared or enable_static is yes.
-   test "$enable_shared" = yes || enable_static=yes
--  { $as_echo "$as_me:$LINENO: result: $enable_static" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_static" >&5
- $as_echo "$enable_static" >&6; }
- 
- 
-@@ -11090,19 +10446,14 @@ CC="$lt_save_CC"
- 
- 
- 
--
-- { $as_echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
- $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
--if test "${ac_cv_c_bigendian+set}" = set; then
-+if test "${ac_cv_c_bigendian+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_cv_c_bigendian=unknown
-     # See if we're dealing with a universal compiler.
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #ifndef __APPLE_CC__
- 	       not a universal capable compiler
-@@ -11110,46 +10461,34 @@ cat >>conftest.$ac_ext <<_ACEOF
- 	     typedef int dummy;
- 
- _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+if ac_fn_c_try_compile "$LINENO"; then :
- 
- 	# Check for potential -arch flags.  It is not universal unless
--	# there are some -arch flags.  Note that *ppc* also matches
--	# ppc64.  This check is also rather less than ideal.
--	case "${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" in  #(
--	  *-arch*ppc*|*-arch*i386*|*-arch*x86_64*) ac_cv_c_bigendian=universal;;
--	esac
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
-+	# there are at least two -arch flags with different values.
-+	ac_arch=
-+	ac_prev=
-+	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
-+	 if test -n "$ac_prev"; then
-+	   case $ac_word in
-+	     i?86 | x86_64 | ppc | ppc64)
-+	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
-+		 ac_arch=$ac_word
-+	       else
-+		 ac_cv_c_bigendian=universal
-+		 break
-+	       fi
-+	       ;;
-+	   esac
-+	   ac_prev=
-+	 elif test "x$ac_word" = "x-arch"; then
-+	   ac_prev=arch
-+	 fi
-+       done
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     if test $ac_cv_c_bigendian = unknown; then
-       # See if sys/param.h defines the BYTE_ORDER macro.
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
- 	     #include <sys/param.h>
-@@ -11167,30 +10506,9 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   # It does; now see whether it defined to BIG_ENDIAN or not.
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <sys/types.h>
- 		#include <sys/param.h>
-@@ -11206,49 +10524,18 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_c_bigendian=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_c_bigendian=no
-+  ac_cv_c_bigendian=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     fi
-     if test $ac_cv_c_bigendian = unknown; then
-       # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
--      cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <limits.h>
- 
-@@ -11263,30 +10550,9 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   # It does; now see whether it defined to _BIG_ENDIAN or not.
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- #include <limits.h>
- 
-@@ -11301,51 +10567,20 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_c_bigendian=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_c_bigendian=no
-+  ac_cv_c_bigendian=no
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-     fi
-     if test $ac_cv_c_bigendian = unknown; then
-       # Compile a test program.
--      if test "$cross_compiling" = yes; then
-+      if test "$cross_compiling" = yes; then :
-   # Try to guess by grepping values from an object file.
--	 cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- short int ascii_mm[] =
- 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-@@ -11371,24 +10606,7 @@ return use_ascii (foo) == use_ebcdic (fo
-   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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+if ac_fn_c_try_compile "$LINENO"; then :
-   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
- 	      ac_cv_c_bigendian=yes
- 	    fi
-@@ -11400,20 +10618,10 @@ $as_echo "$ac_try_echo") >&5
- 		ac_cv_c_bigendian=unknown
- 	      fi
- 	    fi
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--
- fi
--
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- $ac_includes_default
- int
-@@ -11433,72 +10641,38 @@ main ()
-   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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+if ac_fn_c_try_run "$LINENO"; then :
-   ac_cv_c_bigendian=no
- else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--( exit $ac_status )
--ac_cv_c_bigendian=yes
-+  ac_cv_c_bigendian=yes
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--
-     fi
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
- $as_echo "$ac_cv_c_bigendian" >&6; }
-  case $ac_cv_c_bigendian in #(
-    yes)
--     cat >>confdefs.h <<\_ACEOF
--#define WORDS_BIGENDIAN 1
--_ACEOF
-+     $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
- ;; #(
-    no)
-       ;; #(
-    universal)
- 
--cat >>confdefs.h <<\_ACEOF
--#define AC_APPLE_UNIVERSAL_BUILD 1
--_ACEOF
-+$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
- 
-      ;; #(
-    *)
--     { { $as_echo "$as_me:$LINENO: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
--$as_echo "$as_me: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
--   { (exit 1); exit 1; }; } ;;
-+     as_fn_error "unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
-  esac
- 
- 
- # Check whether --enable-gtktest was given.
--if test "${enable_gtktest+set}" = set; then
-+if test "${enable_gtktest+set}" = set; then :
-   enableval=$enable_gtktest;
- else
-   enable_gtktest=yes
-@@ -11519,9 +10693,9 @@ fi
- 
-   # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -11534,14 +10708,14 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-@@ -11550,10 +10724,10 @@ esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -11572,7 +10746,7 @@ fi
-   fi
- 
-   min_gtk_version=2.8.0
--  { $as_echo "$as_me:$LINENO: checking for GTK+ - version >= $min_gtk_version" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK+ - version >= $min_gtk_version" >&5
- $as_echo_n "checking for GTK+ - version >= $min_gtk_version... " >&6; }
- 
-   if test x$PKG_CONFIG != xno ; then
-@@ -11604,14 +10778,10 @@ $as_echo_n "checking for GTK+ - version
-       CFLAGS="$CFLAGS $GTK_CFLAGS"
-       LIBS="$GTK_LIBS $LIBS"
-       rm -f conf.gtktest
--      if test "$cross_compiling" = yes; then
-+      if test "$cross_compiling" = yes; then :
-   echo $ac_n "cross compiling; assumed OK... $ac_c"
- else
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include <gtk/gtk.h>
-@@ -11624,7 +10794,7 @@ main ()
-   int major, minor, micro;
-   char *tmp_version;
- 
--  system ("touch conf.gtktest");
-+  fclose (fopen ("conf.gtktest", "w"));
- 
-   /* HP/UX 9 (%@#!) writes to sscanf strings */
-   tmp_version = g_strdup("$min_gtk_version");
-@@ -11686,52 +10856,25 @@ main ()
- }
- 
- _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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_link") 2>&5
--  ac_status=$?
--  $as_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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$ac_try_echo") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  :
--else
--  $as_echo "$as_me: program exited with status $ac_status" >&5
--$as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
-+if ac_fn_c_try_run "$LINENO"; then :
- 
--( exit $ac_status )
--no_gtk=yes
-+else
-+  no_gtk=yes
- fi
--rm -rf conftest.dSYM
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-+  conftest.$ac_objext conftest.beam conftest.$ac_ext
- fi
- 
--
-        CFLAGS="$ac_save_CFLAGS"
-        LIBS="$ac_save_LIBS"
-      fi
-   fi
-   if test "x$no_gtk" = x ; then
--     { $as_echo "$as_me:$LINENO: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&5
- $as_echo "yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)" >&6; }
-      :
-   else
--     { $as_echo "$as_me:$LINENO: result: no" >&5
-+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
-      if test "$PKG_CONFIG" = "no" ; then
-        echo "*** A new enough version of pkg-config was not found."
-@@ -11745,11 +10888,7 @@ $as_echo "no" >&6; }
- 	  ac_save_LIBS="$LIBS"
-           CFLAGS="$CFLAGS $GTK_CFLAGS"
-           LIBS="$LIBS $GTK_LIBS"
--          cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- #include <gtk/gtk.h>
-@@ -11763,27 +10902,7 @@ 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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
-+if ac_fn_c_try_link "$LINENO"; then :
-    echo "*** The test program compiled, but did not run. This usually means"
-           echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-           echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-@@ -11794,16 +10913,11 @@ $as_echo "$ac_try_echo") >&5
-           echo "*** If you have an old version installed, it is best to remove it, although"
-           echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	 echo "*** The test program failed to compile or link. See the file config.log for the"
-+   echo "*** The test program failed to compile or link. See the file config.log for the"
-           echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."
- fi
--
--rm -rf conftest.dSYM
--rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
--      conftest$ac_exeext conftest.$ac_ext
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-           CFLAGS="$ac_save_CFLAGS"
-           LIBS="$ac_save_LIBS"
-        fi
-@@ -11821,9 +10935,7 @@ case "${host_os}" in
- darwin*)
-   darwin=yes
- 
--cat >>confdefs.h <<\_ACEOF
--#define MIDI_COREMIDI 1
--_ACEOF
-+$as_echo "#define MIDI_COREMIDI 1" >>confdefs.h
- 
- 
- 
-@@ -11831,9 +10943,9 @@ if test "x$ac_cv_env_PKG_CONFIG_set" !=
- 	if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
- set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $PKG_CONFIG in
-@@ -11846,14 +10958,14 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -11861,10 +10973,10 @@ esac
- fi
- PKG_CONFIG=$ac_cv_path_PKG_CONFIG
- if test -n "$PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
- $as_echo "$PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -11874,9 +10986,9 @@ if test -z "$ac_cv_path_PKG_CONFIG"; the
-   ac_pt_PKG_CONFIG=$PKG_CONFIG
-   # Extract the first word of "pkg-config", so it can be a program name with args.
- set dummy pkg-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
- $as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-+if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   case $ac_pt_PKG_CONFIG in
-@@ -11889,14 +11001,14 @@ for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-   fi
- done
--done
-+  done
- IFS=$as_save_IFS
- 
-   ;;
-@@ -11904,10 +11016,10 @@ esac
- fi
- ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
- if test -n "$ac_pt_PKG_CONFIG"; then
--  { $as_echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
- $as_echo "$ac_pt_PKG_CONFIG" >&6; }
- else
--  { $as_echo "$as_me:$LINENO: result: no" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
- 
-@@ -11916,7 +11028,7 @@ fi
-   else
-     case $cross_compiling:$ac_tool_warned in
- yes:)
--{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
- $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
- ac_tool_warned=yes ;;
- esac
-@@ -11929,13 +11041,13 @@ fi
- fi
- if test -n "$PKG_CONFIG"; then
- 	_pkg_min_version=0.9.0
--	{ $as_echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
- $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
- 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
--		{ $as_echo "$as_me:$LINENO: result: yes" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	else
--		{ $as_echo "$as_me:$LINENO: result: no" >&5
-+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- 		PKG_CONFIG=""
- 	fi
-@@ -11943,40 +11055,44 @@ $as_echo "no" >&6; }
- fi
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for ALSA" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
- $as_echo_n "checking for ALSA... " >&6; }
- 
--if test -n "$ALSA_CFLAGS"; then
--    pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdssialsacompat\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$ALSA_CFLAGS"; then
-+        pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdssialsacompat\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "libdssialsacompat") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "libdssialsacompat" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$ALSA_LIBS"; then
--    pkg_cv_ALSA_LIBS="$ALSA_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdssialsacompat\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$ALSA_LIBS"; then
-+        pkg_cv_ALSA_LIBS="$ALSA_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdssialsacompat\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "libdssialsacompat") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "libdssialsacompat" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -11989,25 +11105,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdssialsacompat" 2>&1`
-+	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libdssialsacompat"`
-         else
--	        ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdssialsacompat" 2>&1`
-+	        ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libdssialsacompat"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$ALSA_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (libdssialsacompat) were not met:
--
--$ALSA_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables ALSA_CFLAGS
--and ALSA_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (libdssialsacompat) were not met:
-+	as_fn_error "Package requirements (libdssialsacompat) were not met:
- 
- $ALSA_PKG_ERRORS
- 
-@@ -12017,22 +11122,11 @@ installed software in a non-standard pre
- Alternatively, you may set the environment variables ALSA_CFLAGS
- and ALSA_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables ALSA_CFLAGS
--and ALSA_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
-@@ -12041,12 +11135,11 @@ and ALSA_LIBS to avoid the need to call
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
- 	ALSA_LIBS=$pkg_cv_ALSA_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
-@@ -12055,40 +11148,44 @@ fi
-   darwin=no
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for ALSA" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
- $as_echo_n "checking for ALSA... " >&6; }
- 
--if test -n "$ALSA_CFLAGS"; then
--    pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9.0\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$ALSA_CFLAGS"; then
-+        pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9.0\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "alsa >= 0.9.0") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 0.9.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$ALSA_LIBS"; then
--    pkg_cv_ALSA_LIBS="$ALSA_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9.0\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$ALSA_LIBS"; then
-+        pkg_cv_ALSA_LIBS="$ALSA_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 0.9.0\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "alsa >= 0.9.0") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 0.9.0" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -12101,25 +11198,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "alsa >= 0.9.0" 2>&1`
-+	        ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "alsa >= 0.9.0"`
-         else
--	        ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors "alsa >= 0.9.0" 2>&1`
-+	        ALSA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "alsa >= 0.9.0"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$ALSA_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (alsa >= 0.9.0) were not met:
--
--$ALSA_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables ALSA_CFLAGS
--and ALSA_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (alsa >= 0.9.0) were not met:
-+	as_fn_error "Package requirements (alsa >= 0.9.0) were not met:
- 
- $ALSA_PKG_ERRORS
- 
-@@ -12129,22 +11215,11 @@ installed software in a non-standard pre
- Alternatively, you may set the environment variables ALSA_CFLAGS
- and ALSA_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables ALSA_CFLAGS
--and ALSA_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
-@@ -12153,12 +11228,11 @@ and ALSA_LIBS to avoid the need to call
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
- 	ALSA_LIBS=$pkg_cv_ALSA_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
-@@ -12173,151 +11247,12 @@ else
- fi
- 
- 
--
- for ac_header in ladspa.h
--do
--as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--else
--  # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
--$as_echo_n "checking $ac_header usability... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
--  $as_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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
--$as_echo_n "checking $ac_header presence... " >&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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
--  $as_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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
--
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
--    ( cat <<\_ASBOX
--## ------------------------------------- ##
--## Report this to musound-at-jps-dot-net ##
--## ------------------------------------- ##
--_ASBOX
--     ) | sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
--$as_echo_n "checking for $ac_header... " >&6; }
--if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
--  $as_echo_n "(cached) " >&6
--else
--  eval "$as_ac_Header=\$ac_header_preproc"
--fi
--ac_res=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
--$as_echo "$ac_res" >&6; }
--
--fi
--as_val=`eval 'as_val=${'$as_ac_Header'}
--		 $as_echo "$as_val"'`
--   if test "x$as_val" = x""yes; then
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "ladspa.h" "ac_cv_header_ladspa_h" "$ac_includes_default"
-+if test "x$ac_cv_header_ladspa_h" = x""yes; then :
-   cat >>confdefs.h <<_ACEOF
--#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+#define HAVE_LADSPA_H 1
- _ACEOF
- 
- fi
-@@ -12327,40 +11262,44 @@ done
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for MODULE" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MODULE" >&5
- $as_echo_n "checking for MODULE... " >&6; }
- 
--if test -n "$MODULE_CFLAGS"; then
--    pkg_cv_MODULE_CFLAGS="$MODULE_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dssi >= 0.9 liblo >= 0.12\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$MODULE_CFLAGS"; then
-+        pkg_cv_MODULE_CFLAGS="$MODULE_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dssi >= 0.9 liblo >= 0.12\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dssi >= 0.9 liblo >= 0.12") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_MODULE_CFLAGS=`$PKG_CONFIG --cflags "dssi >= 0.9 liblo >= 0.12" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$MODULE_LIBS"; then
--    pkg_cv_MODULE_LIBS="$MODULE_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"dssi >= 0.9 liblo >= 0.12\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$MODULE_LIBS"; then
-+        pkg_cv_MODULE_LIBS="$MODULE_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dssi >= 0.9 liblo >= 0.12\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "dssi >= 0.9 liblo >= 0.12") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_MODULE_LIBS=`$PKG_CONFIG --libs "dssi >= 0.9 liblo >= 0.12" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -12373,25 +11312,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        MODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dssi >= 0.9 liblo >= 0.12" 2>&1`
-+	        MODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "dssi >= 0.9 liblo >= 0.12"`
-         else
--	        MODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors "dssi >= 0.9 liblo >= 0.12" 2>&1`
-+	        MODULE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "dssi >= 0.9 liblo >= 0.12"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$MODULE_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (dssi >= 0.9 liblo >= 0.12) were not met:
--
--$MODULE_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables MODULE_CFLAGS
--and MODULE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (dssi >= 0.9 liblo >= 0.12) were not met:
-+	as_fn_error "Package requirements (dssi >= 0.9 liblo >= 0.12) were not met:
- 
- $MODULE_PKG_ERRORS
- 
-@@ -12401,22 +11329,11 @@ installed software in a non-standard pre
- Alternatively, you may set the environment variables MODULE_CFLAGS
- and MODULE_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables MODULE_CFLAGS
--and MODULE_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
-@@ -12425,52 +11342,55 @@ and MODULE_LIBS to avoid the need to cal
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	MODULE_CFLAGS=$pkg_cv_MODULE_CFLAGS
- 	MODULE_LIBS=$pkg_cv_MODULE_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
- 
- 
- pkg_failed=no
--{ $as_echo "$as_me:$LINENO: checking for JACK" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
- $as_echo_n "checking for JACK... " >&6; }
- 
--if test -n "$JACK_CFLAGS"; then
--    pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack >= 0.99.14\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$JACK_CFLAGS"; then
-+        pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.99.14\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "jack >= 0.99.14") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.99.14" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
--if test -n "$JACK_LIBS"; then
--    pkg_cv_JACK_LIBS="$JACK_LIBS"
-- elif test -n "$PKG_CONFIG"; then
--    if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"jack >= 0.99.14\"") >&5
-+if test -n "$PKG_CONFIG"; then
-+    if test -n "$JACK_LIBS"; then
-+        pkg_cv_JACK_LIBS="$JACK_LIBS"
-+    else
-+        if test -n "$PKG_CONFIG" && \
-+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.99.14\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "jack >= 0.99.14") 2>&5
-   ac_status=$?
--  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; then
-+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; }; then
-   pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 0.99.14" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-- else
--    pkg_failed=untried
-+    fi
-+else
-+	pkg_failed=untried
- fi
- 
- 
-@@ -12483,25 +11403,14 @@ else
-         _pkg_short_errors_supported=no
- fi
-         if test $_pkg_short_errors_supported = yes; then
--	        JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "jack >= 0.99.14" 2>&1`
-+	        JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "jack >= 0.99.14"`
-         else
--	        JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors "jack >= 0.99.14" 2>&1`
-+	        JACK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "jack >= 0.99.14"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$JACK_PKG_ERRORS" >&5
- 
--	{ { $as_echo "$as_me:$LINENO: error: Package requirements (jack >= 0.99.14) were not met:
--
--$JACK_PKG_ERRORS
--
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
--
--Alternatively, you may set the environment variables JACK_CFLAGS
--and JACK_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" >&5
--$as_echo "$as_me: error: Package requirements (jack >= 0.99.14) were not met:
-+	as_fn_error "Package requirements (jack >= 0.99.14) were not met:
- 
- $JACK_PKG_ERRORS
- 
-@@ -12511,22 +11420,11 @@ installed software in a non-standard pre
- Alternatively, you may set the environment variables JACK_CFLAGS
- and JACK_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
--" >&2;}
--   { (exit 1); exit 1; }; }
-+" "$LINENO" 5
- elif test $pkg_failed = untried; then
--	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
-+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
- $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--
--Alternatively, you may set the environment variables JACK_CFLAGS
--and JACK_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&5
--$as_echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-+as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
- is in your PATH or set the PKG_CONFIG environment variable to the full
- path to pkg-config.
- 
-@@ -12535,12 +11433,11 @@ and JACK_LIBS to avoid the need to call
- See the pkg-config man page for more details.
- 
- To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." >&2;}
--   { (exit 1); exit 1; }; }; }
-+See \`config.log' for more details." "$LINENO" 5; }
- else
- 	JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
- 	JACK_LIBS=$pkg_cv_JACK_LIBS
--        { $as_echo "$as_me:$LINENO: result: yes" >&5
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- 	:
- fi
-@@ -12549,24 +11446,20 @@ fi
- 
- 
- # Check whether --with-jackmidi was given.
--if test "${with_jackmidi+set}" = set; then
-+if test "${with_jackmidi+set}" = set; then :
-   withval=$with_jackmidi;  if test $withval = "yes";then with_jack_midi=yes;
- 		else with_jack_midi=no; fi
- fi
- 
- if test x${with_jack_midi} = 'xyes'; then
--{ $as_echo "$as_me:$LINENO: checking for jack_midi_get_event_count in -ljack" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for jack_midi_get_event_count in -ljack" >&5
- $as_echo_n "checking for jack_midi_get_event_count in -ljack... " >&6; }
--if test "${ac_cv_lib_jack_jack_midi_get_event_count+set}" = set; then
-+if test "${ac_cv_lib_jack_jack_midi_get_event_count+set}" = set; then :
-   $as_echo_n "(cached) " >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
- LIBS="-ljack $JACK_LIBS $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
- /* Override any GCC internal prototype to avoid an error.
-@@ -12582,210 +11475,50 @@ main ()
- return jack_midi_get_event_count ();
-   ;
-   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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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 && {
--	 test "$cross_compiling" = yes ||
--	 $as_test_x conftest$ac_exeext
--       }; then
--  ac_cv_lib_jack_jack_midi_get_event_count=yes
--else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_lib_jack_jack_midi_get_event_count=no
--fi
--
--rm -rf conftest.dSYM
--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
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_jack_jack_midi_get_event_count" >&5
--$as_echo "$ac_cv_lib_jack_jack_midi_get_event_count" >&6; }
--if test "x$ac_cv_lib_jack_jack_midi_get_event_count" = x""yes; then
--  with_jack_midi=yes
--
--cat >>confdefs.h <<\_ACEOF
--#define MIDI_JACK 1
--_ACEOF
--
--else
--  with_jack_midi=no
--fi
--
--else if test x${darwin} = 'xno'; then
--
--cat >>confdefs.h <<\_ACEOF
--#define MIDI_ALSA 1
--_ACEOF
--
--fi fi
-- if test x$with_jack_midi = xyes; then
--  MIDI_JACK_TRUE=
--  MIDI_JACK_FALSE='#'
--else
--  MIDI_JACK_TRUE='#'
--  MIDI_JACK_FALSE=
--fi
--
--
--saved_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $JACK_CFLAGS"
--saved_CPPFLAGS="$CPPFLAGS"
--CPPFLAGS="$CPPFLAGS $JACK_CFLAGS"
--saved_LDFLAGS="$LDFLAGS"
--LDFLAGS="$LDFLAGS $JACK_LIBS"
--if test "${ac_cv_header_jack_session_h+set}" = set; then
--  { $as_echo "$as_me:$LINENO: checking for jack/session.h" >&5
--$as_echo_n "checking for jack/session.h... " >&6; }
--if test "${ac_cv_header_jack_session_h+set}" = set; then
--  $as_echo_n "(cached) " >&6
--fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jack_session_h" >&5
--$as_echo "$ac_cv_header_jack_session_h" >&6; }
--else
--  # Is the header compilable?
--{ $as_echo "$as_me:$LINENO: checking jack/session.h usability" >&5
--$as_echo_n "checking jack/session.h usability... " >&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 <jack/session.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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
--  $as_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
--{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--$as_echo "$ac_header_compiler" >&6; }
--
--# Is the header present?
--{ $as_echo "$as_me:$LINENO: checking jack/session.h presence" >&5
--$as_echo_n "checking jack/session.h presence... " >&6; }
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--#include <jack/session.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 ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
--$as_echo "$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
--  $as_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
-+}
-+_ACEOF
-+if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_lib_jack_jack_midi_get_event_count=yes
- else
--  $as_echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--  ac_header_preproc=no
-+  ac_cv_lib_jack_jack_midi_get_event_count=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
- fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jack_jack_midi_get_event_count" >&5
-+$as_echo "$ac_cv_lib_jack_jack_midi_get_event_count" >&6; }
-+if test "x$ac_cv_lib_jack_jack_midi_get_event_count" = x""yes; then :
-+  with_jack_midi=yes
- 
--rm -f conftest.err conftest.$ac_ext
--{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--$as_echo "$ac_header_preproc" >&6; }
-+$as_echo "#define MIDI_JACK 1" >>confdefs.h
- 
--# So?  What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
--  yes:no: )
--    { $as_echo "$as_me:$LINENO: WARNING: jack/session.h: accepted by the compiler, rejected by the preprocessor!" >&5
--$as_echo "$as_me: WARNING: jack/session.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: jack/session.h: proceeding with the compiler's result" >&5
--$as_echo "$as_me: WARNING: jack/session.h: proceeding with the compiler's result" >&2;}
--    ac_header_preproc=yes
--    ;;
--  no:yes:* )
--    { $as_echo "$as_me:$LINENO: WARNING: jack/session.h: present but cannot be compiled" >&5
--$as_echo "$as_me: WARNING: jack/session.h: present but cannot be compiled" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: jack/session.h:     check for missing prerequisite headers?" >&5
--$as_echo "$as_me: WARNING: jack/session.h:     check for missing prerequisite headers?" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: jack/session.h: see the Autoconf documentation" >&5
--$as_echo "$as_me: WARNING: jack/session.h: see the Autoconf documentation" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: jack/session.h:     section \"Present But Cannot Be Compiled\"" >&5
--$as_echo "$as_me: WARNING: jack/session.h:     section \"Present But Cannot Be Compiled\"" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: jack/session.h: proceeding with the preprocessor's result" >&5
--$as_echo "$as_me: WARNING: jack/session.h: proceeding with the preprocessor's result" >&2;}
--    { $as_echo "$as_me:$LINENO: WARNING: jack/session.h: in the future, the compiler will take precedence" >&5
--$as_echo "$as_me: WARNING: jack/session.h: in the future, the compiler will take precedence" >&2;}
--    ( cat <<\_ASBOX
--## ------------------------------------- ##
--## Report this to musound-at-jps-dot-net ##
--## ------------------------------------- ##
--_ASBOX
--     ) | sed "s/^/$as_me: WARNING:     /" >&2
--    ;;
--esac
--{ $as_echo "$as_me:$LINENO: checking for jack/session.h" >&5
--$as_echo_n "checking for jack/session.h... " >&6; }
--if test "${ac_cv_header_jack_session_h+set}" = set; then
--  $as_echo_n "(cached) " >&6
- else
--  ac_cv_header_jack_session_h=$ac_header_preproc
-+  with_jack_midi=no
- fi
--{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jack_session_h" >&5
--$as_echo "$ac_cv_header_jack_session_h" >&6; }
- 
-+else if test x${darwin} = 'xno'; then
-+
-+$as_echo "#define MIDI_ALSA 1" >>confdefs.h
-+
-+fi fi
-+ if test x$with_jack_midi = xyes; then
-+  MIDI_JACK_TRUE=
-+  MIDI_JACK_FALSE='#'
-+else
-+  MIDI_JACK_TRUE='#'
-+  MIDI_JACK_FALSE=
- fi
--if test "x$ac_cv_header_jack_session_h" = x""yes; then
-+
-+
-+saved_CFLAGS="$CFLAGS"
-+CFLAGS="$CFLAGS $JACK_CFLAGS"
-+saved_CPPFLAGS="$CPPFLAGS"
-+CPPFLAGS="$CPPFLAGS $JACK_CFLAGS"
-+saved_LDFLAGS="$LDFLAGS"
-+LDFLAGS="$LDFLAGS $JACK_LIBS"
-+ac_fn_c_check_header_mongrel "$LINENO" "jack/session.h" "ac_cv_header_jack_session_h" "$ac_includes_default"
-+if test "x$ac_cv_header_jack_session_h" = x""yes; then :
-   have_jack_session="yes"
- else
-   have_jack_session="no"
-@@ -12794,9 +11527,7 @@ fi
- 
- if test x${have_jack_session} = 'xyes'; then
- 
--cat >>confdefs.h <<\_ACEOF
--#define JACK_SESSION 1
--_ACEOF
-+$as_echo "#define JACK_SESSION 1" >>confdefs.h
- 
- fi
- CFLAGS="$saved_CFLAGS"
-@@ -12849,13 +11580,13 @@ _ACEOF
-     case $ac_val in #(
-     *${as_nl}*)
-       case $ac_var in #(
--      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
-+      *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
- $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
-       esac
-       case $ac_var in #(
-       _ | IFS | as_nl) ;; #(
-       BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
--      *) $as_unset $ac_var ;;
-+      *) { eval $ac_var=; unset $ac_var;} ;;
-       esac ;;
-     esac
-   done
-@@ -12863,8 +11594,8 @@ $as_echo "$as_me: WARNING: cache variabl
-   (set) 2>&1 |
-     case $as_nl`(ac_space=' '; set) 2>&1` in #(
-     *${as_nl}ac_space=\ *)
--      # `set' does not quote correctly, so add quotes (double-quote
--      # substitution turns \\\\ into \\, and sed turns \\ into \).
-+      # `set' does not quote correctly, so add quotes: double-quote
-+      # substitution turns \\\\ into \\, and sed turns \\ into \.
-       sed -n \
- 	"s/'/'\\\\''/g;
- 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-@@ -12887,11 +11618,11 @@ $as_echo "$as_me: WARNING: cache variabl
- if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-   if test -w "$cache_file"; then
-     test "x$cache_file" != "x/dev/null" &&
--      { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
- $as_echo "$as_me: updating cache $cache_file" >&6;}
-     cat confcache >$cache_file
-   else
--    { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
- $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
-   fi
- fi
-@@ -12911,8 +11642,8 @@ for ac_i in : $LIBOBJS; do test "x$ac_i"
-   ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
-   # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
-   #    will be set to the directory where LIBOBJS objects are built.
--  ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
--  ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo'
-+  as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-+  as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
- done
- LIBOBJS=$ac_libobjs
- 
-@@ -12928,42 +11659,31 @@ else
- fi
- 
- if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"AMDEP\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"AMDEP\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"am__fastdepCC\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- 
- if test -z "${DARWIN_TRUE}" && test -z "${DARWIN_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"DARWIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"DARWIN\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"DARWIN\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- if test -z "${MIDI_JACK_TRUE}" && test -z "${MIDI_JACK_FALSE}"; then
--  { { $as_echo "$as_me:$LINENO: error: conditional \"MIDI_JACK\" was never defined.
--Usually this means the macro was only invoked conditionally." >&5
--$as_echo "$as_me: error: conditional \"MIDI_JACK\" was never defined.
--Usually this means the macro was only invoked conditionally." >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "conditional \"MIDI_JACK\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
- 
- : ${CONFIG_STATUS=./config.status}
- ac_write_fail=0
- ac_clean_files_save=$ac_clean_files
- ac_clean_files="$ac_clean_files $CONFIG_STATUS"
--{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
- $as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
--cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+as_write_fail=0
-+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
- #! $SHELL
- # Generated by $as_me.
- # Run this file to recreate the current configuration.
-@@ -12973,17 +11693,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write
- debug=false
- ac_cs_recheck=false
- ac_cs_silent=false
--SHELL=\${CONFIG_SHELL-$SHELL}
--_ACEOF
- 
--cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--## --------------------- ##
--## M4sh Initialization.  ##
--## --------------------- ##
-+SHELL=\${CONFIG_SHELL-$SHELL}
-+export SHELL
-+_ASEOF
-+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1
-+## -------------------- ##
-+## M4sh Initialization. ##
-+## -------------------- ##
- 
- # Be more Bourne compatible
- DUALCASE=1; export DUALCASE # for MKS sh
--if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
-   emulate sh
-   NULLCMD=:
-   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
-@@ -12991,23 +11712,15 @@ if test -n "${ZSH_VERSION+set}" && (emul
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in
--  *posix*) set -o posix ;;
-+  case `(set -o) 2>/dev/null` in #(
-+  *posix*) :
-+    set -o posix ;; #(
-+  *) :
-+     ;;
- esac
--
- fi
- 
- 
--
--
--# PATH needs CR
--# Avoid depending upon Character Ranges.
--as_cr_letters='abcdefghijklmnopqrstuvwxyz'
--as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
--as_cr_Letters=$as_cr_letters$as_cr_LETTERS
--as_cr_digits='0123456789'
--as_cr_alnum=$as_cr_Letters$as_cr_digits
--
- as_nl='
- '
- export as_nl
-@@ -13015,7 +11728,13 @@ export as_nl
- as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
- as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
--if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-+# Prefer a ksh shell builtin over an external printf program on Solaris,
-+# but without wasting forks for bash or zsh.
-+if test -z "$BASH_VERSION$ZSH_VERSION" \
-+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
-+  as_echo='print -r --'
-+  as_echo_n='print -rn --'
-+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
-   as_echo='printf %s\n'
-   as_echo_n='printf %s'
- else
-@@ -13026,7 +11745,7 @@ else
-     as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-     as_echo_n_body='eval
-       arg=$1;
--      case $arg in
-+      case $arg in #(
-       *"$as_nl"*)
- 	expr "X$arg" : "X\\(.*\\)$as_nl";
- 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
-@@ -13049,13 +11768,6 @@ if test "${PATH_SEPARATOR+set}" != set;
-   }
- fi
- 
--# Support unset when possible.
--if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
--  as_unset=unset
--else
--  as_unset=false
--fi
--
- 
- # IFS
- # We need space, tab and new line, in precisely that order.  Quoting is
-@@ -13065,15 +11777,15 @@ fi
- IFS=" ""	$as_nl"
- 
- # Find who we are.  Look in the path if we contain no directory separator.
--case $0 in
-+case $0 in #((
-   *[\\/]* ) as_myself=$0 ;;
-   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
- for as_dir in $PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
--  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
--done
-+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-+  done
- IFS=$as_save_IFS
- 
-      ;;
-@@ -13085,12 +11797,16 @@ if test "x$as_myself" = x; then
- fi
- if test ! -f "$as_myself"; then
-   $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
--  { (exit 1); exit 1; }
-+  exit 1
- fi
- 
--# Work around bugs in pre-3.0 UWIN ksh.
--for as_var in ENV MAIL MAILPATH
--do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
-+# Unset variables that we do not need and which cause bugs (e.g. in
-+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
-+# suppresses any "Segmentation fault" message there.  '((' could
-+# trigger a bug in pdksh 5.2.14.
-+for as_var in BASH_ENV ENV MAIL MAILPATH
-+do eval test x\${$as_var+set} = xset \
-+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
- done
- PS1='$ '
- PS2='> '
-@@ -13102,7 +11818,89 @@ export LC_ALL
- LANGUAGE=C
- export LANGUAGE
- 
--# Required to use basename.
-+# CDPATH.
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-+
-+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
-+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
-+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
-+# script with status $?, using 1 if that was 0.
-+as_fn_error ()
-+{
-+  as_status=$?; test $as_status -eq 0 && as_status=1
-+  if test "$3"; then
-+    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
-+  fi
-+  $as_echo "$as_me: error: $1" >&2
-+  as_fn_exit $as_status
-+} # as_fn_error
-+
-+
-+# as_fn_set_status STATUS
-+# -----------------------
-+# Set $? to STATUS, without forking.
-+as_fn_set_status ()
-+{
-+  return $1
-+} # as_fn_set_status
-+
-+# as_fn_exit STATUS
-+# -----------------
-+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
-+as_fn_exit ()
-+{
-+  set +e
-+  as_fn_set_status $1
-+  exit $1
-+} # as_fn_exit
-+
-+# as_fn_unset VAR
-+# ---------------
-+# Portably unset VAR.
-+as_fn_unset ()
-+{
-+  { eval $1=; unset $1;}
-+}
-+as_unset=as_fn_unset
-+# as_fn_append VAR VALUE
-+# ----------------------
-+# Append the text in VALUE to the end of the definition contained in VAR. Take
-+# advantage of any shell optimizations that allow amortized linear growth over
-+# repeated appends, instead of the typical quadratic growth present in naive
-+# implementations.
-+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
-+  eval 'as_fn_append ()
-+  {
-+    eval $1+=\$2
-+  }'
-+else
-+  as_fn_append ()
-+  {
-+    eval $1=\$$1\$2
-+  }
-+fi # as_fn_append
-+
-+# as_fn_arith ARG...
-+# ------------------
-+# Perform arithmetic evaluation on the ARGs, and store the result in the
-+# global $as_val. Take advantage of shells that can avoid forks. The arguments
-+# must be portable across $(()) and expr.
-+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
-+  eval 'as_fn_arith ()
-+  {
-+    as_val=$(( $* ))
-+  }'
-+else
-+  as_fn_arith ()
-+  {
-+    as_val=`expr "$@" || test $? -eq 1`
-+  }
-+fi # as_fn_arith
-+
-+
- if expr a : '\(a\)' >/dev/null 2>&1 &&
-    test "X`expr 00001 : '.*\(...\)'`" = X001; then
-   as_expr=expr
-@@ -13116,8 +11914,12 @@ else
-   as_basename=false
- fi
- 
-+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
-+  as_dirname=dirname
-+else
-+  as_dirname=false
-+fi
- 
--# Name of the executable.
- as_me=`$as_basename -- "$0" ||
- $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
- 	 X"$0" : 'X\(//\)$' \| \
-@@ -13137,76 +11939,25 @@ $as_echo X/"$0" |
- 	  }
- 	  s/.*/./; q'`
- 
--# CDPATH.
--$as_unset CDPATH
--
--
--
--  as_lineno_1=$LINENO
--  as_lineno_2=$LINENO
--  test "x$as_lineno_1" != "x$as_lineno_2" &&
--  test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || {
--
--  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
--  # uniformly replaced by the line number.  The first 'sed' inserts a
--  # line-number line after each line using $LINENO; the second 'sed'
--  # does the real work.  The second script uses 'N' to pair each
--  # line-number line with the line containing $LINENO, and appends
--  # trailing '-' during substitution so that $LINENO is not a special
--  # case at line end.
--  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
--  # scripts with optimization help from Paolo Bonzini.  Blame Lee
--  # E. McMahon (1931-1989) for sed's syntax.  :-)
--  sed -n '
--    p
--    /[$]LINENO/=
--  ' <$as_myself |
--    sed '
--      s/[$]LINENO.*/&-/
--      t lineno
--      b
--      :lineno
--      N
--      :loop
--      s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/
--      t loop
--      s/-\n.*//
--    ' >$as_me.lineno &&
--  chmod +x "$as_me.lineno" ||
--    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
--   { (exit 1); exit 1; }; }
--
--  # Don't try to exec as it changes $[0], causing all sort of problems
--  # (the dirname of $[0] is not the place where we might find the
--  # original and so on.  Autoconf is especially sensitive to this).
--  . "./$as_me.lineno"
--  # Exit status is that of the last command.
--  exit
--}
--
--
--if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
--  as_dirname=dirname
--else
--  as_dirname=false
--fi
-+# Avoid depending upon Character Ranges.
-+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-+as_cr_digits='0123456789'
-+as_cr_alnum=$as_cr_Letters$as_cr_digits
- 
- ECHO_C= ECHO_N= ECHO_T=
--case `echo -n x` in
-+case `echo -n x` in #(((((
- -n*)
--  case `echo 'x\c'` in
-+  case `echo 'xy\c'` in
-   *c*) ECHO_T='	';;	# ECHO_T is single tab character.
--  *)   ECHO_C='\c';;
-+  xy)  ECHO_C='\c';;
-+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
-+       ECHO_T='	';;
-   esac;;
- *)
-   ECHO_N='-n';;
- esac
--if expr a : '\(a\)' >/dev/null 2>&1 &&
--   test "X`expr 00001 : '.*\(...\)'`" = X001; then
--  as_expr=expr
--else
--  as_expr=false
--fi
- 
- rm -f conf$$ conf$$.exe conf$$.file
- if test -d conf$$.dir; then
-@@ -13235,8 +11986,56 @@ fi
- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
- rmdir conf$$.dir 2>/dev/null
- 
-+
-+# as_fn_mkdir_p
-+# -------------
-+# Create "$as_dir" as a directory, including parents if necessary.
-+as_fn_mkdir_p ()
-+{
-+
-+  case $as_dir in #(
-+  -*) as_dir=./$as_dir;;
-+  esac
-+  test -d "$as_dir" || eval $as_mkdir_p || {
-+    as_dirs=
-+    while :; do
-+      case $as_dir in #(
-+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
-+      *) as_qdir=$as_dir;;
-+      esac
-+      as_dirs="'$as_qdir' $as_dirs"
-+      as_dir=`$as_dirname -- "$as_dir" ||
-+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_dir" : 'X\(//\)[^/]' \| \
-+	 X"$as_dir" : 'X\(//\)$' \| \
-+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_dir" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+      test -d "$as_dir" && break
-+    done
-+    test -z "$as_dirs" || eval "mkdir $as_dirs"
-+  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
-+
-+
-+} # as_fn_mkdir_p
- if mkdir -p . 2>/dev/null; then
--  as_mkdir_p=:
-+  as_mkdir_p='mkdir -p "$as_dir"'
- else
-   test -d ./-p && rmdir ./-p
-   as_mkdir_p=false
-@@ -13255,10 +12054,10 @@ else
-       if test -d "$1"; then
- 	test -d "$1/.";
-       else
--	case $1 in
-+	case $1 in #(
- 	-*)set "./$1";;
- 	esac;
--	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
- 	???[sx]*):;;*)false;;esac;fi
-     '\'' sh
-   '
-@@ -13273,13 +12072,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
- 
- 
- exec 6>&1
-+## ----------------------------------- ##
-+## Main body of $CONFIG_STATUS script. ##
-+## ----------------------------------- ##
-+_ASEOF
-+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1
- 
--# Save the log message, to keep $[0] and so on meaningful, and to
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# Save the log message, to keep $0 and so on meaningful, and to
- # report actual input values of CONFIG_FILES etc. instead of their
- # values after options handling.
- ac_log="
--This file was extended by ghostess $as_me 20100326, which was
--generated by GNU Autoconf 2.63.  Invocation command line was
-+This file was extended by ghostess $as_me 20100905, which was
-+generated by GNU Autoconf 2.65.  Invocation command line was
- 
-   CONFIG_FILES    = $CONFIG_FILES
-   CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -13311,13 +12116,15 @@ _ACEOF
- 
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
- ac_cs_usage="\
--\`$as_me' instantiates files from templates according to the
--current configuration.
-+\`$as_me' instantiates files and other configuration actions
-+from templates according to the current configuration.  Unless the files
-+and actions are specified as TAGs, all are instantiated by default.
- 
--Usage: $0 [OPTION]... [FILE]...
-+Usage: $0 [OPTION]... [TAG]...
- 
-   -h, --help       print this help, then exit
-   -V, --version    print version number and configuration settings, then exit
-+      --config     print configuration, then exit
-   -q, --quiet, --silent
-                    do not print progress messages
-   -d, --debug      don't remove temporary files
-@@ -13336,16 +12143,17 @@ $config_headers
- Configuration commands:
- $config_commands
- 
--Report bugs to <bug-autoconf at gnu.org>."
-+Report bugs to <musound-at-jps-dot-net>."
- 
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
- ac_cs_version="\\
--ghostess config.status 20100326
--configured by $0, generated by GNU Autoconf 2.63,
--  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-+ghostess config.status 20100905
-+configured by $0, generated by GNU Autoconf 2.65,
-+  with options \\"\$ac_cs_config\\"
- 
--Copyright (C) 2008 Free Software Foundation, Inc.
-+Copyright (C) 2009 Free Software Foundation, Inc.
- This config.status script is free software; the Free Software Foundation
- gives unlimited permission to copy, distribute and modify it."
- 
-@@ -13381,6 +12189,8 @@ do
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     $as_echo "$ac_cs_version"; exit ;;
-+  --config | --confi | --conf | --con | --co | --c )
-+    $as_echo "$ac_cs_config"; exit ;;
-   --debug | --debu | --deb | --de | --d | -d )
-     debug=: ;;
-   --file | --fil | --fi | --f )
-@@ -13388,20 +12198,19 @@ do
-     case $ac_optarg in
-     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
--    CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
-+    as_fn_append CONFIG_FILES " '$ac_optarg'"
-     ac_need_defaults=false;;
-   --header | --heade | --head | --hea )
-     $ac_shift
-     case $ac_optarg in
-     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-     esac
--    CONFIG_HEADERS="$CONFIG_HEADERS '$ac_optarg'"
-+    as_fn_append CONFIG_HEADERS " '$ac_optarg'"
-     ac_need_defaults=false;;
-   --he | --h)
-     # Conflict between --help and --header
--    { $as_echo "$as_me: error: ambiguous option: $1
--Try \`$0 --help' for more information." >&2
--   { (exit 1); exit 1; }; };;
-+    as_fn_error "ambiguous option: \`$1'
-+Try \`$0 --help' for more information.";;
-   --help | --hel | -h )
-     $as_echo "$ac_cs_usage"; exit ;;
-   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-@@ -13409,11 +12218,10 @@ Try \`$0 --help' for more information."
-     ac_cs_silent=: ;;
- 
-   # This is an error.
--  -*) { $as_echo "$as_me: error: unrecognized option: $1
--Try \`$0 --help' for more information." >&2
--   { (exit 1); exit 1; }; } ;;
-+  -*) as_fn_error "unrecognized option: \`$1'
-+Try \`$0 --help' for more information." ;;
- 
--  *) ac_config_targets="$ac_config_targets $1"
-+  *) as_fn_append ac_config_targets " $1"
-      ac_need_defaults=false ;;
- 
-   esac
-@@ -13725,9 +12533,7 @@ do
-     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
- 
--  *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
--$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
--   { (exit 1); exit 1; }; };;
-+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-   esac
- done
- 
-@@ -13754,7 +12560,7 @@ $debug ||
-   trap 'exit_status=$?
-   { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
- ' 0
--  trap '{ (exit 1); exit 1; }' 1 2 13 15
-+  trap 'as_fn_exit 1' 1 2 13 15
- }
- # Create a (secure) tmp directory for tmp files.
- 
-@@ -13765,11 +12571,7 @@ $debug ||
- {
-   tmp=./conf$$-$RANDOM
-   (umask 077 && mkdir "$tmp")
--} ||
--{
--   $as_echo "$as_me: cannot create a temporary directory in ." >&2
--   { (exit 1); exit 1; }
--}
-+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
- 
- # Set up the scripts for CONFIG_FILES section.
- # No need to generate them if there are no CONFIG_FILES.
-@@ -13777,10 +12579,16 @@ $debug ||
- if test -n "$CONFIG_FILES"; then
- 
- 
--ac_cr='
'
-+ac_cr=`echo X | tr X '\015'`
-+# On cygwin, bash can eat \r inside `` if the user requested igncr.
-+# But we know of no other shell where ac_cr would be empty at this
-+# point, so we can use a bashism as a fallback.
-+if test "x$ac_cr" = x; then
-+  eval ac_cr=\$\'\\r\'
-+fi
- ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
- if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
--  ac_cs_awk_cr='\\r'
-+  ac_cs_awk_cr='\r'
- else
-   ac_cs_awk_cr=$ac_cr
- fi
-@@ -13794,24 +12602,18 @@ _ACEOF
-   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-   echo "_ACEOF"
- } >conf$$subs.sh ||
--  { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
-   . ./conf$$subs.sh ||
--    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
- 
-   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
-   if test $ac_delim_n = $ac_delim_num; then
-     break
-   elif $ac_last_try; then
--    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -13833,7 +12635,7 @@ s/'"$ac_delim"'$//
- t delim
- :nl
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more1
- s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
- p
-@@ -13847,7 +12649,7 @@ s/.\{148\}//
- t nl
- :delim
- h
--s/\(.\{148\}\).*/\1/
-+s/\(.\{148\}\)..*/\1/
- t more2
- s/["\\]/\\&/g; s/^/"/; s/$/"/
- p
-@@ -13900,9 +12702,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
- else
-   cat
- fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
--  || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
--$as_echo "$as_me: error: could not setup config files machinery" >&2;}
--   { (exit 1); exit 1; }; }
-+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
- _ACEOF
- 
- # VPATH may cause trouble with some makes, so we remove $(srcdir),
-@@ -13943,9 +12743,7 @@ for ac_last_try in false false :; do
-   if test -z "$ac_t"; then
-     break
-   elif $ac_last_try; then
--    { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_HEADERS" >&5
--$as_echo "$as_me: error: could not make $CONFIG_HEADERS" >&2;}
--   { (exit 1); exit 1; }; }
-+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-   else
-     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-   fi
-@@ -14030,9 +12828,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
- _ACAWK
- _ACEOF
- cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
--  { { $as_echo "$as_me:$LINENO: error: could not setup config headers machinery" >&5
--$as_echo "$as_me: error: could not setup config headers machinery" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
- fi # test -n "$CONFIG_HEADERS"
- 
- 
-@@ -14045,9 +12841,7 @@ do
-   esac
-   case $ac_mode$ac_tag in
-   :[FHL]*:*);;
--  :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
--$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
--   { (exit 1); exit 1; }; };;
-+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-   :[FH]-) ac_tag=-:-;;
-   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-   esac
-@@ -14075,12 +12869,10 @@ $as_echo "$as_me: error: invalid tag $ac
- 	   [\\/$]*) false;;
- 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
- 	   esac ||
--	   { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
--$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
--   { (exit 1); exit 1; }; };;
-+	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
-       esac
-       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
--      ac_file_inputs="$ac_file_inputs '$ac_f'"
-+      as_fn_append ac_file_inputs " '$ac_f'"
-     done
- 
-     # Let's still pretend it is `configure' which instantiates (i.e., don't
-@@ -14091,7 +12883,7 @@ $as_echo "$as_me: error: cannot find inp
- 	`' by configure.'
-     if test x"$ac_file" != x-; then
-       configure_input="$ac_file.  $configure_input"
--      { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
- $as_echo "$as_me: creating $ac_file" >&6;}
-     fi
-     # Neutralize special characters interpreted by sed in replacement strings.
-@@ -14104,9 +12896,7 @@ $as_echo "$as_me: creating $ac_file" >&6
- 
-     case $ac_tag in
-     *:-:* | *:-) cat >"$tmp/stdin" \
--      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
--   { (exit 1); exit 1; }; } ;;
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-     esac
-     ;;
-   esac
-@@ -14134,47 +12924,7 @@ $as_echo X"$ac_file" |
- 	    q
- 	  }
- 	  s/.*/./; q'`
--  { as_dir="$ac_dir"
--  case $as_dir in #(
--  -*) as_dir=./$as_dir;;
--  esac
--  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
--    as_dirs=
--    while :; do
--      case $as_dir in #(
--      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
--      *) as_qdir=$as_dir;;
--      esac
--      as_dirs="'$as_qdir' $as_dirs"
--      as_dir=`$as_dirname -- "$as_dir" ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\/\)[^/].*/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\/\)$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\).*/{
--	    s//\1/
--	    q
--	  }
--	  s/.*/./; q'`
--      test -d "$as_dir" && break
--    done
--    test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
--   { (exit 1); exit 1; }; }; }
-+  as_dir="$ac_dir"; as_fn_mkdir_p
-   ac_builddir=.
- 
- case "$ac_dir" in
-@@ -14231,7 +12981,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
- # If the template does not know about datarootdir, expand it.
- # FIXME: This hack should be removed a few years after 2.60.
- ac_datarootdir_hack=; ac_datarootdir_seen=
--
- ac_sed_dataroot='
- /datarootdir/ {
-   p
-@@ -14241,12 +12990,11 @@ ac_sed_dataroot='
- /@docdir@/p
- /@infodir@/p
- /@localedir@/p
--/@mandir@/p
--'
-+/@mandir@/p'
- case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
- *datarootdir*) ac_datarootdir_seen=yes;;
- *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
--  { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
- $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-@@ -14256,7 +13004,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
-   s&@infodir@&$infodir&g
-   s&@localedir@&$localedir&g
-   s&@mandir@&$mandir&g
--    s&\\\${datarootdir}&$datarootdir&g' ;;
-+  s&\\\${datarootdir}&$datarootdir&g' ;;
- esac
- _ACEOF
- 
-@@ -14285,14 +13033,12 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
- $ac_datarootdir_hack
- "
- eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
--  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
--   { (exit 1); exit 1; }; }
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
- 
- test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
--  { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined.  Please make sure it is defined." >&5
- $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
- which seems to be undefined.  Please make sure it is defined." >&2;}
-@@ -14302,9 +13048,7 @@ which seems to be undefined.  Please mak
-   -) cat "$tmp/out" && rm -f "$tmp/out";;
-   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-   esac \
--  || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
--   { (exit 1); exit 1; }; }
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-  ;;
-   :H)
-   #
-@@ -14315,25 +13059,19 @@ $as_echo "$as_me: error: could not creat
-       $as_echo "/* $configure_input  */" \
-       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-     } >"$tmp/config.h" \
--      || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
--   { (exit 1); exit 1; }; }
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5
-     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
--      { $as_echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
- $as_echo "$as_me: $ac_file is unchanged" >&6;}
-     else
-       rm -f "$ac_file"
-       mv "$tmp/config.h" "$ac_file" \
--	|| { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
--$as_echo "$as_me: error: could not create $ac_file" >&2;}
--   { (exit 1); exit 1; }; }
-+	|| as_fn_error "could not create $ac_file" "$LINENO" 5
-     fi
-   else
-     $as_echo "/* $configure_input  */" \
-       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
--      || { { $as_echo "$as_me:$LINENO: error: could not create -" >&5
--$as_echo "$as_me: error: could not create -" >&2;}
--   { (exit 1); exit 1; }; }
-+      || as_fn_error "could not create -" "$LINENO" 5
-   fi
- # Compute "$ac_file"'s index in $config_headers.
- _am_arg="$ac_file"
-@@ -14371,7 +13109,7 @@ $as_echo X"$_am_arg" |
- 	  s/.*/./; q'`/stamp-h$_am_stamp_count
-  ;;
- 
--  :C)  { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
-+  :C)  { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
- $as_echo "$as_me: executing $ac_file commands" >&6;}
-  ;;
-   esac
-@@ -14466,47 +13204,7 @@ $as_echo X"$file" |
- 	    q
- 	  }
- 	  s/.*/./; q'`
--      { as_dir=$dirpart/$fdir
--  case $as_dir in #(
--  -*) as_dir=./$as_dir;;
--  esac
--  test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || {
--    as_dirs=
--    while :; do
--      case $as_dir in #(
--      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
--      *) as_qdir=$as_dir;;
--      esac
--      as_dirs="'$as_qdir' $as_dirs"
--      as_dir=`$as_dirname -- "$as_dir" ||
--$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
--	 X"$as_dir" : 'X\(//\)[^/]' \| \
--	 X"$as_dir" : 'X\(//\)$' \| \
--	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
--$as_echo X"$as_dir" |
--    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\/\)[^/].*/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\/\)$/{
--	    s//\1/
--	    q
--	  }
--	  /^X\(\/\).*/{
--	    s//\1/
--	    q
--	  }
--	  s/.*/./; q'`
--      test -d "$as_dir" && break
--    done
--    test -z "$as_dirs" || eval "mkdir $as_dirs"
--  } || test -d "$as_dir" || { { $as_echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5
--$as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
--   { (exit 1); exit 1; }; }; }
-+      as_dir=$dirpart/$fdir; as_fn_mkdir_p
-       # echo "creating $dirpart/$file"
-       echo '# dummy' > "$dirpart/$file"
-     done
-@@ -15153,15 +13851,12 @@ _LT_EOF
- done # for ac_tag
- 
- 
--{ (exit 0); exit 0; }
-+as_fn_exit 0
- _ACEOF
--chmod +x $CONFIG_STATUS
- ac_clean_files=$ac_clean_files_save
- 
- test $ac_write_fail = 0 ||
--  { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
--$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
--   { (exit 1); exit 1; }; }
-+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
- 
- 
- # configure is writing to config.log, and then calls config.status.
-@@ -15182,10 +13877,10 @@ if test "$no_create" != yes; then
-   exec 5>>config.log
-   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-   # would make configure fail if this is the last instruction.
--  $ac_cs_success || { (exit 1); exit 1; }
-+  $ac_cs_success || as_fn_exit $?
- fi
- if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
--  { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
- $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
- fi
- 
---- ghostess-20100326.orig/Makefile.am
-+++ ghostess-20100326/Makefile.am
-@@ -2,8 +2,11 @@
- 
- SUBDIRS = src
- 
-+man_MANS = ghostess.1
-+
- EXTRA_DIST = \
--	autogen.sh
-+	autogen.sh \
-+	ghostess.1
- 
- AUTOMAKE_OPTIONS = foreign
- 
---- ghostess-20100326.orig/aclocal.m4
-+++ ghostess-20100326/aclocal.m4
-@@ -1,4 +1,4 @@
--# generated automatically by aclocal 1.11 -*- Autoconf -*-
-+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
- # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
-@@ -13,8 +13,8 @@
- 
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
--[m4_warning([this file was generated for autoconf 2.63.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
-+[m4_warning([this file was generated for autoconf 2.65.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
- To do so, use the procedure documented by the package, typically `autoreconf'.])])
-@@ -106,7 +106,7 @@ main ()
-   int major, minor, micro;
-   char *tmp_version;
- 
--  system ("touch conf.gtktest");
-+  fclose (fopen ("conf.gtktest", "w"));
- 
-   /* HP/UX 9 (%@#!) writes to sscanf strings */
-   tmp_version = g_strdup("$min_gtk_version");
-@@ -2657,7 +2657,7 @@ linux*oldld* | linux*aout* | linux*coff*
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-@@ -2697,6 +2697,18 @@ linux* | k*bsd*-gnu)
-   dynamic_linker='GNU/Linux ld.so'
-   ;;
- 
-+netbsdelf*-gnu)
-+  version_type=linux
-+  need_lib_prefix=no
-+  need_version=no
-+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-+  soname_spec='${libname}${release}${shared_ext}$major'
-+  shlibpath_var=LD_LIBRARY_PATH
-+  shlibpath_overrides_runpath=no
-+  hardcode_into_libs=yes
-+  dynamic_linker='NetBSD ld.elf_so'
-+  ;;
-+
- netbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-@@ -3284,11 +3296,11 @@ irix5* | irix6* | nonstopux*)
-   ;;
- 
- # This must be Linux ELF.
--linux* | k*bsd*-gnu)
-+linux* | k*bsd*-gnu | kopensolaris*-gnu)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
--netbsd*)
-+netbsd* | netbsdelf*-gnu)
-   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
-     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-   else
-@@ -3905,7 +3917,7 @@ m4_if([$1], [CXX], [
- 	    ;;
- 	esac
- 	;;
--      linux* | k*bsd*-gnu)
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
- 	case $cc_basename in
- 	  KCC*)
- 	    # KAI C++ Compiler
-@@ -3969,7 +3981,7 @@ m4_if([$1], [CXX], [
- 	    ;;
- 	esac
- 	;;
--      netbsd*)
-+      netbsd* | netbsdelf*-gnu)
- 	;;
-       *qnx* | *nto*)
-         # QNX uses GNU C++, but need to define -shared option too, otherwise
-@@ -4189,7 +4201,7 @@ m4_if([$1], [CXX], [
-       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-       ;;
- 
--    linux* | k*bsd*-gnu)
-+    linux* | k*bsd*-gnu | kopensolaris*-gnu)
-       case $cc_basename in
-       # old Intel for x86_64 which still supported -KPIC.
-       ecc*)
-@@ -4394,6 +4406,9 @@ m4_if([$1], [CXX], [
-   cygwin* | mingw* | cegcc*)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+  ;;
-   *)
-     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-   ;;
-@@ -4458,6 +4473,9 @@ dnl Note also adjust exclude_expsyms for
-   openbsd*)
-     with_gnu_ld=no
-     ;;
-+  linux* | k*bsd*-gnu)
-+    _LT_TAGVAR(link_all_deplibs, $1)=no
-+    ;;
-   esac
- 
-   _LT_TAGVAR(ld_shlibs, $1)=yes
-@@ -4479,6 +4497,7 @@ dnl Note also adjust exclude_expsyms for
-     fi
-     supports_anon_versioning=no
-     case `$LD -v 2>&1` in
-+      *GNU\ gold*) supports_anon_versioning=yes ;;
-       *\ [[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 ...
-@@ -4570,7 +4589,7 @@ _LT_EOF
-       _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
-       ;;
- 
--    gnu* | linux* | tpf* | k*bsd*-gnu)
-+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
-       tmp_diet=no
-       if test "$host_os" = linux-dietlibc; then
- 	case $cc_basename in
-@@ -4640,7 +4659,7 @@ _LT_EOF
-       fi
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
- 	wlarc=
-@@ -4815,6 +4834,7 @@ _LT_EOF
- 	if test "$aix_use_runtimelinking" = yes; then
- 	  shared_flag="$shared_flag "'${wl}-G'
- 	fi
-+	_LT_TAGVAR(link_all_deplibs, $1)=no
-       else
- 	# not using gcc
- 	if test "$host_cpu" = ia64; then
-@@ -5053,7 +5073,7 @@ _LT_EOF
-       _LT_TAGVAR(link_all_deplibs, $1)=yes
-       ;;
- 
--    netbsd*)
-+    netbsd* | netbsdelf*-gnu)
-       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-       else
-@@ -6049,7 +6069,7 @@ if test "$_lt_caught_CXX_error" != yes;
-         _LT_TAGVAR(inherit_rpath, $1)=yes
-         ;;
- 
--      linux* | k*bsd*-gnu)
-+      linux* | k*bsd*-gnu | kopensolaris*-gnu)
-         case $cc_basename in
-           KCC*)
- 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
-@@ -8056,15 +8076,15 @@ m4_define([lt_dict_filter],
- 
- # Generated from ltversion.in.
- 
--# serial 3012 ltversion.m4
-+# serial 3017 ltversion.m4
- # This file is part of GNU Libtool
- 
--m4_define([LT_PACKAGE_VERSION], [2.2.6])
--m4_define([LT_PACKAGE_REVISION], [1.3012])
-+m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-+m4_define([LT_PACKAGE_REVISION], [1.3017])
- 
- AC_DEFUN([LTVERSION_VERSION],
--[macro_version='2.2.6'
--macro_revision='1.3012'
-+[macro_version='2.2.6b'
-+macro_revision='1.3017'
- _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
- _LT_DECL(, macro_revision, 0)
- ])
-@@ -8230,14 +8250,16 @@ fi])
- # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
- # ---------------------------------------------
- m4_define([_PKG_CONFIG],
--[if test -n "$$1"; then
--    pkg_cv_[]$1="$$1"
-- elif test -n "$PKG_CONFIG"; then
--    PKG_CHECK_EXISTS([$3],
--                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
--		     [pkg_failed=yes])
-- else
--    pkg_failed=untried
-+[if test -n "$PKG_CONFIG"; then
-+    if test -n "$$1"; then
-+        pkg_cv_[]$1="$$1"
-+    else
-+        PKG_CHECK_EXISTS([$3],
-+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-+			 [pkg_failed=yes])
-+    fi
-+else
-+	pkg_failed=untried
- fi[]dnl
- ])# _PKG_CONFIG
- 
-@@ -8281,9 +8303,9 @@ See the pkg-config man page for more det
- if test $pkg_failed = yes; then
-         _PKG_SHORT_ERRORS_SUPPORTED
-         if test $_pkg_short_errors_supported = yes; then
--	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
-         else 
--	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
-+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
-@@ -8333,7 +8355,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.11'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version.  Point them to the right macro.
--m4_if([$1], [1.11], [],
-+m4_if([$1], [1.11.1], [],
-       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
- 
-@@ -8349,7 +8371,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.11])dnl
-+[AM_AUTOMAKE_VERSION([1.11.1])dnl
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
- _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
---- ghostess-20100326.orig/ChangeLog
-+++ ghostess-20100326/ChangeLog
-@@ -1,3 +1,11 @@
-+20100905
-+ * Configuration file saving and loading is more locale-flexible:
-+     floating-point numbers are always written using '.' for the
-+     decimal point, regardless of locale setting, and when they are
-+     read, either '.' or the locale-specific decimal point may be
-+     used.
-+ * Added a manual page.
-+
- 20100326
-  * Added JACK session management support from Torben Hohn.
-  * Cleaned up source copyright and license notices.
---- /dev/null
-+++ ghostess-20100326/ghostess.1
-@@ -0,0 +1,219 @@
-+.TH ghostess 1 "September 5th, 2010"
-+.SH NAME
-+ghostess
-+.SH SYNOPSIS
-+.B ghostess
-+[\fB-debug \fIlevel\fR] [\fB-hostname \fIhostname\fR] [\fB-projdir \fIprojdir\fR]
-+[\fB-uuid \fIuuid\fR] [\fB-noauto\fR] [\fB-f \fIcfgfile\fR]
-+[\fI-n\fR] [\fB-chan \fIc\fR] [\fB-conf \fIk\fR \fIv\fR] [\fB-prog \fIb\fR \fIp\fR]
-+[\fB-port \fIp\fR \fIf\fR] \fIsoname\fR[\fI:label\fR] [\fI...\fR]
-+.SH DESCRIPTION
-+.B ghostess
-+is a DSSI host that listens for MIDI events, delivers them to DSSI
-+synth plugins, and outputs the resulting audio via JACK.
-+.B ghostess
-+also supports DSSI plugins having audio inputs (effects), LADSPA
-+plugins, and the use of DSSI-style user interfaces with LADSPA plugins.
-+.B ghostess
-+can host up to 32 plugin instances at one time.
-+.PP
-+Depending on the compile-time configuration,
-+.B ghostess
-+will receive MIDI events from ALSA, JACK MIDI, or CoreMIDI.
-+Unless otherwise specified by the
-+.B -chan
-+option, each plugin instance is sequentially assigned a MIDI channel,
-+wrapping from 15 (zero-based) back to 0 when necessary. Unless
-+.B \-noauto
-+is specified, plugin inputs and outputs are connected sequentially to
-+the available JACK physical input and output ports, respectively, wrapping back
-+to the first port whenever the available ports are exhausted.
-+.PP
-+At startup,
-+.B ghostess
-+presents a simple GTK+ user interface.  Each plugin instance is
-+represented in a frame, labeled with the plugin name, and containing
-+a MIDI activity indicator and a \'UI\' button. Left-clicking the
-+\'UI\' button will start or hide the plugin's user interface (UI).
-+Right-clicking the \'UI\' button will allowing starting, hiding,
-+showing, or terminating the plugin's UI.
-+.PP
-+The \'Save Configuration...\' option of
-+.BR ghostess 's
-+\'File\' menu allows saving the current configuration of all plugins
-+to a file. Basically, the file is just a Bourne shell script that
-+can be used to recreate the configuration.
-+.PP
-+.B ghostess
-+comes with a minimal universal DSSI GUI,
-+.BR ghostess_universal_gui ,
-+that can be used with any DSSI or LADSPA plugin.  It does not read
-+RDF files or instantiate the plugin, so it's not as full-featured as
-+a universal GUI could be, but it does allow for adjusting
-+DSSI/LADSPA ports, selecting bank and program (for plugins with
-+select_program()), and sending test notes (for plugins with any of
-+the run_synth() functions). If ghostess cannot find a UI for a
-+plugin, and the universal GUI is in the
-+.BR PATH ,
-+.B ghostess
-+will launch it.
-+.SH OPTIONS
-+The following global options are available:
-+.TP
-+.BI -debug " level"
-+Sets bitfield flags which determine which debugging information is
-+printed.  The default
-+.I level
-+of 1 shows errors only, 0 shows nothing, and \-1 shows everything.
-+See ghostess.h for details.
-+.TP
-+.BI -hostname " hostname"
-+Sets
-+.I hostname
-+as the name
-+.B ghostess
-+uses for itself, for JACK and ALSA clients and GUI window titles.
-+If a JACK port cannot be created with that name, the PID is appended.
-+.TP
-+.BI -projdir " projdir"
-+Sets the project directory passed to both plugins and UIs to
-+.IR projdir .
-+The default is none.
-+.TP
-+.BI -uuid " uuid"
-+Sets
-+.I uuid
-+as the UUID used for JACK session management. There is probably no
-+reason to use this outside of a managed session.
-+.TP
-+.B -noauto
-+Disables automatic connection of plugin outputs to JACK physical
-+outputs.
-+.TP
-+.BI -f " cfgfile"
-+Additional configuration will be read from
-+.IR cfgfile ,
-+in the same format as command line options.
-+.P
-+For specifying plugin instances,
-+.B ghostess
-+uses a '[\-\fIrepetition-count\fR] [\fIoptions\fR]
-+\fIsoname\fR[:\fIlabel\fR]' format, which may be repeated for
-+multiple instances. The plugin-specific options are:
-+.TP
-+.BI \- n
-+Specifies the repitition count, or number of instances, of the
-+following plugin to create, where
-+.I n
-+is an integer between 1 (the default) and 32.
-+.TP
-+.BI -chan " c"
-+Sets the initial MIDI channel for the following plugin instance to
-+.IR c .
-+Channels are numbered 0 to 15. If the repetition count is more than
-+one, instances are given sequential channels beginning with
-+.I c
-+and wrapping from 15 to 0. The default is for all instances'
-+MIDI channels to be sequentially numbered, starting from 0.
-+.TP
-+.BI -conf " k" " " " v"
-+Sets configure item key
-+.I k
-+and value
-+.I v
-+for the following instance. May be repeated for multiple keys.
-+.TP
-+.BI -prog " b" " " " p"
-+Sets the program change bank
-+.I b
-+and program
-+.I p
-+for the following plugin (numbered from 0).
-+.TP
-+.BI -port " p" " " " f"
-+Sets the value of port
-+.I p
-+to floating point number
-+.I f
-+for the following plugin. May be repeated for different ports.
-+.TP
-+.I soname
-+The name of the DSSI or LADSPA plugin library to load, including the
-+\'.so\' suffix.
-+.I soname
-+may be an absolute path to the library file, or just the filename
-+itself, in which case the DSSI search path is searched (see
-+.B ENVIRONMENT
-+below).
-+.TP
-+.I label
-+The label of the DSSI or LADSPA plugin to load from the library
-+.IR soname .
-+If this is omitted, the first plugin in the library is used.
-+.SH ENVIRONMENT
-+.B ghostess
-+will search for plugin shared libraries in the directories specified
-+by the environment variable
-+.B DSSI_PATH,
-+which is a colon-separated list of directories. If
-+.B DSSI_PATH
-+is not set, a default search path of
-+.BR /usr/lib/dssi ,
-+.BR /usr/local/lib/dssi ,
-+and (assuming the environment variable
-+.B HOME
-+is set,)
-+.B $HOME/.dssi
-+is used. Note that while
-+.B ghostess
-+may be used to host LADSPA plugins, the environment variable
-+.B LADSPA_PATH
-+is not used to search for them.
-+.SH EXAMPLES
-+Assuming
-+.B DSSI_PATH
-+is correctly set, the command:
-+.PP
-+.EX
-+$ ghostess hexter.so
-+.EE
-+.PP
-+will start a single instance of the plugin hexter, listening on MIDI
-+channel 0, with its output connected to the first JACK physical
-+output port.
-+.PP
-+The command:
-+.PP
-+.EX
-+$ ghostess -noauto -chan 2 xsynth-dssi.so -chan 2 xsynth-dssi.so
-+.EE
-+.PP
-+will start two instances of Xsynth-DSSI, both listening on MIDI
-+channel 2, but will not automatically connect the plugin outputs to
-+JACK output ports.
-+.PP
-+The command:
-+.PP
-+.EX
-+$ ghostess -debug -1 -hostname fuzzy -projdir /tmp/proj -2 -conf load
-+mypatches -prog 0 4 -port 7 0.45 effects.so:fuzz
-+.EE
-+.PP
-+will start two instances of the \'fuzz\' plugin within the
-+.B effects.so
-+library, using
-+.B /tmp/proj
-+as the project directory, pass configure key \'load\' with value
-+\'mypatches\' to both instances, set bank 0 and program 4, and set
-+port 7 to 0.45. Assuming it is some sort of effect, the plugins\'
-+inputs and outputs will be automatically connected to the first JACK
-+physical inputs and outputs. Full debugging information will be
-+printed, and
-+.B fuzzy
-+will be used as the JACK client name.
-+.SH AUTHOR
-+.B ghostess
-+was written by Sean Bolton, who mercilessly mangled code originally
-+written by Chris Cannam and Steve Harris. This manual page was
-+adapted by Sean Bolton from the jack-dssi-host manual page
-+originally by Mark Hymers.
---- ghostess-20100326.orig/ltmain.sh
-+++ ghostess-20100326/ltmain.sh
-@@ -1,6 +1,6 @@
- # Generated from ltmain.m4sh.
- 
--# ltmain.sh (GNU libtool) 2.2.6
-+# ltmain.sh (GNU libtool) 2.2.6b
- # Written by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
- 
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
-@@ -65,7 +65,7 @@
- #       compiler:		$LTCC
- #       compiler flags:		$LTCFLAGS
- #       linker:		$LD (gnu? $with_gnu_ld)
--#       $progname:		(GNU libtool) 2.2.6
-+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
- #       automake:		$automake_version
- #       autoconf:		$autoconf_version
- #
-@@ -73,9 +73,9 @@
- 
- PROGRAM=ltmain.sh
- PACKAGE=libtool
--VERSION=2.2.6
-+VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
- TIMESTAMP=""
--package_revision=1.3012
-+package_revision=1.3017
- 
- # Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-@@ -116,15 +116,15 @@ $lt_unset CDPATH
- 
- : ${CP="cp -f"}
- : ${ECHO="echo"}
--: ${EGREP="/usr/bin/grep -E"}
--: ${FGREP="/usr/bin/grep -F"}
--: ${GREP="/usr/bin/grep"}
-+: ${EGREP="/bin/grep -E"}
-+: ${FGREP="/bin/grep -F"}
-+: ${GREP="/bin/grep"}
- : ${LN_S="ln -s"}
- : ${MAKE="make"}
- : ${MKDIR="mkdir"}
- : ${MV="mv -f"}
- : ${RM="rm -f"}
--: ${SED="/opt/local/bin/gsed"}
-+: ${SED="/bin/sed"}
- : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
- : ${Xsed="$SED -e 1s/^X//"}
- 
-@@ -5033,7 +5033,10 @@ func_mode_link ()
- 	case $pass in
- 	dlopen) libs="$dlfiles" ;;
- 	dlpreopen) libs="$dlprefiles" ;;
--	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
-+	link)
-+	  libs="$deplibs %DEPLIBS%"
-+	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-+	  ;;
- 	esac
-       fi
-       if test "$linkmode,$pass" = "lib,dlpreopen"; then
-@@ -5344,19 +5347,19 @@ func_mode_link ()
- 	    # It is a libtool convenience library, so add in its objects.
- 	    convenience="$convenience $ladir/$objdir/$old_library"
- 	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-+	    tmp_libs=
-+	    for deplib in $dependency_libs; do
-+	      deplibs="$deplib $deplibs"
-+	      if $opt_duplicate_deps ; 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
- 	    func_fatal_error "\`$lib' is not a convenience library"
- 	  fi
--	  tmp_libs=
--	  for deplib in $dependency_libs; do
--	    deplibs="$deplib $deplibs"
--	    if $opt_duplicate_deps ; then
--	      case "$tmp_libs " in
--	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
--	      esac
--	    fi
--	    tmp_libs="$tmp_libs $deplib"
--	  done
- 	  continue
- 	fi # $pass = conv
- 
-@@ -5893,6 +5896,7 @@ func_mode_link ()
- 	  if test "$link_all_deplibs" != no; then
- 	    # Add the search paths of all dependency libraries
- 	    for deplib in $dependency_libs; do
-+	      path=
- 	      case $deplib in
- 	      -L*) path="$deplib" ;;
- 	      *.la)
-@@ -6206,6 +6210,9 @@ func_mode_link ()
- 	    revision="$number_minor"
- 	    lt_irix_increment=no
- 	    ;;
-+	  *)
-+	    func_fatal_configuration "$modename: unknown library version type \`$version_type'"
-+	    ;;
- 	  esac
- 	  ;;
- 	no)
---- ghostess-20100326.orig/README
-+++ ghostess-20100326/README
-@@ -116,67 +116,12 @@ the differences (as of 2005/4/11):
- * jack-dssi-host includes ~/.dssi in its default for DSSI_PATH,
-     ghostess does not.
- 
--Command-Line Option Syntax
--==========================
--The following global options are available:
--
---debug <level>   - Set bitfield flags which determine which
--                   debugging information is printed.  The default of
--                   1 shows errors only, 0 is nothing, -1 is
--                   everything.  See ghostess.h for details.
--
---hostname <name> - Set the name ghostess uses for itself, for JACK
--                   and ALSA clients and GUI window titles.  If a
--                   JACK port cannot be created with that name, the
--                   PID is appended.
--
---projdir <dir>   - Set the 'project directory' configure item passed
--                   to plugins and UIs.
--
---uuid <uuid>     - Set the UUID used by JACK session management. I
--                   don't think there is a reason you would use this
--                   outside of a managed session.
--
---noauto          - Disable automatic connection of plugin outputs to
--                   JACK physical outputs.
--
---f <cfgfile>     - Read further options from the file '<cfgfile>',
--                   in the same format as the command line arguments.
--
--For specifying plugin instances, ghostess uses a '[<repetition-count>]
--[<options>] <soname>[:<label>]' format, similar to jack-dssi-host,
--which may be repeated for multiple instances. Specifically, the
--syntax is:
--
--    [-<n>] [-chan <c>] [-conf <k> <v>] [-prog <b> <p>] [-port <p> <f>] <soname>[:<label>]
--
--with these parameters:
--
--<n>        Number of instances of the following plugin to create,
--           default is 1.
--
--<c>        MIDI channel for the following instance, numbered from 0.
--           If the repetition count is more than one, instances are
--           given sequential channels beginning with <c> and wrapping
--           from 15 to 0.
--
--<k> <v>    Configure item key and value for the following instance
--           (repeatable for different keys).
--
--<b> <p>    Bank and program number for the following instance.
--
--<p> <f>    Port number and value for the following instance (repeatable
--           for different ports).
--
--<soname>   Name of DSSI or LADSPA plugin library (*.so) to load.  If
--           <soname> is not an absolute path, then the environment
--           variable DSSI_PATH is searched (note that LADSPA_PATH is not!).
--
--<label>    Name of DSSI or LADSPA plugin within the library to
--           instantiate, default is the first.
--
-+'Save Configuration...' File Format
-+===================================
- Below is an example of the Bourne shell script saved by 'Save
--Configuration...', which demonstrates almost all of these options.
-+Configuration...', which demonstrates almost all of ghostess's
-+options. Refer to the enclosed ghostess.1 manual page for a
-+description of each option.
- 
- #!/bin/sh
- DSSI_PATH='/opt/audio/lib/dssi'
---- ghostess-20100326.orig/src/ghostess.c
-+++ ghostess-20100326/src/ghostess.c
-@@ -157,9 +157,9 @@ ghss_debug(int type, const char *format,
- 
-     va_start(args, format);
-     if (debug_flags & type) {
--        fprintf(stderr, host_name);
-+        fputs(host_name, stderr);
-         vfprintf(stderr, format, args);
--        fprintf(stderr, "\n");
-+        fputs("\n", stderr);
-     }
-     va_end(args);
- }
-@@ -961,10 +961,14 @@ write_configuration(char *filename, cons
- 
-         /* port */
-         for (i = 0; i < instance->plugin->controlIns; i++) {
-+            char buf[G_ASCII_DTOSTR_BUF_SIZE];
-+
-             in = i + instance->firstControlIn;
- 	    port = pluginControlInPortNumbers[in];
- 
--            if (fprintf(fp, " -port %d %.6g \\\n", port, pluginControlIns[in]) < 0) goto error;
-+            /* always use "." as decimal point */
-+            g_ascii_formatd(buf, sizeof(buf), "%.6g", pluginControlIns[in]);
-+            if (fprintf(fp, " -port %d %s \\\n", port, buf) < 0) goto error;
-         }
- 
-         /* soname:label */
-@@ -1604,7 +1608,7 @@ main(int argc, char **argv)
-                 return 2;
-             }
-             free(arg0);
--            value = strtof(arg1, &tmp);
-+            value = g_strtod(arg1, &tmp); /* will try native and "C" locale decimal points */
-             if (*tmp != '\0') {
-                 ghss_debug(GDB_ERROR, ": bad port value '%s'", arg1);
-                 return 2;
---- ghostess-20100326.orig/src/Makefile.in
-+++ ghostess-20100326/src/Makefile.in
-@@ -1,4 +1,4 @@
--# Makefile.in generated by automake 1.11 from Makefile.am.
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
- # @configure_input@
- 
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-@@ -154,6 +154,7 @@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
- PACKAGE_STRING = @PACKAGE_STRING@
- PACKAGE_TARNAME = @PACKAGE_TARNAME@
-+PACKAGE_URL = @PACKAGE_URL@
- PACKAGE_VERSION = @PACKAGE_VERSION@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- PKG_CONFIG = @PKG_CONFIG@
---- ghostess-20100326.orig/src/gtkknob.h
-+++ ghostess-20100326/src/gtkknob.h
-@@ -26,8 +26,7 @@
- #define __GTK_KNOB_H__
- 
- #include <gdk/gdk.h>
--#include <gtk/gtkadjustment.h>
--#include <gtk/gtkwidget.h>
-+#include <gtk/gtk.h>
- 
- G_BEGIN_DECLS
- 
-@@ -67,6 +66,8 @@ struct _GtkKnobClass
- GType          gtk_knob_get_type (void) G_GNUC_CONST;
- GtkWidget     *gtk_knob_new (GtkAdjustment *adjustment);
- 
-+void           gtk_knob_set_fast_rendering(gboolean setting);
-+
- GtkAdjustment *gtk_knob_get_adjustment(GtkKnob *knob);
- void           gtk_knob_set_adjustment(GtkKnob *knob, GtkAdjustment *adjustment);
- 
---- ghostess-20100326.orig/src/universal_gui.c
-+++ ghostess-20100326/src/universal_gui.c
-@@ -1342,7 +1342,6 @@ main(int argc, char *argv[])
- #endif
-     /* { int i; fprintf(stderr, "args:\n"); for(i=0; i<argc; i++) printf("%d: %s\n", i, argv[i]); } // debug */
-     
--    gtk_set_locale();
-     gtk_init(&argc, &argv);
- 
-     if (argc != 5) {
---- ghostess-20100326.orig/src/gtkknob.c
-+++ ghostess-20100326/src/gtkknob.c
-@@ -1,11 +1,23 @@
--/* WhySynth DSSI software synthesizer GUI
-+/* gtkknob.c - libwhy GtkKnob knob widget
-  *
-- * Copyright (C) 2008 Sean Bolton
-+ * Copyright (C) 2008, 2010 Sean Bolton
-  *
-  * Parts of this code come from GTK+, both the library source and
-  * the example programs.  Other bits come from gAlan 0.2.0,
-  * copyright (C) 1999 Tony Garnock-Jones.
-  *
-+ * gtkknob-cairo_or_pixmap_selectable.c
-+ *
-+ * - This version requires GTK+ 2.0 or later.
-+ * - This version can use fast but ugly server-side pixmaps to draw
-+ *   the knobs.
-+ * - On GTK+ 2.8 or later, this can also use cairo to draw nice but
-+ *   relatively slower anti-aliased knobs.
-+ * - On GTK+ 2.8 or later, cairo is the default, but this can be
-+ *   changed using the function gtk_knob_set_fast_rendering().
-+ * -FIX- It would be nice to add a property "fast-rendering" that
-+ * could be easily set....
-+ *
-  * This program is free software; you can redistribute it and/or
-  * modify it under the terms of the GNU General Public License as
-  * published by the Free Software Foundation; either version 2 of
-@@ -28,8 +40,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <math.h>
--#include <gtk/gtkmain.h>
--#include <gtk/gtksignal.h>
-+#include <gtk/gtk.h>
- 
- #include "gtkknob.h"
- 
-@@ -47,12 +58,24 @@ enum {
- 
- static GtkWidgetClass *parent_class = NULL;
- 
-+#if GTK_CHECK_VERSION(2, 8, 0)
-+static int prefer_cairo = TRUE;
-+#else /* GTK_CHECK_VERSION(2, 8, 0) */
-+static int prefer_cairo = FALSE;
-+#endif /* GTK_CHECK_VERSION(2, 8, 0) */
-+
- static struct {
-     int refcount;
--    int initialized;
-+    GdkPixmap *pixmap;
-+    GdkPixmap *insensitive_pixmap;
-+    GdkBitmap *mask;
-+    GdkGC     *mask_gc;
-+    GdkGC     *red_gc;
-+#if GTK_CHECK_VERSION(2, 8, 0)
-     cairo_surface_t *knob_surface;
-     cairo_surface_t *insensitive_knob_surface;
-     cairo_pattern_t *shadow_pattern;
-+#endif
- } common;
- 
- G_DEFINE_TYPE (GtkKnob, gtk_knob, GTK_TYPE_WIDGET);
-@@ -64,7 +87,6 @@ static void     gtk_knob_finalize      (
- static void     gtk_knob_realize       (GtkWidget *widget);
- static void     gtk_knob_size_request  (GtkWidget *widget, GtkRequisition *requisition);
- static void     gtk_knob_size_allocate (GtkWidget *widget, GtkAllocation  *allocation);
--static gboolean gtk_knob_expose        (GtkWidget *knob, GdkEventExpose *event);
- static gint     gtk_knob_button_press  (GtkWidget *widget, GdkEventButton *event);
- static gint     gtk_knob_button_release(GtkWidget *widget, GdkEventButton *event);
- static gint     gtk_knob_motion_notify (GtkWidget *widget, GdkEventMotion *event);
-@@ -74,9 +96,9 @@ static void     gtk_knob_adjustment_valu
-                                                    gpointer       data);
- static void     gtk_knob_adjustment_changed (GtkAdjustment *adjustment,
-                                              gpointer       data);
--static void     gtk_knob_common_initialize(void);
-+static gboolean gtk_knob_expose        (GtkWidget *knob, GdkEventExpose *event);
-+static void     gtk_knob_common_initialize(GtkWidget *widget);
- static void     gtk_knob_common_finalize(void);
--static void     gtk_knob_paint(GtkWidget *widget, cairo_t *cr);
- 
- 
- static void
-@@ -100,7 +122,16 @@ gtk_knob_class_init (GtkKnobClass *class
-     widget_class->motion_notify_event = gtk_knob_motion_notify;
- 
-     common.refcount = 0;
--    common.initialized = FALSE;
-+    common.pixmap = NULL;
-+    common.insensitive_pixmap = NULL;
-+    common.mask = NULL;
-+    common.mask_gc = NULL;
-+    common.red_gc = NULL;
-+#if GTK_CHECK_VERSION(2, 8, 0)
-+    common.knob_surface = NULL;
-+    common.insensitive_knob_surface = NULL;
-+    common.shadow_pattern = NULL;
-+#endif
- }
- 
- 
-@@ -156,11 +187,11 @@ gtk_knob_destroy (GtkObject *object)
-         g_signal_handlers_disconnect_by_func (knob->adjustment,
-                                               gtk_knob_adjustment_value_changed,
-                                               knob);
--        gtk_object_unref(GTK_OBJECT(knob->adjustment));
-+        g_object_unref(G_OBJECT(knob->adjustment));
-         knob->adjustment = NULL;
-     }
-     if (knob->timer) {
--        gtk_timeout_remove(knob->timer);
-+        g_source_remove(knob->timer);
-         knob->timer = 0;
-     }
- 
-@@ -168,6 +199,17 @@ gtk_knob_destroy (GtkObject *object)
- }
- 
- 
-+void
-+gtk_knob_set_fast_rendering(gboolean setting)
-+{
-+#if GTK_CHECK_VERSION(2, 8, 0)
-+    prefer_cairo = (setting ? FALSE : TRUE);
-+#else
-+    prefer_cairo = FALSE;
-+#endif
-+}
-+
-+
- GtkAdjustment*
- gtk_knob_get_adjustment (GtkKnob *knob)
- {
-@@ -197,17 +239,17 @@ gtk_knob_set_adjustment (GtkKnob *knob,
-         g_signal_handlers_disconnect_by_func (knob->adjustment,
-                                               gtk_knob_adjustment_value_changed,
-                                               knob);
--        gtk_object_unref(GTK_OBJECT(knob->adjustment));
-+        g_object_unref(G_OBJECT(knob->adjustment));
-     }
- 
-     knob->adjustment = adjustment;
--    gtk_object_ref(GTK_OBJECT(knob->adjustment));
--    gtk_object_sink(GTK_OBJECT(knob->adjustment));
-+    g_object_ref(G_OBJECT(knob->adjustment));
-+    gtk_object_sink(GTK_OBJECT(knob->adjustment)); /* deprecated, but g_object_ref_sink() requires glib 2.10 or later */
- 
--    gtk_signal_connect(GTK_OBJECT(adjustment), "changed",
--                       GTK_SIGNAL_FUNC(gtk_knob_adjustment_changed), (gpointer) knob);
--    gtk_signal_connect(GTK_OBJECT(adjustment), "value_changed",
--                       GTK_SIGNAL_FUNC(gtk_knob_adjustment_value_changed), (gpointer) knob);
-+    g_signal_connect(G_OBJECT(adjustment), "changed",
-+                     G_CALLBACK(gtk_knob_adjustment_changed), (gpointer) knob);
-+    g_signal_connect(G_OBJECT(adjustment), "value_changed",
-+                     G_CALLBACK(gtk_knob_adjustment_value_changed), (gpointer) knob);
- 
-     gtk_knob_adjustment_changed (adjustment, knob);
- }
-@@ -254,7 +296,7 @@ gtk_knob_realize (GtkWidget *widget)
-     widget->style = gtk_style_attach (widget->style, widget->window);
-     gtk_style_set_background (widget->style, widget->window, GTK_STATE_NORMAL);
- 
--    gtk_knob_common_initialize();
-+    gtk_knob_common_initialize(widget);
- }
- 
- 
-@@ -283,40 +325,6 @@ gtk_knob_size_allocate (GtkWidget     *w
- }
- 
- 
--static gboolean
--gtk_knob_expose (GtkWidget *widget, GdkEventExpose *event)
--{
--    int center_x, center_y;
--    int l, t, r, b;
--    cairo_t *cr;
--
--    /* minimize the clip area to just what we'll actually draw (32x32 at most) */
--    center_x = widget->allocation.width / 2;
--    center_y = widget->allocation.height / 2;
--    if ((center_x - HALF_KNOB_SIZE >= event->area.x + event->area.width)  ||
--        (center_x + HALF_KNOB_SIZE <= event->area.x)                      ||
--        (center_y - HALF_KNOB_SIZE >= event->area.y + event->area.height) ||
--        (center_y + HALF_KNOB_SIZE <= event->area.y)) {
--        /* clip area is empty */
--        return FALSE;
--    }
--    l = MAX(event->area.x,                      center_x - HALF_KNOB_SIZE);
--    r = MIN(event->area.x + event->area.width,  center_x + HALF_KNOB_SIZE);
--    t = MAX(event->area.y,                      center_y - HALF_KNOB_SIZE);
--    b = MIN(event->area.y + event->area.height, center_y + HALF_KNOB_SIZE);
--    cr = gdk_cairo_create (widget->window);
--    cairo_rectangle (cr, l, t, r - l, b - t);
--    cairo_clip (cr);
--    cairo_translate(cr, center_x - HALF_KNOB_SIZE, center_y - HALF_KNOB_SIZE);
--
--    gtk_knob_paint(widget, cr);
--
--    cairo_destroy (cr);
--
--    return FALSE;
--}
--
--
- static gint
- gtk_knob_button_press (GtkWidget *widget, GdkEventButton *event)
- {
-@@ -376,7 +384,7 @@ gtk_knob_button_release (GtkWidget *widg
-                         knob->adjustment->lower);
-             if (knob->adjustment->value != value) {
-                 knob->adjustment->value = value;
--                gtk_signal_emit_by_name(GTK_OBJECT(knob->adjustment), "value_changed");
-+                g_signal_emit_by_name(G_OBJECT(knob->adjustment), "value_changed");
-             }
-             break;
- 
-@@ -386,7 +394,7 @@ gtk_knob_button_release (GtkWidget *widg
-                         knob->adjustment->lower);
-             if (knob->adjustment->value != value) {
-                 knob->adjustment->value = value;
--                gtk_signal_emit_by_name(GTK_OBJECT(knob->adjustment), "value_changed");
-+                g_signal_emit_by_name(G_OBJECT(knob->adjustment), "value_changed");
-             }
-             break;
- 
-@@ -400,7 +408,7 @@ gtk_knob_button_release (GtkWidget *widg
-         knob->state = STATE_IDLE;
- 
-         if (knob->policy != GTK_UPDATE_CONTINUOUS && knob->old_value != knob->adjustment->value)
--            gtk_signal_emit_by_name(GTK_OBJECT(knob->adjustment), "value_changed");
-+            g_signal_emit_by_name(G_OBJECT(knob->adjustment), "value_changed");
- 
-         break;
- 
-@@ -459,7 +467,7 @@ gtk_knob_timer_callback (GtkKnob *knob)
-     g_return_val_if_fail(GTK_IS_KNOB(knob), FALSE);
- 
-     if (knob->policy == GTK_UPDATE_DELAYED)
--        gtk_signal_emit_by_name(GTK_OBJECT(knob->adjustment), "value_changed");
-+        g_signal_emit_by_name(G_OBJECT(knob->adjustment), "value_changed");
- 
-     return FALSE;       /* don't keep running this timer */
- }
-@@ -528,17 +536,17 @@ gtk_knob_update_mouse(GtkKnob *knob, gin
-     if (knob->adjustment->value != old_value) {
- 
-         if (knob->policy == GTK_UPDATE_CONTINUOUS)
--            gtk_signal_emit_by_name(GTK_OBJECT(knob->adjustment), "value_changed");
-+            g_signal_emit_by_name(G_OBJECT(knob->adjustment), "value_changed");
-         else {
-             gtk_widget_queue_draw (GTK_WIDGET(knob));
- 
-             if (knob->policy == GTK_UPDATE_DELAYED) {
-                 if (knob->timer)
--                    gtk_timeout_remove(knob->timer);
-+                    g_source_remove(knob->timer);
- 
--                knob->timer = gtk_timeout_add (UPDATE_DELAY_LENGTH,
--                                               (GtkFunction) gtk_knob_timer_callback,
--                                               (gpointer) knob);
-+                knob->timer = g_timeout_add (UPDATE_DELAY_LENGTH,
-+                                             (GSourceFunc) gtk_knob_timer_callback,
-+                                             (gpointer) knob);
-           }
-         }
-     }
-@@ -578,6 +586,203 @@ gtk_knob_adjustment_value_changed (GtkAd
- }
- 
- 
-+static void
-+gtk_knob_paint_xlib(GtkWidget *widget, int center_x, int center_y)
-+{
-+    GtkKnob *knob = GTK_KNOB(widget);
-+    gfloat dx, dy;
-+
-+    gdk_window_clear_area(widget->window, 0, 0, widget->allocation.width, widget->allocation.height);
-+
-+    center_x -= HALF_KNOB_SIZE;
-+    center_y -= HALF_KNOB_SIZE;
-+    gdk_gc_set_clip_origin(common.mask_gc, center_x, center_y);
-+
-+    dx = knob->adjustment->value - knob->adjustment->lower;
-+    dy = knob->adjustment->upper - knob->adjustment->lower;
-+
-+    if (dy != 0 && GTK_WIDGET_IS_SENSITIVE (widget)) {
-+        dx = MIN(MAX(dx / dy, 0), 1);
-+        dx = -1.5 * dx + 1.25;
-+
-+        gdk_draw_arc (widget->window, common.red_gc, TRUE,
-+                      1 + center_x , 1 + center_y,
-+                      KNOB_SIZE - 4, KNOB_SIZE - 2,
-+                      dx * 180.f * 64.f, (1.25f - dx) * 180.f * 64.f);
-+        gdk_draw_pixmap(widget->window, common.mask_gc, common.pixmap,
-+                        0, 0, center_x, center_y, KNOB_SIZE, KNOB_SIZE);
-+
-+        dx *= M_PI;
-+        dy = -sin(dx) * 11 + 15.5;
-+        dx = cos(dx) * 11 + 15.5;
-+
-+        gdk_draw_line(widget->window, widget->style->white_gc,
-+                      15 + center_x, 16 + center_y,
-+                      dx + center_x, dy + center_y);
-+    } else {
-+        gdk_draw_pixmap(widget->window, common.mask_gc, common.insensitive_pixmap,
-+                        0, 0, center_x, center_y, KNOB_SIZE, KNOB_SIZE);
-+    }
-+}
-+
-+
-+#if GTK_CHECK_VERSION(2, 8, 0)
-+static void
-+gtk_knob_paint_cairo(GtkWidget *widget, cairo_t *cr)
-+{
-+    GtkKnob *knob = GTK_KNOB(widget);
-+    gfloat value, range;
-+
-+    if (GTK_WIDGET_IS_SENSITIVE (widget)) {
-+
-+        range = knob->adjustment->upper - knob->adjustment->lower;
-+        if (fabs(range) < 1e-37) {
-+            value = 0.0;
-+        } else {
-+            value = MAX(MIN(knob->adjustment->value, knob->adjustment->upper),
-+                        knob->adjustment->lower);
-+            value = value - knob->adjustment->lower;
-+            value /= range;  /* now scaled 0.0 to 1.0 */
-+        }
-+
-+        /* draw the red arc */
-+        cairo_set_source_rgb (cr, 1.0, 0, 0);
-+        cairo_move_to (cr, HALF_KNOB_SIZE, HALF_KNOB_SIZE);
-+        cairo_arc (cr, HALF_KNOB_SIZE, HALF_KNOB_SIZE, (KNOB_SIZE * 0.47),
-+                   M_PI * 0.75, M_PI * 0.75 + value * (1.5 * M_PI));
-+        cairo_close_path (cr);
-+        cairo_fill (cr);
-+
-+        /* draw the knob shadow */
-+        cairo_set_source (cr, common.shadow_pattern);
-+        cairo_paint (cr);
-+
-+        /* paint the knob and reference points over what we have so far */
-+        cairo_set_source_surface (cr, common.knob_surface, 0, 0);
-+        cairo_paint (cr);
-+
-+        /* add cursor to knob */
-+        cairo_translate (cr, HALF_KNOB_SIZE, HALF_KNOB_SIZE);
-+        cairo_rotate (cr, M_PI * 0.75 + value * (1.5 * M_PI));
-+        cairo_set_line_width (cr, KNOB_SIZE / 32.0 * 1.5);
-+        cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-+        cairo_move_to (cr, KNOB_SIZE * 0.06, 0);
-+        cairo_line_to (cr, KNOB_SIZE * 0.30, 0);
-+        cairo_stroke (cr);
-+
-+    } else {  /* insensitive */
-+        cairo_set_source_surface (cr, common.insensitive_knob_surface, 0, 0);
-+        cairo_paint (cr);
-+    }
-+}
-+#endif /* GTK_CHECK_VERSION(2, 8, 0) */
-+
-+
-+static gboolean
-+gtk_knob_expose (GtkWidget *widget, GdkEventExpose *event)
-+{
-+    int center_x, center_y;
-+#if GTK_CHECK_VERSION(2, 8, 0)
-+    int l, t, r, b;
-+    cairo_t *cr;
-+#endif /* GTK_CHECK_VERSION(2, 8, 0) */
-+
-+    g_return_val_if_fail(GTK_IS_KNOB(widget), FALSE);
-+    g_return_val_if_fail(event != NULL, FALSE);
-+
-+    /* minimize the clip area to just what we'll actually draw (32x32 at most) */
-+    center_x = widget->allocation.width / 2;
-+    center_y = widget->allocation.height / 2;
-+
-+    if (prefer_cairo) {
-+#if GTK_CHECK_VERSION(2, 8, 0)
-+        if (common.knob_surface == NULL)
-+            gtk_knob_common_initialize(widget);
-+            
-+        if ((center_x - HALF_KNOB_SIZE >= event->area.x + event->area.width)  ||
-+            (center_x + HALF_KNOB_SIZE <= event->area.x)                      ||
-+            (center_y - HALF_KNOB_SIZE >= event->area.y + event->area.height) ||
-+            (center_y + HALF_KNOB_SIZE <= event->area.y)) {
-+            /* clip area is empty */
-+            return FALSE;
-+        }
-+        l = MAX(event->area.x,                      center_x - HALF_KNOB_SIZE);
-+        r = MIN(event->area.x + event->area.width,  center_x + HALF_KNOB_SIZE);
-+        t = MAX(event->area.y,                      center_y - HALF_KNOB_SIZE);
-+        b = MIN(event->area.y + event->area.height, center_y + HALF_KNOB_SIZE);
-+        cr = gdk_cairo_create (widget->window);
-+        cairo_rectangle (cr, l, t, r - l, b - t);
-+        cairo_clip (cr);
-+        cairo_translate(cr, center_x - HALF_KNOB_SIZE, center_y - HALF_KNOB_SIZE);
-+
-+        gtk_knob_paint_cairo(widget, cr);
-+
-+        cairo_destroy (cr);
-+#endif /* GTK_CHECK_VERSION(2, 8, 0) */
-+    } else {
-+        if (common.pixmap == NULL)
-+            gtk_knob_common_initialize(widget);
-+
-+        gtk_knob_paint_xlib(widget, center_x, center_y);
-+    }
-+
-+    return FALSE;
-+}
-+
-+
-+/* forward declarations of XPM data below */
-+static char * knob_xpm[];
-+static char * insensitive_knob_xpm[];
-+
-+static void
-+gtk_knob_common_initialize_xlib(GtkWidget *widget)
-+{
-+    GdkColor color = { 0, 0xffff, 0, 0 };
-+
-+    common.pixmap = gdk_pixmap_create_from_xpm_d(widget->window, &common.mask,
-+                                                 &widget->style->bg[GTK_STATE_NORMAL],
-+                                                 knob_xpm);
-+    common.insensitive_pixmap = gdk_pixmap_create_from_xpm_d(widget->window, &common.mask,
-+                                                 &widget->style->bg[GTK_STATE_NORMAL],
-+                                                 insensitive_knob_xpm);
-+
-+    common.mask_gc = gdk_gc_new(widget->window);
-+    gdk_gc_copy(common.mask_gc, widget->style->bg_gc[GTK_STATE_NORMAL]);
-+    gdk_gc_set_clip_mask(common.mask_gc, common.mask);
-+
-+    common.red_gc = gdk_gc_new(widget->window);
-+    gdk_gc_copy(common.red_gc, widget->style->bg_gc[GTK_STATE_NORMAL]);
-+    gdk_colormap_alloc_color(gtk_widget_get_colormap (widget), &color, FALSE, TRUE);
-+    gdk_gc_set_foreground(common.red_gc, &color);
-+}
-+
-+static void
-+gtk_knob_common_finalize_xlib(void)
-+{
-+    if (common.pixmap) {
-+        gdk_pixmap_unref(common.pixmap);
-+        common.pixmap = NULL;
-+    }
-+    if (common.insensitive_pixmap) {
-+        gdk_pixmap_unref(common.insensitive_pixmap);
-+        common.insensitive_pixmap = NULL;
-+    }
-+    if (common.mask) {
-+        gdk_bitmap_unref(common.mask);
-+        common.mask = NULL;
-+    }
-+    if (common.mask_gc) {
-+        gdk_gc_unref(common.mask_gc);
-+        common.mask_gc = NULL;
-+    }
-+    if (common.red_gc) {
-+        gdk_gc_unref(common.red_gc);
-+        common.red_gc = NULL;
-+    }
-+}
-+
-+#if GTK_CHECK_VERSION(2, 8, 0)
-+
- /* forward declarations of PNG data below */
- static size_t        knob_c_png_length;
- static unsigned char knob_c_png[];
-@@ -604,14 +809,11 @@ cairo_read_func(void *closure, unsigned
- }
- 
- static void
--gtk_knob_common_initialize(void)
-+gtk_knob_common_initialize_cairo(void)
- {
-     struct cairo_read_func_closure cl;
-     cairo_pattern_t *pat;
- 
--    if (common.initialized)
--        return;
--
-     /* create knob surfaces */
-     cl.length = knob_c_png_length;
-     cl.offset = 0;
-@@ -629,115 +831,358 @@ gtk_knob_common_initialize(void)
-     cairo_pattern_add_color_stop_rgba (pat, 0.90, 0, 0, 0, 0.1);
-     cairo_pattern_add_color_stop_rgba (pat, 1.00, 0, 0, 0, 0);
-     common.shadow_pattern = pat;
--    
--    common.initialized = TRUE;
- }
- 
- static void
--gtk_knob_common_finalize(void)
-+gtk_knob_common_finalize_cairo(void)
- {
--    if (!common.initialized)
--        return;
--
--    cairo_surface_destroy (common.knob_surface);
--    cairo_surface_destroy (common.insensitive_knob_surface);
--    cairo_pattern_destroy (common.shadow_pattern);
--    
--    common.initialized = FALSE;
-+    if (common.knob_surface) {
-+        cairo_surface_destroy (common.knob_surface);
-+        common.knob_surface = NULL;
-+    }
-+    if (common.insensitive_knob_surface) {
-+        cairo_surface_destroy (common.insensitive_knob_surface);
-+        common.insensitive_knob_surface = NULL;
-+    }
-+    if (common.shadow_pattern) {
-+        cairo_pattern_destroy (common.shadow_pattern);
-+        common.shadow_pattern = NULL;
-+    }
- }
- 
--static void
--gtk_knob_paint(GtkWidget *widget, cairo_t *cr)
--{
--    GtkKnob *knob = GTK_KNOB(widget);
--    gfloat value, range;
-+#endif  /* GTK_CHECK_VERSION(2, 8, 0) */
- 
--    if (GTK_WIDGET_IS_SENSITIVE (widget)) {
- 
--        range = knob->adjustment->upper - knob->adjustment->lower;
--        if (fabs(range) < 1e-37) {
--            value = 0.0;
--        } else {
--            value = MAX(MIN(knob->adjustment->value, knob->adjustment->upper),
--                        knob->adjustment->lower);
--            value = value - knob->adjustment->lower;
--            value /= range;  /* now scaled 0.0 to 1.0 */
--        }
--
--        /* draw the red arc */
--        cairo_set_source_rgb (cr, 1.0, 0, 0);
--        cairo_move_to (cr, HALF_KNOB_SIZE, HALF_KNOB_SIZE);
--        cairo_arc (cr, HALF_KNOB_SIZE, HALF_KNOB_SIZE, (KNOB_SIZE * 0.47),
--                   M_PI * 0.75, M_PI * 0.75 + value * (1.5 * M_PI));
--        cairo_close_path (cr);
--        cairo_fill (cr);
--
--        /* draw the knob shadow */
--        cairo_set_source (cr, common.shadow_pattern);
--        cairo_paint (cr);
--
--        /* paint the knob and reference points over what we have so far */
--        cairo_set_source_surface (cr, common.knob_surface, 0, 0);
--        cairo_paint (cr);
--
--        /* add cursor to knob */
--        cairo_translate (cr, HALF_KNOB_SIZE, HALF_KNOB_SIZE);
--        cairo_rotate (cr, M_PI * 0.75 + value * (1.5 * M_PI));
--        cairo_set_line_width (cr, KNOB_SIZE / 32.0 * 1.5);
--        cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
--        cairo_move_to (cr, KNOB_SIZE * 0.06, 0);
--        cairo_line_to (cr, KNOB_SIZE * 0.30, 0);
--        cairo_stroke (cr);
--
--    } else {  /* insensitive */
--        cairo_set_source_surface (cr, common.insensitive_knob_surface, 0, 0);
--        cairo_paint (cr);
-+static void
-+gtk_knob_common_initialize(GtkWidget *widget)
-+{
-+#if GTK_CHECK_VERSION(2, 8, 0)
-+    if (prefer_cairo) {
-+        gtk_knob_common_initialize_cairo();
-+        gtk_knob_common_finalize_xlib();
-+    } else {
-+        gtk_knob_common_initialize_xlib(widget);
-+        gtk_knob_common_finalize_cairo();
-     }
-+#else /* GTK_CHECK_VERSION(2, 8, 0) */
-+    gtk_knob_common_initialize_xlib(widget);
-+#endif /* GTK_CHECK_VERSION(2, 8, 0) */
- }
- 
--static size_t        knob_c_png_length = 1018;
--static unsigned char knob_c_png[1018] =
-+static void
-+gtk_knob_common_finalize(void)
-+{
-+    gtk_knob_common_finalize_xlib();
-+#if GTK_CHECK_VERSION(2, 8, 0)
-+    gtk_knob_common_finalize_cairo();
-+#endif /* GTK_CHECK_VERSION(2, 8, 0) */
-+}
-+
-+
-+static char * knob_xpm[] = {
-+"32 32 106 2",
-+"  	c None",
-+". 	c #FCFCFD",
-+"+ 	c #0A0A20",
-+"@ 	c #6B6B9E",
-+"# 	c #8989B3",
-+"$ 	c #66669A",
-+"% 	c #AEAECC",
-+"& 	c #AAAACA",
-+"* 	c #A6A6C7",
-+"= 	c #9C9CC0",
-+"- 	c #9494BB",
-+"; 	c #8E8EB7",
-+"> 	c #8C8CB6",
-+", 	c #7F7FAD",
-+"' 	c #A0A0C3",
-+") 	c #B5B5D1",
-+"! 	c #B0B0CE",
-+"~ 	c #8181AE",
-+"{ 	c #7C7CAA",
-+"] 	c #7575A5",
-+"^ 	c #595991",
-+"/ 	c #9696BC",
-+"( 	c #8383AF",
-+"_ 	c #7A7AA9",
-+": 	c #7171A3",
-+"< 	c #7070A2",
-+"[ 	c #626298",
-+"} 	c #42427E",
-+"| 	c #9292BA",
-+"1 	c #6E6EA0",
-+"2 	c #616197",
-+"3 	c #5F5F95",
-+"4 	c #585890",
-+"5 	c #464682",
-+"6 	c #2E2E6D",
-+"7 	c #9A9ABF",
-+"8 	c #69699D",
-+"9 	c #5B5B92",
-+"0 	c #4C4C86",
-+"a 	c #363674",
-+"b 	c #222262",
-+"c 	c #5E5E94",
-+"d 	c #52528B",
-+"e 	c #3F3F7C",
-+"f 	c #282868",
-+"g 	c #A2A2C4",
-+"h 	c #43437F",
-+"i 	c #2D2D6C",
-+"j 	c #1F1F5E",
-+"k 	c #333371",
-+"l 	c #202060",
-+"m 	c #30306F",
-+"n 	c #1D1D58",
-+"o 	c #53538C",
-+"p 	c #454581",
-+"q 	c #1C1C54",
-+"r 	c #19194C",
-+"s 	c #50508A",
-+"t 	c #3B3B79",
-+"u 	c #232363",
-+"v 	c #181848",
-+"w 	c #15153F",
-+"x 	c #4A4A85",
-+"y 	c #353573",
-+"z 	c #1C1C56",
-+"A 	c #14143E",
-+"B 	c #121237",
-+"C 	c #2F2F6E",
-+"D 	c #121236",
-+"E 	c #7777A7",
-+"F 	c #292969",
-+"G 	c #161642",
-+"H 	c #0E0E2C",
-+"I 	c #13133A",
-+"J 	c #0C0C26",
-+"K 	c #393977",
-+"L 	c #0E0E2B",
-+"M 	c #4F4F89",
-+"N 	c #161644",
-+"O 	c #0A0A1F",
-+"P 	c #474783",
-+"Q 	c #41417D",
-+"R 	c #3E3E7B",
-+"S 	c #54548D",
-+"T 	c #171747",
-+"U 	c #0A0A1E",
-+"V 	c #080819",
-+"W 	c #1E1E5A",
-+"X 	c #0F0F2D",
-+"Y 	c #09091C",
-+"Z 	c #070717",
-+"` 	c #2B2B6A",
-+" .	c #343472",
-+"..	c #252565",
-+"+.	c #19194B",
-+"@.	c #0D0D29",
-+"#.	c #070715",
-+"$.	c #1A1A4F",
-+"%.	c #101032",
-+"&.	c #0D0D28",
-+"*.	c #0F0F2F",
-+"=.	c #101030",
-+"-.	c #0B0B22",
-+";.	c #09091B",
-+">.	c #060614",
-+",.	c #060612",
-+"                                                                ",
-+"                              + +                               ",
-+"                              + +                               ",
-+"                                                                ",
-+"                            @ # # $                             ",
-+"                      % & * = - ; > # # ,                       ",
-+"                  ' ) ! & = ; # ~ , { { ] @ ^                   ",
-+"                % ) ) * / ( _ : < @ @ @ @ [ ^ }                 ",
-+"              & ) ) * | { 1 $ 2 2 3 3 3 3 3 4 5 6               ",
-+"            7 ) ) & | _ 8 3 3 3 3 3 3 3 3 3 9 0 a b             ",
-+"            & % * | { $ 3 3 3 3 3 3 3 3 3 3 c d e f             ",
-+"          ' & g | { $ 3 3 3 3 3 3 3 3 3 3 3 3 4 h i j           ",
-+"          * * / , @ 3 3 3 3 3 3 3 3 3 3 3 3 3 9 0 k l           ",
-+"          g ' > ] 2 3 3 3 3 3 3 3 3 3 3 3 3 3 ^ 0 m n           ",
-+"        1 ' = ( 1 3 3 3 3 3 3 3 3 3 3 3 3 3 9 o p i q r         ",
-+"        > = / , @ 3 3 3 3 3 3 3 3 3 3 3 3 c ^ s t u v w         ",
-+"        # 7 ; { $ 3 3 3 3 3 3 3 3 3 3 3 3 9 4 x y z A B         ",
-+"        3 > ( ] 2 3 3 3 3 3 3 3 3 3 3 3 3 ^ d 5 C r D B         ",
-+"          E E @ 3 3 3 3 3 3 3 3 3 3 3 3 9 4 s e F G H           ",
-+"          [ [ 3 c c 3 3 3 3 3 3 3 3 3 3 9 d 5 a j I J           ",
-+"          c ^ o o 9 9 3 3 3 3 c 9 9 9 ^ d 5 K u G L +           ",
-+"            s x x s 4 9 3 3 c 9 4 o s M x a u N H O             ",
-+"            P Q R h M S 9 9 ^ o M P h e k b T L U V             ",
-+"              K k a t h 0 M 0 x h K m f W G X Y Z               ",
-+"                ` i ` i 6 k  .m ` ..n +.B @.Y #.                ",
-+"          + +     l q r +.v $.$.v w %.&.U Z #.    + +           ",
-+"          + +         B *.=.=.=. at .-.;.>.,.        + +           ",
-+"                            %.J O J                             ",
-+"                                                                ",
-+"                                                                ",
-+"                                                                ",
-+"                                                                "};
-+
-+static char * insensitive_knob_xpm[] = {
-+"32 32 82 1",
-+" 	c None",
-+".	c #777777",
-+"+	c #B8B8B8",
-+"@	c #C7C7C7",
-+"#	c #B5B5B5",
-+"$	c #D9D9D9",
-+"%	c #D7D7D7",
-+"&	c #D5D5D5",
-+"*	c #D0D0D0",
-+"=	c #CCCCCC",
-+"-	c #CACACA",
-+";	c #C8C8C8",
-+">	c #C2C2C2",
-+",	c #D2D2D2",
-+"'	c #DCDCDC",
-+")	c #DADADA",
-+"!	c #C3C3C3",
-+"~	c #C0C0C0",
-+"{	c #BDBDBD",
-+"]	c #AFAFAF",
-+"^	c #CDCDCD",
-+"/	c #C4C4C4",
-+"(	c #BBBBBB",
-+"_	c #BABABA",
-+":	c #B3B3B3",
-+"<	c #A3A3A3",
-+"[	c #CBCBCB",
-+"}	c #B9B9B9",
-+"|	c #B2B2B2",
-+"1	c #AEAEAE",
-+"2	c #A5A5A5",
-+"3	c #989898",
-+"4	c #CFCFCF",
-+"5	c #B7B7B7",
-+"6	c #B0B0B0",
-+"7	c #A8A8A8",
-+"8	c #9C9C9C",
-+"9	c #919191",
-+"0	c #B1B1B1",
-+"a	c #ABABAB",
-+"b	c #A1A1A1",
-+"c	c #959595",
-+"d	c #D3D3D3",
-+"e	c #8F8F8F",
-+"f	c #9A9A9A",
-+"g	c #909090",
-+"h	c #999999",
-+"i	c #8D8D8D",
-+"j	c #ACACAC",
-+"k	c #A4A4A4",
-+"l	c #8B8B8B",
-+"m	c #888888",
-+"n	c #AAAAAA",
-+"o	c #9F9F9F",
-+"p	c #929292",
-+"q	c #878787",
-+"r	c #838383",
-+"s	c #A7A7A7",
-+"t	c #8C8C8C",
-+"u	c #808080",
-+"v	c #BEBEBE",
-+"w	c #848484",
-+"x	c #7C7C7C",
-+"y	c #818181",
-+"z	c #797979",
-+"A	c #9E9E9E",
-+"B	c #858585",
-+"C	c #A2A2A2",
-+"D	c #868686",
-+"E	c #767676",
-+"F	c #757575",
-+"G	c #8E8E8E",
-+"H	c #737373",
-+"I	c #969696",
-+"J	c #9B9B9B",
-+"K	c #939393",
-+"L	c #7A7A7A",
-+"M	c #8A8A8A",
-+"N	c #7E7E7E",
-+"O	c #7D7D7D",
-+"P	c #787878",
-+"Q	c #727272",
-+"                                ",
-+"               ..               ",
-+"               ..               ",
-+"                                ",
-+"              +@@#              ",
-+"           $%&*=-;@@>           ",
-+"         ,')%*-@!>~~{+]         ",
-+"        $''&^/~(_++++:]<        ",
-+"       %''&[~}#::|||||123       ",
-+"      4''%[~5|||||||||6789      ",
-+"      %$&[~#||||||||||0abc      ",
-+"     ,%d[~#||||||||||||1<3e     ",
-+"     &&^>+|||||||||||||67fg     ",
-+"     d,;{:|||||||||||||]7hi     ",
-+"    },*/}|||||||||||||6jk3lm    ",
-+"    ;*^>+||||||||||||0]nopqr    ",
-+"    @4-~#||||||||||||61s8tru    ",
-+"    |;/{:||||||||||||]a2hmuu    ",
-+"     vv+||||||||||||61nbcwx     ",
-+"     ::|00||||||||||6a28eyz     ",
-+"     0]jj66||||0666]a2Apwx.     ",
-+"      nssn16||061jnns8pBx.      ",
-+"      2Cb<nj66]jn2<bf9DxEF      ",
-+"       Af8o<7n7s<AhcGwxEH       ",
-+"        I3I33fJhIKimuLEH        ",
-+"     ..  glmmqMMqrNLEHH  ..     ",
-+"     ..    uOOOOLPFQQ    ..     ",
-+"              Nz.z              ",
-+"                                ",
-+"                                ",
-+"                                ",
-+"                                "};
-+
-+#if GTK_CHECK_VERSION(2, 8, 0)
-+
-+static size_t        knob_c_png_length = 1082;
-+static unsigned char knob_c_png[1082] =
-   "\211PNG\15\12\32\12\0\0\0\15IHDR\0\0\0\40\0\0\0\40\10\6\0\0\0szz\364"
--  "\0\0\0\1sRGB\0\256\316\34\351\0\0\3\264IDATX\303\355\226=o\33G\20\206"
--  "\337;\362\370\5\27\376\3\2l\3\252\\P\255\33\265\6\201TA\212\224\1\235"
--  "*M:\247O~B`\40\205\341V\277\200`g\300.RK*\2434\1l\230\242\216\342\361"
--  ">vwvggS\34I\310\222\22\221tR\4\361\0[\355\307<;\363\316\354\2\377q\13"
--  "\313\261\263\305\370\277[\264\313\246\243\243_\207J\331\201\326\274o"
--  "\255\203H8\23\221\361\363\347_\274\372\327\0F\243\323C\";f\226\36\263"
--  "\207R\4c\34\254e\210\4x\357\1\0JY\225\246\363\301\213\27\337\276\375"
--  "\307\0F\243\343c\40\352;\347a-#\317\25\362\\\3039\2061\356#\0\"\7\245"
--  "\10\227\227\305\311\321\321\367\7\237\14""0\32\235\254U\276X(dY\205\331"
--  "\254\200\326\26Z[\204\20\340\34\177\264\247\236#\234\237\317\360\372"
--  "\365\217\321\316\0\327\235\247i\201\3514C\236+\30c\341\\}k\21\271\261"
--  "\227\310\341\3622\307dr\201\323\323\237\243\255\313\260\16{mUEH\323\2"
--  "\223\311\34\263Y\201\305\242\2\221\203\210\334\352\34\0\32\215\30\255"
--  "V\23\235N\33\217\36\15\217\267\2\30\215N\17\253\312\366\211\34\26\13"
--  "\205\311$\303t\232!M\27P\312l$\332\32\40A\267\333A\253\325\352\77|\370"
--  "\354pc\200,\253\306\0P\226f\35\366\3514\3\221\333\274\274\242\10\255"
--  "V\202f\263\201$iB\304\2157\6\210\"\364\230=\312\322`6+0\237\227[9\277"
--  "\32\205n\267\215V+A\24\305\275\215\0^\276|3d\256\313M)\13\245\14\224"
--  "\242\235\272\234H\255a\357\5\336\33\354\355}=\274\23\40\212\302@$\200"
--  "\331CkZ\213m[\253/\341@\344\340\275G\10\14\346rp}]\363\306\363\26\260"
--  "\277\212\0\263\300\373\355\235\207\20\226\315I\226\21\324`.\341\275\336"
--  "\277\23`\25:cj\362\353Mf\23\363^\20B\200\265\16\326Z\20\25`V\20\241\273"
--  "5\220e\352,\3175\252\312\200\310\255\233\315\266\271\267\326\255\323"
--  "\340\275\202\210\1\200\263;#\220\246\213q\10\370\252~Xh\353\3743\373"
--  "u\12\210\354\32\200Y!\4\2147j\305\303\341/\241\16e}\330\252\2567\5\320"
--  "\232P\226\32Y\226\343\374|\212\262\374\35D)\312\362\267h#\15""0\263r"
--  "\316\367\254\255k\277\323i\325\213\233\215\33b\273*\322\325\255\313R"
--  "\243(*\314fsh\375\16\316-\40b\325m\276\376\12`\240\265}\263\2\360^n@"
--  "\254\234{/p\216\327\302s\216\221e9f\2639\212\342\17\30""3\5s\11\221x"
--  "\260\325k\370\364\351O\307\326\332\276\367\202$i\342\336\275\36\222\244"
--  "\211v;\271!4c,\230\31u\367\2540\237/PU\357\241\365;0\27\10\301\235h\375"
--  "\341`\353\347\370\311\223\37\202\265\26\215F\3I\222\240\323i\241\333"
--  "m\243\321h\300{\277\16\271R\6Z\33\30CP*\2071\23\20]\300\3329D\34\210"
--  "\316\243\235\77$\217\37\177\27\3428\206\210\40\216cDQ\204$i\"\212\"0"
--  "{8\347`\255\2031\5\230\13\20\245p.\7s\1\21\2\321\305N\37\222pu\376\301"
--  "\203o\216\231\313\276\367\6@@\10\36q\334^\246\202\340\275\206s\5\274"
--  "W\313A\0\344\204\350\342\340\266\363\266\6\0\200\275\275/\17\253\352"
--  "\375\330{\323\273Z\222\336\23Dh\11B\0D\305q{`\314\207\267\177w\336'}"
--  "\313\357\337\357\17\201\346\200\271\330\27!0\227g!\304c\347.^\341\263"
--  "}\266-\355O\3\341\3\357[\342\211\34\0\0\0\0IEND\256B`\202";
-+  "\0\0\0\1sRGB\0\256\316\34\351\0\0\0\6bKGD\0\377\0\377\0\377\240\275\247"
-+  "\223\0\0\3\342IDATX\303\355VM\213\34U\24=\357\325Gw'0\321\4\304\30w\371"
-+  "\15a\\d\231a6\1]E\30W\16\10.t'\"nD\307\215\333\254$\213\350&\270\226"
-+  "\20\2\223E>6\306e\230\14\202\211`23NwM\367t}\276z_\367=\27\325\335d\222"
-+  "\350twt!\346 at AQE\335{\352\336s\356}\300\177\34~t\315\15\216\377;\330"
-+  "<\37\335\272\365\313\345$\311\227\262L\236\320\332\40\216\303\301\261"
-+  "c\235\33\27.,\256\376k\4n\336|\360q\232\346\27\215!XK\20BAJ\3\255-\234"
-+  "\363\40\"\0 at U)xO\77\257\255\275\373\326\77F`}\375\2760\206:\306\20\264"
-+  "\266\310s\201<\257a\214\205\224\346\0\1\245\14\352ZCk[\\\272\364\301"
-+  "\302\13\23\270v\355\336D\345Y&\220\246\25\6\203\2u\255Q\327\32\336{\30"
-+  "c\17|#\245\206\326\2044-p\365\352gln\2O'\357\367\13$I\212<\27\220R\303"
-+  "\230\346\257\235s\7\2032\6\"\207\252R\350\367S\334\271\263\306f\266\341"
-+  "\372\372}1\276o\2\25\350v\207\30\14\12dY\5\245\14\234s\317$\37#\14\3"
-+  "\264Z\21:\235\26\226\227\277\334\236\211\300\355\333\17>MS\321Q\312\40"
-+  "\313\4\272\335\24I\222\242\337\317\40\204\234J\264A\20\240\325\212q\344"
-+  "H\7E\241N\235\77\377\325\367S\23\330\331\31|\3\0e)'eO\222\24J\231\351"
-+  "\355\305\200(\12\21\206\1\242(D\257\227\255\314\320\2\17k\11e)1\30\24"
-+  "\30\16\313\231\222\3\36\336{p\316\320\351\304\210\343\10D>\232\212\300"
-+  "\365\353\33\227\255m\354&\204\206\20\22B\250\331\26\204\307\310\232\16"
-+  "\336\3D\4\"\211s\347>\371\361\31\255<\375\240(\304\222sM\5\352ZM\304"
-+  "6+\32\201\2J\351\21\21\13k\353\327\16%\40\245=1\256\200\265\16Dn\276"
-+  "\31\3170\262\242\204\20""5\254-\261\277\257\337<\224@\303\336CJ\3\"z"
-+  "f\310\314\322\6\"\202R\32J\25""0\246\6c\366p\15(e\6y^\243\252$\2242\223"
-+  "a3\17\234s\320\332\200H\200H\0""0\371\241\4\30\303\215\275\275\14e\331"
-+  "\210o\236\3763\326LCk\233\12Z[\203\250F\247\23<\234j\24\257\256~\353"
-+  "\1L\26\3148\250\367\323$g\340\234\3039\217~\77\303\366\366.\312\3627"
-+  "(\325\307\326\326]6\225\6\232\3367k\227s\216v;\236\370\332\373\306\343"
-+  "\1779Z9\7c\14E!\220$\373\250\353\77`L\6\316\235\231z\20\2359s\372\243"
-+  "q\377\211\34\254u\10\202\0\214q\4A\0\316\331s\313>~\227\246%vv\22d\331"
-+  "\357\220\262\7kK,,DWf\332\206++\27\207E!^a\214#\212B\34=\332A\20p\204"
-+  "!\7\21M*\301\30\3cM(k\35\322\264D\2577@\226m\241\256\267`m\2010\364\335"
-+  "G\217\356\235\234y\35//\177\355\211\10a\30\"\212\"\264Z\21\332\355h\264"
-+  "n\351\200\320\2242\250*\211<\37\242\252v\241T\2\255\207pNc8\34\276\241"
-+  "Tow\256\3\311\331\263\237\373\40\10\340\234\7\347M\307\342\270\221N\223"
-+  "\2749\226)U\302\332\22R\356\301\230\34\326\26pN\242\333\375u\256\3\211"
-+  "\177\362\375\322\322\27\333\275\336\356)\"9\32""2\26\234\267F^W\260\266"
-+  "\2061\305\304\357D\22q\34\364\36\77\336|\375y\361f&\320T\342\303\357"
-+  "\372\375\235\367\244,#\306\330\23\216Qp\256\271\210$\30200\307\217\277"
-+  "zec\343\247\367\377.\336\13\35\313\27\27\337\371\241,\325i!\206'\235"
-+  "S\10C\226\267\333\361\303\315\315\273o\343%^bF\374\11\251\215\305RV\321"
-+  "\250V\0\0\0\0IEND\256B`\202";
- 
- static size_t        knob_i_png_length = 819;
- static unsigned char knob_i_png[819] =
-@@ -774,3 +1219,5 @@ static unsigned char knob_i_png[819] =
-   "Xk\373\253%\263\4\360t}}\375\200\237\370\211\216\361\33\353\274\40}\314"
-   "\227E/\0\0\0\0IEND\256B`\202";
- 
-+#endif /* GTK_CHECK_VERSION(2, 8, 0) */
-+
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 70922de..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-debian-changes-20100326-1

-- 
ghostess packaging



More information about the pkg-multimedia-commits mailing list