[SCM] mediatomb/master: Update patches that are to be applied, resolve changes from new upstream source.

ceros-guest at users.alioth.debian.org ceros-guest at users.alioth.debian.org
Sun Sep 12 05:04:19 UTC 2010


The following commit has been merged in the master branch:
commit b3a59bdbc411f1582d779432c2e788601c1e5f27
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Sep 11 23:21:11 2010 -0400

    Update patches that are to be applied, resolve changes from new upstream source.

diff --git a/debian/patches/autoreconf_-fi.patch b/debian/patches/autoreconf_-fi.patch
index fb27cd7..9a1e73f 100644
--- a/debian/patches/autoreconf_-fi.patch
+++ b/debian/patches/autoreconf_-fi.patch
@@ -1,7404 +1,151 @@
 Patch that applies changes after `autoreconf -fi` is done.
 ==========================================================================
---- a/INSTALL
-+++ b/INSTALL
-@@ -2,18 +2,24 @@
- *************************
- 
- Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
--2006 Free Software Foundation, Inc.
-+2006, 2007, 2008, 2009 Free Software Foundation, Inc.
- 
--This file is free documentation; the Free Software Foundation gives
--unlimited permission to copy, distribute and modify it.
-+   Copying and distribution of this file, with or without modification,
-+are permitted in any medium without royalty provided the copyright
-+notice and this notice are preserved.  This file is offered as-is,
-+without warranty of any kind.
- 
- Basic Installation
- ==================
- 
--Briefly, the shell commands `./configure; make; make install' should
-+   Briefly, the shell commands `./configure; make; make install' should
- configure, build, and install this package.  The following
- more-detailed instructions are generic; see the `README' file for
--instructions specific to this package.
-+instructions specific to this package.  Some packages provide this
-+`INSTALL' file but do not implement all of the features documented
-+below.  The lack of an optional feature in a given package is not
-+necessarily a bug.  More recommendations for GNU packages can be found
-+in *note Makefile Conventions: (standards)Makefile Conventions.
- 
-    The `configure' shell script attempts to guess correct values for
- various system-dependent variables used during compilation.  It uses
-@@ -42,7 +48,7 @@
- you want to change it or regenerate `configure' using a newer version
- of `autoconf'.
- 
--The simplest way to compile this package is:
-+   The simplest way to compile this package is:
- 
-   1. `cd' to the directory containing the package's source code and type
-      `./configure' to configure the package for your system.
-@@ -53,12 +59,22 @@
-   2. Type `make' to compile the package.
- 
-   3. Optionally, type `make check' to run any self-tests that come with
--     the package.
-+     the package, generally using the just-built uninstalled binaries.
- 
-   4. Type `make install' to install the programs and any data files and
--     documentation.
-+     documentation.  When installing into a prefix owned by root, it is
-+     recommended that the package be configured and built as a regular
-+     user, and only the `make install' phase executed with root
-+     privileges.
-+
-+  5. Optionally, type `make installcheck' to repeat any self-tests, but
-+     this time using the binaries in their final installed location.
-+     This target does not install anything.  Running this target as a
-+     regular user, particularly if the prior `make install' required
-+     root privileges, verifies that the installation completed
-+     correctly.
- 
--  5. You can remove the program binaries and object files from the
-+  6. You can remove the program binaries and object files from the
-      source code directory by typing `make clean'.  To also remove the
-      files that `configure' created (so you can compile the package for
-      a different kind of computer), type `make distclean'.  There is
-@@ -67,12 +83,22 @@
-      all sorts of other programs in order to regenerate files that came
-      with the distribution.
- 
-+  7. Often, you can also type `make uninstall' to remove the installed
-+     files again.  In practice, not all packages have tested that
-+     uninstallation works correctly, even though it is required by the
-+     GNU Coding Standards.
-+
-+  8. Some packages, particularly those that use Automake, provide `make
-+     distcheck', which can by used by developers to test that all other
-+     targets like `make install' and `make uninstall' work correctly.
-+     This target is generally not run by end users.
-+
- Compilers and Options
- =====================
- 
--Some systems require unusual options for compilation or linking that the
--`configure' script does not know about.  Run `./configure --help' for
--details on some of the pertinent environment variables.
-+   Some systems require unusual options for compilation or linking that
-+the `configure' script does not know about.  Run `./configure --help'
-+for details on some of the pertinent environment variables.
- 
-    You can give `configure' initial values for configuration parameters
- by setting variables in the command line or in the environment.  Here
-@@ -85,25 +111,41 @@
- Compiling For Multiple Architectures
- ====================================
- 
--You can compile the package for more than one kind of computer at the
-+   You can compile the package for more than one kind of computer at the
- same time, by placing the object files for each architecture in their
- own directory.  To do this, you can use GNU `make'.  `cd' to the
- directory where you want the object files and executables to go and run
- the `configure' script.  `configure' automatically checks for the
--source code in the directory that `configure' is in and in `..'.
-+source code in the directory that `configure' is in and in `..'.  This
-+is known as a "VPATH" build.
- 
-    With a non-GNU `make', it is safer to compile the package for one
- architecture at a time in the source code directory.  After you have
- installed the package for one architecture, use `make distclean' before
- reconfiguring for another architecture.
- 
-+   On MacOS X 10.5 and later systems, you can create libraries and
-+executables that work on multiple system types--known as "fat" or
-+"universal" binaries--by specifying multiple `-arch' options to the
-+compiler but only a single `-arch' option to the preprocessor.  Like
-+this:
-+
-+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
-+                 CPP="gcc -E" CXXCPP="g++ -E"
-+
-+   This is not guaranteed to produce working output in all cases, you
-+may have to build one architecture at a time and combine the results
-+using the `lipo' tool if you have problems.
-+
- Installation Names
- ==================
- 
--By default, `make install' installs the package's commands under
-+   By default, `make install' installs the package's commands under
- `/usr/local/bin', include files under `/usr/local/include', etc.  You
- can specify an installation prefix other than `/usr/local' by giving
--`configure' the option `--prefix=PREFIX'.
-+`configure' the option `--prefix=PREFIX', where PREFIX must be an
-+absolute file name.
- 
-    You can specify separate installation prefixes for
- architecture-specific files and architecture-independent files.  If you
-@@ -114,16 +156,47 @@
-    In addition, if you use an unusual directory layout you can give
- options like `--bindir=DIR' to specify different values for particular
- kinds of files.  Run `configure --help' for a list of the directories
--you can set and what kinds of files go in them.
-+you can set and what kinds of files go in them.  In general, the
-+default for these options is expressed in terms of `${prefix}', so that
-+specifying just `--prefix' will affect all of the other directory
-+specifications that were not explicitly provided.
-+
-+   The most portable way to affect installation locations is to pass the
-+correct locations to `configure'; however, many packages provide one or
-+both of the following shortcuts of passing variable assignments to the
-+`make install' command line to change installation locations without
-+having to reconfigure or recompile.
-+
-+   The first method involves providing an override variable for each
-+affected directory.  For example, `make install
-+prefix=/alternate/directory' will choose an alternate location for all
-+directory configuration variables that were expressed in terms of
-+`${prefix}'.  Any directories that were specified during `configure',
-+but not in terms of `${prefix}', must each be overridden at install
-+time for the entire installation to be relocated.  The approach of
-+makefile variable overrides for each directory variable is required by
-+the GNU Coding Standards, and ideally causes no recompilation.
-+However, some platforms have known limitations with the semantics of
-+shared libraries that end up requiring recompilation when using this
-+method, particularly noticeable in packages that use GNU Libtool.
-+
-+   The second method involves providing the `DESTDIR' variable.  For
-+example, `make install DESTDIR=/alternate/directory' will prepend
-+`/alternate/directory' before all installation names.  The approach of
-+`DESTDIR' overrides is not required by the GNU Coding Standards, and
-+does not work on platforms that have drive letters.  On the other hand,
-+it does better at avoiding recompilation issues, and works well even
-+when some directory options were not specified in terms of `${prefix}'
-+at `configure' time.
-+
-+Optional Features
-+=================
- 
-    If the package supports it, you can cause programs to be installed
- with an extra prefix or suffix on their names by giving `configure' the
- option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
- 
--Optional Features
--=================
--
--Some packages pay attention to `--enable-FEATURE' options to
-+   Some packages pay attention to `--enable-FEATURE' options to
- `configure', where FEATURE indicates an optional part of the package.
- They may also pay attention to `--with-PACKAGE' options, where PACKAGE
- is something like `gnu-as' or `x' (for the X Window System).  The
-@@ -135,14 +208,53 @@
- you can use the `configure' options `--x-includes=DIR' and
- `--x-libraries=DIR' to specify their locations.
- 
-+   Some packages offer the ability to configure how verbose the
-+execution of `make' will be.  For these packages, running `./configure
-+--enable-silent-rules' sets the default to minimal output, which can be
-+overridden with `make V=1'; while running `./configure
-+--disable-silent-rules' sets the default to verbose, which can be
-+overridden with `make V=0'.
-+
-+Particular systems
-+==================
-+
-+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
-+CC is not installed, it is recommended to use the following options in
-+order to use an ANSI C compiler:
-+
-+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
-+
-+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-+
-+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
-+a workaround.  If GNU CC is not installed, it is therefore recommended
-+to try
-+
-+     ./configure CC="cc"
-+
-+and if that doesn't work, try
-+
-+     ./configure CC="cc -nodtk"
-+
-+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
-+directory contains several dysfunctional programs; working variants of
-+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
-+in your `PATH', put it _after_ `/usr/bin'.
-+
-+   On Haiku, software installed for all users goes in `/boot/common',
-+not `/usr/local'.  It is recommended to use the following options:
-+
-+     ./configure --prefix=/boot/common
-+
- Specifying the System Type
- ==========================
- 
--There may be some features `configure' cannot figure out automatically,
--but needs to determine by the type of machine the package will run on.
--Usually, assuming the package is built to be run on the _same_
--architectures, `configure' can figure that out, but if it prints a
--message saying it cannot guess the machine type, give it the
-+   There may be some features `configure' cannot figure out
-+automatically, but needs to determine by the type of machine the package
-+will run on.  Usually, assuming the package is built to be run on the
-+_same_ architectures, `configure' can figure that out, but if it prints
-+a message saying it cannot guess the machine type, give it the
- `--build=TYPE' option.  TYPE can either be a short name for the system
- type, such as `sun4', or a canonical name which has the form:
- 
-@@ -150,7 +262,8 @@
- 
- where SYSTEM can have one of these forms:
- 
--     OS KERNEL-OS
-+     OS
-+     KERNEL-OS
- 
-    See the file `config.sub' for the possible values of each field.  If
- `config.sub' isn't included in this package, then this package doesn't
-@@ -168,9 +281,9 @@
- Sharing Defaults
- ================
- 
--If you want to set default values for `configure' scripts to share, you
--can create a site shell script called `config.site' that gives default
--values for variables like `CC', `cache_file', and `prefix'.
-+   If you want to set default values for `configure' scripts to share,
-+you can create a site shell script called `config.site' that gives
-+default values for variables like `CC', `cache_file', and `prefix'.
- `configure' looks for `PREFIX/share/config.site' if it exists, then
- `PREFIX/etc/config.site' if it exists.  Or, you can set the
- `CONFIG_SITE' environment variable to the location of the site script.
-@@ -179,7 +292,7 @@
- Defining Variables
- ==================
- 
--Variables not defined in a site shell script can be set in the
-+   Variables not defined in a site shell script can be set in the
- environment passed to `configure'.  However, some packages may run
- configure again during the build, and the customized values of these
- variables may be lost.  In order to avoid this problem, you should set
-@@ -198,11 +311,19 @@
- `configure' Invocation
- ======================
- 
--`configure' recognizes the following options to control how it operates.
-+   `configure' recognizes the following options to control how it
-+operates.
- 
- `--help'
- `-h'
--     Print a summary of the options to `configure', and exit.
-+     Print a summary of all of the options to `configure', and exit.
-+
-+`--help=short'
-+`--help=recursive'
-+     Print a summary of the options unique to this package's
-+     `configure', and exit.  The `short' variant lists options used
-+     only in the top level, while the `recursive' variant lists options
-+     also present in any nested packages.
- 
- `--version'
- `-V'
-@@ -229,6 +350,16 @@
-      Look for the package's source code in directory DIR.  Usually
-      `configure' can determine that directory automatically.
- 
-+`--prefix=DIR'
-+     Use DIR as the installation prefix.  *note Installation Names::
-+     for more details, including other options available for fine-tuning
-+     the installation locations.
-+
-+`--no-create'
-+`-n'
-+     Run the configure checks, but stop before creating any output
-+     files.
-+
- `configure' also accepts some other, not widely useful, options.  Run
- `configure --help' for more details.
- 
---- /dev/null
+diff --git a/Makefile.in b/Makefile.in
+index 2d88d17..726b6df 100644
+--- a/Makefile.in
 +++ b/Makefile.in
-@@ -0,0 +1,865 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = .
-+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in $(srcdir)/autoconfig.h.in \
-+	$(srcdir)/mediatomb.spec.in $(top_srcdir)/configure \
-+	$(top_srcdir)/tombupnp/upnp/inc/upnpconfig.h.in AUTHORS \
-+	COPYING ChangeLog INSTALL NEWS TODO configure_aux/compile \
-+	configure_aux/config.guess configure_aux/config.sub \
-+	configure_aux/depcomp configure_aux/install-sh \
-+	configure_aux/missing
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-+ configure.lineno config.status.lineno
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = autoconfig.h \
-+	$(top_builddir)/tombupnp/upnp/inc/upnpconfig.h
-+CONFIG_CLEAN_FILES = mediatomb.spec
-+CONFIG_CLEAN_VPATH_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
-+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+	distdir dist dist-all distcheck
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+distdir = $(PACKAGE)-$(VERSION)
-+top_distdir = $(distdir)
-+am__remove_distdir = \
-+  { test ! -d "$(distdir)" \
-+    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-+         && rm -fr "$(distdir)"; }; }
-+am__relativize = \
-+  dir0=`pwd`; \
-+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-+  sed_rest='s,^[^/]*/*,,'; \
-+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-+  sed_butlast='s,/*[^/]*$$,,'; \
-+  while test -n "$$dir1"; do \
-+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+    if test "$$first" != "."; then \
-+      if test "$$first" = ".."; then \
-+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+      else \
-+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+        if test "$$first2" = "$$first"; then \
-+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+        else \
-+          dir2="../$$dir2"; \
-+        fi; \
-+        dir0="$$dir0"/"$$first"; \
-+      fi; \
-+    fi; \
-+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+  done; \
-+  reldir="$$dir2"
-+DIST_ARCHIVES = $(distdir).tar.gz
-+GZIP_ENV = --best
-+distuninstallcheck_listfiles = find . -type f -print
-+distcleancheck_listfiles = find . -type f -print
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMTAR = @AMTAR@
-+ATOMIC_OPTION_ENABLED = @ATOMIC_OPTION_ENABLED@
-+ATOMIC_OPTION_REQUESTED = @ATOMIC_OPTION_REQUESTED@
-+ATOMIC_X86_SINGLE_OPTION_ENABLED = @ATOMIC_X86_SINGLE_OPTION_ENABLED@
-+ATOMIC_X86_SINGLE_OPTION_REQUESTED = @ATOMIC_X86_SINGLE_OPTION_REQUESTED@
-+ATRAILERS_OPTION_ENABLED = @ATRAILERS_OPTION_ENABLED@
-+ATRAILERS_OPTION_REQUESTED = @ATRAILERS_OPTION_REQUESTED@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@
-+AVFORMAT_LDFLAGS = @AVFORMAT_LDFLAGS@
-+AVFORMAT_LIBS = @AVFORMAT_LIBS@
-+AVFORMAT_STATUS = @AVFORMAT_STATUS@
-+AVUTIL_LDFLAGS = @AVUTIL_LDFLAGS@
-+AVUTIL_LIBS = @AVUTIL_LIBS@
-+AVUTIL_STATUS = @AVUTIL_STATUS@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
-+DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-+DEBUG_LOG_OPTION_ENABLED = @DEBUG_LOG_OPTION_ENABLED@
-+DEBUG_LOG_OPTION_REQUESTED = @DEBUG_LOG_OPTION_REQUESTED@
-+DEBUG_MALLOC0_OPTION_ENABLED = @DEBUG_MALLOC0_OPTION_ENABLED@
-+DEBUG_MALLOC0_OPTION_REQUESTED = @DEBUG_MALLOC0_OPTION_REQUESTED@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+EXPAT_CFLAGS = @EXPAT_CFLAGS@
-+EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
-+EXPAT_LIBS = @EXPAT_LIBS@
-+EXPAT_STATUS = @EXPAT_STATUS@
-+EXTERNAL_TRANSCODING_OPTION_ENABLED = @EXTERNAL_TRANSCODING_OPTION_ENABLED@
-+EXTERNAL_TRANSCODING_OPTION_REQUESTED = @EXTERNAL_TRANSCODING_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_CFLAGS = @FFMPEGTHUMBNAILER_CFLAGS@
-+FFMPEGTHUMBNAILER_LDFLAGS = @FFMPEGTHUMBNAILER_LDFLAGS@
-+FFMPEGTHUMBNAILER_LIBS = @FFMPEGTHUMBNAILER_LIBS@
-+FFMPEGTHUMBNAILER_OPTION_ENABLED = @FFMPEGTHUMBNAILER_OPTION_ENABLED@
-+FFMPEGTHUMBNAILER_OPTION_REQUESTED = @FFMPEGTHUMBNAILER_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_STATUS = @FFMPEGTHUMBNAILER_STATUS@
-+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@
-+FFMPEG_LIBS = @FFMPEG_LIBS@
-+FFMPEG_OPTION_ENABLED = @FFMPEG_OPTION_ENABLED@
-+FFMPEG_OPTION_REQUESTED = @FFMPEG_OPTION_REQUESTED@
-+FSEEKO_CHECK_OPTION_ENABLED = @FSEEKO_CHECK_OPTION_ENABLED@
-+FSEEKO_CHECK_OPTION_REQUESTED = @FSEEKO_CHECK_OPTION_REQUESTED@
-+GREP = @GREP@
-+ICONV_CXXFLAGS = @ICONV_CXXFLAGS@
-+ICONV_LIBS = @ICONV_LIBS@
-+ICONV_LIB_OPTION_ENABLED = @ICONV_LIB_OPTION_ENABLED@
-+ICONV_LIB_OPTION_REQUESTED = @ICONV_LIB_OPTION_REQUESTED@
-+ID3LIB_CFLAGS = @ID3LIB_CFLAGS@
-+ID3LIB_LDFLAGS = @ID3LIB_LDFLAGS@
-+ID3LIB_LIBS = @ID3LIB_LIBS@
-+ID3LIB_OPTION_ENABLED = @ID3LIB_OPTION_ENABLED@
-+ID3LIB_OPTION_REQUESTED = @ID3LIB_OPTION_REQUESTED@
-+ID3LIB_STATUS = @ID3LIB_STATUS@
-+ID3LIB_VERSION = @ID3LIB_VERSION@
-+INOTIFY_CFLAGS = @INOTIFY_CFLAGS@
-+INOTIFY_OPTION_ENABLED = @INOTIFY_OPTION_ENABLED@
-+INOTIFY_OPTION_REQUESTED = @INOTIFY_OPTION_REQUESTED@
-+INOTIFY_STATUS = @INOTIFY_STATUS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JS_CXXFLAGS = @JS_CXXFLAGS@
-+JS_LIBS = @JS_LIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBDVDNAV_CFLAGS = @LIBDVDNAV_CFLAGS@
-+LIBDVDNAV_LIBS = @LIBDVDNAV_LIBS@
-+LIBDVDNAV_OPTION_ENABLED = @LIBDVDNAV_OPTION_ENABLED@
-+LIBDVDNAV_OPTION_REQUESTED = @LIBDVDNAV_OPTION_REQUESTED@
-+LIBDVDNAV_STATUS = @LIBDVDNAV_STATUS@
-+LIBDVDNAV_VERSION = @LIBDVDNAV_VERSION@
-+LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-+LIBEXIF_LDFLAGS = @LIBEXIF_LDFLAGS@
-+LIBEXIF_LIBS = @LIBEXIF_LIBS@
-+LIBEXIF_OPTION_ENABLED = @LIBEXIF_OPTION_ENABLED@
-+LIBEXIF_OPTION_REQUESTED = @LIBEXIF_OPTION_REQUESTED@
-+LIBEXIF_STATUS = @LIBEXIF_STATUS@
-+LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@
-+LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@
-+LIBEXTRACTOR_OPTION_ENABLED = @LIBEXTRACTOR_OPTION_ENABLED@
-+LIBEXTRACTOR_OPTION_REQUESTED = @LIBEXTRACTOR_OPTION_REQUESTED@
-+LIBEXTRACTOR_STATUS = @LIBEXTRACTOR_STATUS@
-+LIBEXTRACTOR_VERSION = @LIBEXTRACTOR_VERSION@
-+LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@
-+LIBMAGIC_LDFLAGS = @LIBMAGIC_LDFLAGS@
-+LIBMAGIC_LIBS = @LIBMAGIC_LIBS@
-+LIBMAGIC_OPTION_ENABLED = @LIBMAGIC_OPTION_ENABLED@
-+LIBMAGIC_OPTION_REQUESTED = @LIBMAGIC_OPTION_REQUESTED@
-+LIBMAGIC_STATUS = @LIBMAGIC_STATUS@
-+LIBMAGIC_VERSION = @LIBMAGIC_VERSION@
-+LIBMP4V2_CFLAGS = @LIBMP4V2_CFLAGS@
-+LIBMP4V2_LDFLAGS = @LIBMP4V2_LDFLAGS@
-+LIBMP4V2_LIBS = @LIBMP4V2_LIBS@
-+LIBMP4V2_OPTION_ENABLED = @LIBMP4V2_OPTION_ENABLED@
-+LIBMP4V2_OPTION_REQUESTED = @LIBMP4V2_OPTION_REQUESTED@
-+LIBMP4V2_STATUS = @LIBMP4V2_STATUS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LOG_OPTION_ENABLED = @LOG_OPTION_ENABLED@
-+LOG_OPTION_REQUESTED = @LOG_OPTION_REQUESTED@
-+LTLIBOBJS = @LTLIBOBJS@
-+LWRES_LIBS = @LWRES_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+MRREG_SERVICE_OPTION_ENABLED = @MRREG_SERVICE_OPTION_ENABLED@
-+MRREG_SERVICE_OPTION_REQUESTED = @MRREG_SERVICE_OPTION_REQUESTED@
-+MT_SEARCHPATH = @MT_SEARCHPATH@
-+MT_SEARCHPATH_HEADERS = @MT_SEARCHPATH_HEADERS@
-+MT_SEARCHPATH_LIBS = @MT_SEARCHPATH_LIBS@
-+MT_SEARCHPATH_PROGS = @MT_SEARCHPATH_PROGS@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+MYSQL_OPTION_ENABLED = @MYSQL_OPTION_ENABLED@
-+MYSQL_OPTION_REQUESTED = @MYSQL_OPTION_REQUESTED@
-+MYSQL_STATUS = @MYSQL_STATUS@
-+MYSQL_VERSION = @MYSQL_VERSION@
-+NSL_LIBS = @NSL_LIBS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+@@ -251,6 +251,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@
-+POW_LIB = @POW_LIB@
-+PROTOCOLINFO_EXTENSION_OPTION_ENABLED = @PROTOCOLINFO_EXTENSION_OPTION_ENABLED@
-+PROTOCOLINFO_EXTENSION_OPTION_REQUESTED = @PROTOCOLINFO_EXTENSION_OPTION_REQUESTED@
-+PTHREAD_CC = @PTHREAD_CC@
-+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-+PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
-+PTHREAD_LIBS = @PTHREAD_LIBS@
-+PTHREAD_LIB_OPTION_ENABLED = @PTHREAD_LIB_OPTION_ENABLED@
-+PTHREAD_LIB_OPTION_REQUESTED = @PTHREAD_LIB_OPTION_REQUESTED@
-+PTHREAD_STATUS = @PTHREAD_STATUS@
-+RANLIB = @RANLIB@
-+RT_LDFLAGS = @RT_LDFLAGS@
-+RT_LIBS = @RT_LIBS@
-+RT_STATUS = @RT_STATUS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SOPCAST_OPTION_ENABLED = @SOPCAST_OPTION_ENABLED@
-+SOPCAST_OPTION_REQUESTED = @SOPCAST_OPTION_REQUESTED@
-+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
-+SQLITE3_LDFLAGS = @SQLITE3_LDFLAGS@
-+SQLITE3_LIBS = @SQLITE3_LIBS@
-+SQLITE3_OPTION_ENABLED = @SQLITE3_OPTION_ENABLED@
-+SQLITE3_OPTION_REQUESTED = @SQLITE3_OPTION_REQUESTED@
-+SQLITE3_STATUS = @SQLITE3_STATUS@
-+SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED = @SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED@
-+SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED = @SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED@
-+STATIC_OPTION_ENABLED = @STATIC_OPTION_ENABLED@
-+STATIC_OPTION_REQUESTED = @STATIC_OPTION_REQUESTED@
-+STRIP = @STRIP@
-+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
-+TAGLIB_LIBS = @TAGLIB_LIBS@
-+TAGLIB_OPTION_ENABLED = @TAGLIB_OPTION_ENABLED@
-+TAGLIB_OPTION_REQUESTED = @TAGLIB_OPTION_REQUESTED@
-+TAGLIB_STATUS = @TAGLIB_STATUS@
-+TAGLIB_VERSION = @TAGLIB_VERSION@
-+TOMBDEBUG_OPTION_ENABLED = @TOMBDEBUG_OPTION_ENABLED@
-+TOMBDEBUG_OPTION_REQUESTED = @TOMBDEBUG_OPTION_REQUESTED@
-+UPNPDEBUG_OPTION_ENABLED = @UPNPDEBUG_OPTION_ENABLED@
-+UPNPDEBUG_OPTION_REQUESTED = @UPNPDEBUG_OPTION_REQUESTED@
-+VERSION = @VERSION@
-+WEBORAMA_OPTION_ENABLED = @WEBORAMA_OPTION_ENABLED@
-+WEBORAMA_OPTION_REQUESTED = @WEBORAMA_OPTION_REQUESTED@
-+YOUTUBE_OPTION_ENABLED = @YOUTUBE_OPTION_ENABLED@
-+YOUTUBE_OPTION_REQUESTED = @YOUTUBE_OPTION_REQUESTED@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+ZLIB_OPTION_ENABLED = @ZLIB_OPTION_ENABLED@
-+ZLIB_OPTION_REQUESTED = @ZLIB_OPTION_REQUESTED@
-+ZLIB_STATUS = @ZLIB_STATUS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+acx_pthread_config = @acx_pthread_config@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+curlconfig = @curlconfig@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+mt_libdvdnav_config = @mt_libdvdnav_config@
-+mt_mysql_config = @mt_mysql_config@
-+mt_taglib_config = @mt_taglib_config@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+SUBDIRS = tombupnp build scripts web config doc artwork
-+EXTRA_DIST = mediatomb.spec README.UTF_8
-+all: autoconfig.h
-+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-+
-+.SUFFIXES:
-+am--refresh:
-+	@:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    echo ' $(SHELL) ./config.status'; \
-+	    $(SHELL) ./config.status;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	$(SHELL) ./config.status --recheck
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	$(am__cd) $(srcdir) && $(AUTOCONF)
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-+$(am__aclocal_m4_deps):
-+
-+autoconfig.h: stamp-h1
-+	@if test ! -f $@; then \
-+	  rm -f stamp-h1; \
-+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-+	else :; fi
-+
-+stamp-h1: $(srcdir)/autoconfig.h.in $(top_builddir)/config.status
-+	@rm -f stamp-h1
-+	cd $(top_builddir) && $(SHELL) ./config.status autoconfig.h
-+$(srcdir)/autoconfig.h.in:  $(am__configure_deps) 
-+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
-+	rm -f stamp-h1
-+	touch $@
-+
-+tombupnp/upnp/inc/upnpconfig.h: tombupnp/upnp/inc/stamp-h2
-+	@if test ! -f $@; then \
-+	  rm -f tombupnp/upnp/inc/stamp-h2; \
-+	  $(MAKE) $(AM_MAKEFLAGS) tombupnp/upnp/inc/stamp-h2; \
-+	else :; fi
-+
-+tombupnp/upnp/inc/stamp-h2: $(top_srcdir)/tombupnp/upnp/inc/upnpconfig.h.in $(top_builddir)/config.status
-+	@rm -f tombupnp/upnp/inc/stamp-h2
-+	cd $(top_builddir) && $(SHELL) ./config.status tombupnp/upnp/inc/upnpconfig.h
-+
-+distclean-hdr:
-+	-rm -f autoconfig.h stamp-h1 tombupnp/upnp/inc/upnpconfig.h tombupnp/upnp/inc/stamp-h2
-+mediatomb.spec: $(top_builddir)/config.status $(srcdir)/mediatomb.spec.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $@
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+$(RECURSIVE_CLEAN_TARGETS):
-+	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES) autoconfig.h.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	set x; \
-+	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS) autoconfig.h.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	shift; \
-+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  if test $$# -gt 0; then \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      "$$@" $$unique; \
-+	  else \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      $$unique; \
-+	  fi; \
-+	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) autoconfig.h.in $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	list='$(SOURCES) $(HEADERS) autoconfig.h.in $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	test -z "$(CTAGS_ARGS)$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && $(am__cd) $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) "$$here"
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	$(am__remove_distdir)
-+	test -d "$(distdir)" || mkdir "$(distdir)"
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-+	    $(am__relativize); \
-+	    new_distdir=$$reldir; \
-+	    dir1=$$subdir; dir2="$(top_distdir)"; \
-+	    $(am__relativize); \
-+	    new_top_distdir=$$reldir; \
-+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-+	    ($(am__cd) $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$new_top_distdir" \
-+	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
-+		am__skip_mode_fix=: \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+	-test -n "$(am__skip_mode_fix)" \
-+	|| 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 {} {} \; \
-+	|| chmod -R a+r "$(distdir)"
-+dist-gzip: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
-+
-+dist-bzip2: distdir
-+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-+	$(am__remove_distdir)
-+
-+dist-lzma: distdir
-+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-+	$(am__remove_distdir)
-+
-+dist-xz: distdir
-+	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
-+	$(am__remove_distdir)
-+
-+dist-tarZ: distdir
-+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-+	$(am__remove_distdir)
-+
-+dist-shar: distdir
-+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-+	$(am__remove_distdir)
-+
-+dist-zip: distdir
-+	-rm -f $(distdir).zip
-+	zip -rq $(distdir).zip $(distdir)
-+	$(am__remove_distdir)
-+
-+dist dist-all: distdir
-+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-+	$(am__remove_distdir)
-+
-+# This target untars the dist file and tries a VPATH configuration.  Then
-+# it guarantees that the distribution is self-contained by making another
-+# tarfile.
-+distcheck: dist
-+	case '$(DIST_ARCHIVES)' in \
-+	*.tar.gz*) \
-+	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
-+	*.tar.bz2*) \
-+	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
-+	*.tar.lzma*) \
-+	  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) gzip -dc $(distdir).shar.gz | unshar ;;\
-+	*.zip*) \
-+	  unzip $(distdir).zip ;;\
-+	esac
-+	chmod -R a-w $(distdir); chmod a+w $(distdir)
-+	mkdir $(distdir)/_build
-+	mkdir $(distdir)/_inst
-+	chmod a-w $(distdir)
-+	test -d $(distdir)/_build || exit 0; \
-+	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-+	  && am__cwd=`pwd` \
-+	  && $(am__cd) $(distdir)/_build \
-+	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-+	    $(DISTCHECK_CONFIGURE_FLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-+	  && $(MAKE) $(AM_MAKEFLAGS) check \
-+	  && $(MAKE) $(AM_MAKEFLAGS) install \
-+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-+	        distuninstallcheck \
-+	  && chmod -R a-w "$$dc_install_base" \
-+	  && ({ \
-+	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-+	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-+	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-+	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-+	  && rm -rf "$$dc_destdir" \
-+	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-+	  && rm -rf $(DIST_ARCHIVES) \
-+	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
-+	  && cd "$$am__cwd" \
-+	  || exit 1
-+	$(am__remove_distdir)
-+	@(echo "$(distdir) archives ready for distribution: "; \
-+	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-+distuninstallcheck:
-+	@$(am__cd) '$(distuninstallcheck_dir)' \
-+	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-+	   || { echo "ERROR: files left after uninstall:" ; \
-+	        if test -n "$(DESTDIR)"; then \
-+	          echo "  (check DESTDIR support)"; \
-+	        fi ; \
-+	        $(distuninstallcheck_listfiles) ; \
-+	        exit 1; } >&2
-+distcleancheck: distclean
-+	@if test '$(srcdir)' = . ; then \
-+	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-+	  exit 1 ; \
-+	fi
-+	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-+	  || { echo "ERROR: files left in build directory after distclean:" ; \
-+	       $(distcleancheck_listfiles) ; \
-+	       exit 1; } >&2
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile autoconfig.h
-+installdirs: installdirs-recursive
-+installdirs-am:
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-hdr distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+html: html-recursive
-+
-+html-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-recursive
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-recursive
-+
-+install-html-am:
-+
-+install-info: install-info-recursive
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-recursive
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-recursive
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-+	-rm -rf $(top_srcdir)/autom4te.cache
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am:
-+
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
-+	ctags-recursive install-am install-strip tags-recursive
-+
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am am--refresh check check-am clean clean-generic \
-+	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-+	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
-+	distclean distclean-generic distclean-hdr distclean-tags \
-+	distcleancheck distdir distuninstallcheck dvi dvi-am html \
-+	html-am info info-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 pdf \
-+	pdf-am ps ps-am tags tags-recursive uninstall uninstall-am
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- /dev/null
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POW_LIB = @POW_LIB@
+diff --git a/aclocal.m4 b/aclocal.m4
+index 6bd5e3c..4721d28 100644
+--- a/aclocal.m4
 +++ b/aclocal.m4
-@@ -0,0 +1,999 @@
-+# 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.
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+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'.])])
-+
-+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_AUTOMAKE_VERSION(VERSION)
-+# ----------------------------
-+# Automake X.Y traces this macro to ensure aclocal.m4 has been
-+# generated from the m4 files accompanying Automake X.Y.
-+# (This private macro should not be called outside this file.)
-+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.1], [],
-+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
-+])
-+
-+# _AM_AUTOCONF_VERSION(VERSION)
-+# -----------------------------
-+# aclocal traces this macro to find the Autoconf version.
-+# This is a private macro too.  Using m4_define simplifies
-+# the logic in aclocal, which can simply ignore this definition.
-+m4_define([_AM_AUTOCONF_VERSION], [])
-+
-+# AM_SET_CURRENT_AUTOMAKE_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.1])dnl
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
-+
-+# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-+#
-+# Of course, Automake must honor this variable whenever it calls a
-+# tool from the auxiliary directory.  The problem is that $srcdir (and
-+# therefore $ac_aux_dir as well) can be either absolute or relative,
-+# depending on how configure is run.  This is pretty annoying, since
-+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-+# source directory, any form will work fine, but in subdirectories a
-+# relative path needs to be adjusted first.
-+#
-+# $ac_aux_dir/missing
-+#    fails when called from a subdirectory if $ac_aux_dir is relative
-+# $top_srcdir/$ac_aux_dir/missing
-+#    fails if $ac_aux_dir is absolute,
-+#    fails when called from a subdirectory in a VPATH build with
-+#          a relative $ac_aux_dir
-+#
-+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-+# are both prefixed by $srcdir.  In an in-source build this is usually
-+# harmless because $srcdir is `.', but things will broke when you
-+# start a VPATH build or use an absolute $srcdir.
-+#
-+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-+# and then we would define $MISSING as
-+#   MISSING="\${SHELL} $am_aux_dir/missing"
-+# This will work as long as MISSING is not called from configure, because
-+# unfortunately $(top_srcdir) has no meaning in configure.
-+# However there are other variables, like CC, which are often used in
-+# configure, and could therefore not use this "fixed" $ac_aux_dir.
-+#
-+# Another solution, used here, is to always expand $ac_aux_dir to an
-+# absolute PATH.  The drawback is that using absolute paths prevent a
-+# configured tree to be moved without reconfiguration.
-+
-+AC_DEFUN([AM_AUX_DIR_EXPAND],
-+[dnl Rely on autoconf to set up CDPATH properly.
-+AC_PREREQ([2.50])dnl
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+])
-+
-+# AM_CONDITIONAL                                            -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 9
-+
-+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-+# -------------------------------------
-+# Define a conditional.
-+AC_DEFUN([AM_CONDITIONAL],
-+[AC_PREREQ(2.52)dnl
-+ ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-+	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-+AC_SUBST([$1_TRUE])dnl
-+AC_SUBST([$1_FALSE])dnl
-+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
-+m4_define([_AM_COND_VALUE_$1], [$2])dnl
-+if $2; then
-+  $1_TRUE=
-+  $1_FALSE='#'
-+else
-+  $1_TRUE='#'
-+  $1_FALSE=
-+fi
-+AC_CONFIG_COMMANDS_PRE(
-+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-+  AC_MSG_ERROR([[conditional "$1" was never defined.
-+Usually this means the macro was only invoked conditionally.]])
-+fi])])
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 10
-+
-+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-+# written in clear, in which case automake, when reading aclocal.m4,
-+# will think it sees a *use*, and therefore will trigger all it's
-+# C support machinery.  Also note that it means that autoscan, seeing
-+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-+
-+
-+# _AM_DEPENDENCIES(NAME)
-+# ----------------------
-+# See how the compiler implements dependency checking.
-+# NAME is "CC", "CXX", "GCJ", or "OBJC".
-+# We try a few techniques and use that to set a single cache variable.
-+#
-+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-+# dependency, and given that the user is not expected to run this macro,
-+# just rely on AC_PROG_CC.
-+AC_DEFUN([_AM_DEPENDENCIES],
-+[AC_REQUIRE([AM_SET_DEPDIR])dnl
-+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-+AC_REQUIRE([AM_DEP_TRACK])dnl
-+
-+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
-+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-+                   [depcc="$$1"   am_compiler_list=])
-+
-+AC_CACHE_CHECK([dependency style of $depcc],
-+               [am_cv_$1_dependencies_compiler_type],
-+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_$1_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-+  fi
-+  am__universal=false
-+  m4_case([$1], [CC],
-+    [case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac],
-+    [CXX],
-+    [case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac])
-+
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_$1_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_$1_dependencies_compiler_type=none
-+fi
-+])
-+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-+AM_CONDITIONAL([am__fastdep$1], [
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-+])
-+
-+
-+# AM_SET_DEPDIR
-+# -------------
-+# Choose a directory name for dependency files.
-+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-+AC_DEFUN([AM_SET_DEPDIR],
-+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-+])
-+
-+
-+# AM_DEP_TRACK
-+# ------------
-+AC_DEFUN([AM_DEP_TRACK],
-+[AC_ARG_ENABLE(dependency-tracking,
-+[  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors])
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-+AC_SUBST([AMDEPBACKSLASH])dnl
-+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
-+])
-+
-+# Generate code to set up dependency tracking.              -*- Autoconf -*-
-+
-+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+#serial 5
-+
-+# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+# ------------------------------
-+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[{
-+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+  # are listed without --file.  Let's play safe and only enable the eval
-+  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
-+  shift
-+  for mf
-+  do
-+    # Strip MF so we end up with the name of the file.
-+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-+    # Check whether this is an Automake generated Makefile or not.
-+    # We used to match only the files named `Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
-+    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`AS_DIRNAME("$mf")`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running `make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # When using ansi2knr, U may be empty or an underscore; expand it
-+    U=`sed -n 's/^U = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`AS_DIRNAME(["$file"])`
-+      AS_MKDIR_P([$dirpart/$fdir])
-+      # echo "creating $dirpart/$file"
-+      echo '# dummy' > "$dirpart/$file"
-+    done
-+  done
-+}
-+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-+
-+
-+# AM_OUTPUT_DEPENDENCY_COMMANDS
-+# -----------------------------
-+# This macro should only be invoked once -- use via AC_REQUIRE.
-+#
-+# This code is only required when automatic dependency tracking
-+# is enabled.  FIXME.  This creates each `.P' file that we will
-+# need in order to bootstrap the dependency handling code.
-+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-+[AC_CONFIG_COMMANDS([depfiles],
-+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-+])
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 8
-+
-+# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-+AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
-+
-+# Do all the work for Automake.                             -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 16
-+
-+# This macro actually does too much.  Some checks are only needed if
-+# your package does certain things.  But this isn't really a big deal.
-+
-+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-+# AM_INIT_AUTOMAKE([OPTIONS])
-+# -----------------------------------------------
-+# The call with PACKAGE and VERSION arguments is the old style
-+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-+# and VERSION should now be passed to AC_INIT and removed from
-+# the call to AM_INIT_AUTOMAKE.
-+# We support both call styles for the transition.  After
-+# the next Automake release, Autoconf can make the AC_INIT
-+# arguments mandatory, and then we can depend on a new Autoconf
-+# release and drop the old call support.
-+AC_DEFUN([AM_INIT_AUTOMAKE],
-+[AC_PREREQ([2.62])dnl
-+dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-+dnl the ones we care about.
-+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-+AC_REQUIRE([AC_PROG_INSTALL])dnl
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-+  fi
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+AC_SUBST([CYGPATH_W])
-+
-+# Define the identity of the package.
-+dnl Distinguish between old-style and new-style calls.
-+m4_ifval([$2],
-+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
-+ AC_SUBST([PACKAGE], [$1])dnl
-+ AC_SUBST([VERSION], [$2])],
-+[_AM_SET_OPTIONS([$1])dnl
-+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
-+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
-+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
-+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
-+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-+
-+_AM_IF_OPTION([no-define],,
-+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-+
-+# Some tools Automake needs.
-+AC_REQUIRE([AM_SANITY_CHECK])dnl
-+AC_REQUIRE([AC_ARG_PROGRAM])dnl
-+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-+AM_MISSING_PROG(AUTOCONF, autoconf)
-+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-+AM_MISSING_PROG(AUTOHEADER, autoheader)
-+AM_MISSING_PROG(MAKEINFO, makeinfo)
-+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
-+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+AC_REQUIRE([AC_PROG_AWK])dnl
-+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-+	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-+			     [_AM_PROG_TAR([v7])])])
-+_AM_IF_OPTION([no-dependencies],,
-+[AC_PROVIDE_IFELSE([AC_PROG_CC],
-+		  [_AM_DEPENDENCIES(CC)],
-+		  [define([AC_PROG_CC],
-+			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_CXX],
-+		  [_AM_DEPENDENCIES(CXX)],
-+		  [define([AC_PROG_CXX],
-+			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
-+		  [_AM_DEPENDENCIES(OBJC)],
-+		  [define([AC_PROG_OBJC],
-+			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
-+])
-+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
-+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
-+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
-+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
-+AC_CONFIG_COMMANDS_PRE(dnl
-+[m4_provide_if([_AM_COMPILER_EXEEXT],
-+  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
-+])
-+
-+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
-+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
-+dnl mangled by Autoconf and run in a shell conditional statement.
-+m4_define([_AC_COMPILER_EXEEXT],
-+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
-+
-+
-+# When config.status generates a header, we must update the stamp-h file.
-+# This file resides in the same directory as the config header
-+# that is generated.  The stamp files are numbered to have different names.
-+
-+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-+# loop where config.status creates the headers, so we can generate
-+# our stamp files there.
-+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-+[# Compute $1's index in $config_headers.
-+_am_arg=$1
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $_am_arg | $_am_arg:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-+
-+# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_SH
-+# ------------------
-+# Define $install_sh.
-+AC_DEFUN([AM_PROG_INSTALL_SH],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+if test x"${install_sh}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+  *)
-+    install_sh="\${SHELL} $am_aux_dir/install-sh"
-+  esac
-+fi
-+AC_SUBST(install_sh)])
-+
-+# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# Check whether the underlying file-system supports filenames
-+# with a leading dot.  For instance MS-DOS doesn't.
-+AC_DEFUN([AM_SET_LEADING_DOT],
-+[rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+AC_SUBST([am__leading_dot])])
-+
-+# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# AM_MAKE_INCLUDE()
-+# -----------------
-+# Check to see how make treats includes.
-+AC_DEFUN([AM_MAKE_INCLUDE],
-+[am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo this is the am__doit target
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
-+AC_MSG_CHECKING([for style of include used by $am_make])
-+am__include="#"
-+am__quote=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+  am__include=include
-+  am__quote=
-+  _am_result=GNU
-+  ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   case `$am_make -s -f confmf 2> /dev/null` in #(
-+   *the\ am__doit\ target*)
-+     am__include=.include
-+     am__quote="\""
-+     _am_result=BSD
-+     ;;
-+   esac
-+fi
-+AC_SUBST([am__include])
-+AC_SUBST([am__quote])
-+AC_MSG_RESULT([$_am_result])
-+rm -f confinc confmf
-+])
-+
-+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 6
-+
-+# AM_PROG_CC_C_O
-+# --------------
-+# Like AC_PROG_CC_C_O, but changed for automake.
-+AC_DEFUN([AM_PROG_CC_C_O],
-+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
-+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([compile])dnl
-+# FIXME: we rely on the cache variable name because
-+# there is no other way.
-+set dummy $CC
-+am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
-+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-+if test "$am_t" != yes; then
-+   # Losing compiler, so override with the script.
-+   # FIXME: It is wrong to rewrite CC.
-+   # But if we don't then we get into trouble of one sort or another.
-+   # A longer-term fix would be to have automake use am__CC in this case,
-+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+   CC="$am_aux_dir/compile $CC"
-+fi
-+dnl Make sure AC_PROG_CC is never called again, or it will override our
-+dnl setting of CC.
-+m4_define([AC_PROG_CC],
-+          [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
-+])
-+
-+# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-+
-+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 6
-+
-+# AM_MISSING_PROG(NAME, PROGRAM)
-+# ------------------------------
-+AC_DEFUN([AM_MISSING_PROG],
-+[AC_REQUIRE([AM_MISSING_HAS_RUN])
-+$1=${$1-"${am_missing_run}$2"}
-+AC_SUBST($1)])
-+
-+
-+# AM_MISSING_HAS_RUN
-+# ------------------
-+# Define MISSING if not defined so far and test if it supports --run.
-+# If it does, set am_missing_run to use it, otherwise, to nothing.
-+AC_DEFUN([AM_MISSING_HAS_RUN],
-+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-+AC_REQUIRE_AUX_FILE([missing])dnl
-+if test x"${MISSING+set}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+  *)
-+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+  esac
-+fi
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
-+  AC_MSG_WARN([`missing' script is too old or missing])
-+fi
-+])
-+
-+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_MKDIR_P
-+# ---------------
-+# Check for `mkdir -p'.
-+AC_DEFUN([AM_PROG_MKDIR_P],
-+[AC_PREREQ([2.60])dnl
-+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
-+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
-+dnl while keeping a definition of mkdir_p for backward compatibility.
-+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
-+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
-+dnl Makefile.ins that do not define MKDIR_P, so we do our own
-+dnl adjustment using top_builddir (which is defined more often than
-+dnl MKDIR_P).
-+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
-+case $mkdir_p in
-+  [[\\/$]]* | ?:[[\\/]]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+])
-+
-+# Helper functions for option handling.                     -*- Autoconf -*-
-+
-+# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 4
-+
-+# _AM_MANGLE_OPTION(NAME)
-+# -----------------------
-+AC_DEFUN([_AM_MANGLE_OPTION],
-+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-+
-+# _AM_SET_OPTION(NAME)
-+# ------------------------------
-+# Set option NAME.  Presently that only means defining a flag for this option.
-+AC_DEFUN([_AM_SET_OPTION],
-+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-+
-+# _AM_SET_OPTIONS(OPTIONS)
-+# ----------------------------------
-+# OPTIONS is a space-separated list of Automake options.
-+AC_DEFUN([_AM_SET_OPTIONS],
-+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-+
-+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-+# -------------------------------------------
-+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-+AC_DEFUN([_AM_IF_OPTION],
-+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-+
-+# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-+
-+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
-+# Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 5
-+
-+# AM_SANITY_CHECK
-+# ---------------
-+AC_DEFUN([AM_SANITY_CHECK],
-+[AC_MSG_CHECKING([whether build environment is sane])
-+# Just in case
-+sleep 1
-+echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name.  Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+  *[[\\\"\#\$\&\'\`$am_lf]]*)
-+    AC_MSG_ERROR([unsafe absolute working directory name]);;
-+esac
-+case $srcdir in
-+  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
-+    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
-+esac
-+
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+   if test "$[*]" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t "$srcdir/configure" conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$[*]" != "X $srcdir/configure conftest.file" \
-+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-+alias in your environment])
-+   fi
-+
-+   test "$[2]" = conftest.file
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   AC_MSG_ERROR([newly created file is older than distributed files!
-+Check your system clock])
-+fi
-+AC_MSG_RESULT(yes)])
-+
-+# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# AM_PROG_INSTALL_STRIP
-+# ---------------------
-+# One issue with vendor `install' (even GNU) is that you can't
-+# specify the program used to strip binaries.  This is especially
-+# annoying in cross-compiling environments, where the build's strip
-+# is unlikely to handle the host's binaries.
-+# Fortunately install-sh will honor a STRIPPROG variable, so we
-+# always use install-sh in `make install-strip', and initialize
-+# STRIPPROG with the value of the STRIP variable (set by the user).
-+AC_DEFUN([AM_PROG_INSTALL_STRIP],
-+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-+if test "$cross_compiling" != no; then
-+  AC_CHECK_TOOL([STRIP], [strip], :)
-+fi
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+AC_SUBST([INSTALL_STRIP_PROGRAM])])
-+
-+# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-+# This macro is traced by Automake.
-+AC_DEFUN([_AM_SUBST_NOTMAKE])
-+
-+# AM_SUBST_NOTMAKE(VARIABLE)
-+# ---------------------------
-+# Public sister of _AM_SUBST_NOTMAKE.
-+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
-+
-+# Check how to create a tarball.                            -*- Autoconf -*-
-+
-+# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-+#
-+# This file is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# serial 2
-+
-+# _AM_PROG_TAR(FORMAT)
-+# --------------------
-+# Check how to create a tarball in format FORMAT.
-+# FORMAT should be one of `v7', `ustar', or `pax'.
-+#
-+# Substitute a variable $(am__tar) that is a command
-+# writing to stdout a FORMAT-tarball containing the directory
-+# $tardir.
-+#     tardir=directory && $(am__tar) > result.tar
-+#
-+# Substitute a variable $(am__untar) that extract such
-+# a tarball read from stdin.
-+#     $(am__untar) < result.tar
-+AC_DEFUN([_AM_PROG_TAR],
-+[# Always define AMTAR for backward compatibility.
-+AM_MISSING_PROG([AMTAR], [tar])
-+m4_if([$1], [v7],
-+     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-+     [m4_case([$1], [ustar],, [pax],,
-+              [m4_fatal([Unknown tar format])])
-+AC_MSG_CHECKING([how to create a $1 tar archive])
-+# Loop over all known methods to create a tar archive until one works.
-+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-+# Do not fold the above two line into one, because Tru64 sh and
-+# Solaris sh will not grok spaces in the rhs of `-'.
-+for _am_tool in $_am_tools
-+do
-+  case $_am_tool in
-+  gnutar)
-+    for _am_tar in tar gnutar gtar;
-+    do
-+      AM_RUN_LOG([$_am_tar --version]) && break
-+    done
-+    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-+    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-+    am__untar="$_am_tar -xf -"
-+    ;;
-+  plaintar)
-+    # Must skip GNU tar: if it does not support --format= it doesn't create
-+    # ustar tarball either.
-+    (tar --version) >/dev/null 2>&1 && continue
-+    am__tar='tar chf - "$$tardir"'
-+    am__tar_='tar chf - "$tardir"'
-+    am__untar='tar xf -'
-+    ;;
-+  pax)
-+    am__tar='pax -L -x $1 -w "$$tardir"'
-+    am__tar_='pax -L -x $1 -w "$tardir"'
-+    am__untar='pax -r'
-+    ;;
-+  cpio)
-+    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-+    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-+    am__untar='cpio -i -H $1 -d'
-+    ;;
-+  none)
-+    am__tar=false
-+    am__tar_=false
-+    am__untar=false
-+    ;;
-+  esac
-+
-+  # If the value was cached, stop now.  We just wanted to have am__tar
-+  # and am__untar set.
-+  test -n "${am_cv_prog_tar_$1}" && break
-+
-+  # tar/untar a dummy directory, and stop if the command works
-+  rm -rf conftest.dir
-+  mkdir conftest.dir
-+  echo GrepMe > conftest.dir/file
-+  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-+  rm -rf conftest.dir
-+  if test -s conftest.tar; then
-+    AM_RUN_LOG([$am__untar <conftest.tar])
-+    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-+  fi
-+done
-+rm -rf conftest.dir
-+
-+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-+AC_SUBST([am__tar])
-+AC_SUBST([am__untar])
-+]) # _AM_PROG_TAR
-+
-+m4_include([acinclude.m4])
---- /dev/null
+@@ -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.67],,
++[m4_warning([this file was generated for autoconf 2.67.
+ 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'.])])
+diff --git a/artwork/Makefile.in b/artwork/Makefile.in
+index f85a7c4..2854064 100644
+--- a/artwork/Makefile.in
 +++ b/artwork/Makefile.in
-@@ -0,0 +1,487 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = artwork
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/autoconfig.h \
-+	$(top_builddir)/tombupnp/upnp/inc/upnpconfig.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMTAR = @AMTAR@
-+ATOMIC_OPTION_ENABLED = @ATOMIC_OPTION_ENABLED@
-+ATOMIC_OPTION_REQUESTED = @ATOMIC_OPTION_REQUESTED@
-+ATOMIC_X86_SINGLE_OPTION_ENABLED = @ATOMIC_X86_SINGLE_OPTION_ENABLED@
-+ATOMIC_X86_SINGLE_OPTION_REQUESTED = @ATOMIC_X86_SINGLE_OPTION_REQUESTED@
-+ATRAILERS_OPTION_ENABLED = @ATRAILERS_OPTION_ENABLED@
-+ATRAILERS_OPTION_REQUESTED = @ATRAILERS_OPTION_REQUESTED@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@
-+AVFORMAT_LDFLAGS = @AVFORMAT_LDFLAGS@
-+AVFORMAT_LIBS = @AVFORMAT_LIBS@
-+AVFORMAT_STATUS = @AVFORMAT_STATUS@
-+AVUTIL_LDFLAGS = @AVUTIL_LDFLAGS@
-+AVUTIL_LIBS = @AVUTIL_LIBS@
-+AVUTIL_STATUS = @AVUTIL_STATUS@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
-+DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-+DEBUG_LOG_OPTION_ENABLED = @DEBUG_LOG_OPTION_ENABLED@
-+DEBUG_LOG_OPTION_REQUESTED = @DEBUG_LOG_OPTION_REQUESTED@
-+DEBUG_MALLOC0_OPTION_ENABLED = @DEBUG_MALLOC0_OPTION_ENABLED@
-+DEBUG_MALLOC0_OPTION_REQUESTED = @DEBUG_MALLOC0_OPTION_REQUESTED@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+EXPAT_CFLAGS = @EXPAT_CFLAGS@
-+EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
-+EXPAT_LIBS = @EXPAT_LIBS@
-+EXPAT_STATUS = @EXPAT_STATUS@
-+EXTERNAL_TRANSCODING_OPTION_ENABLED = @EXTERNAL_TRANSCODING_OPTION_ENABLED@
-+EXTERNAL_TRANSCODING_OPTION_REQUESTED = @EXTERNAL_TRANSCODING_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_CFLAGS = @FFMPEGTHUMBNAILER_CFLAGS@
-+FFMPEGTHUMBNAILER_LDFLAGS = @FFMPEGTHUMBNAILER_LDFLAGS@
-+FFMPEGTHUMBNAILER_LIBS = @FFMPEGTHUMBNAILER_LIBS@
-+FFMPEGTHUMBNAILER_OPTION_ENABLED = @FFMPEGTHUMBNAILER_OPTION_ENABLED@
-+FFMPEGTHUMBNAILER_OPTION_REQUESTED = @FFMPEGTHUMBNAILER_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_STATUS = @FFMPEGTHUMBNAILER_STATUS@
-+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@
-+FFMPEG_LIBS = @FFMPEG_LIBS@
-+FFMPEG_OPTION_ENABLED = @FFMPEG_OPTION_ENABLED@
-+FFMPEG_OPTION_REQUESTED = @FFMPEG_OPTION_REQUESTED@
-+FSEEKO_CHECK_OPTION_ENABLED = @FSEEKO_CHECK_OPTION_ENABLED@
-+FSEEKO_CHECK_OPTION_REQUESTED = @FSEEKO_CHECK_OPTION_REQUESTED@
-+GREP = @GREP@
-+ICONV_CXXFLAGS = @ICONV_CXXFLAGS@
-+ICONV_LIBS = @ICONV_LIBS@
-+ICONV_LIB_OPTION_ENABLED = @ICONV_LIB_OPTION_ENABLED@
-+ICONV_LIB_OPTION_REQUESTED = @ICONV_LIB_OPTION_REQUESTED@
-+ID3LIB_CFLAGS = @ID3LIB_CFLAGS@
-+ID3LIB_LDFLAGS = @ID3LIB_LDFLAGS@
-+ID3LIB_LIBS = @ID3LIB_LIBS@
-+ID3LIB_OPTION_ENABLED = @ID3LIB_OPTION_ENABLED@
-+ID3LIB_OPTION_REQUESTED = @ID3LIB_OPTION_REQUESTED@
-+ID3LIB_STATUS = @ID3LIB_STATUS@
-+ID3LIB_VERSION = @ID3LIB_VERSION@
-+INOTIFY_CFLAGS = @INOTIFY_CFLAGS@
-+INOTIFY_OPTION_ENABLED = @INOTIFY_OPTION_ENABLED@
-+INOTIFY_OPTION_REQUESTED = @INOTIFY_OPTION_REQUESTED@
-+INOTIFY_STATUS = @INOTIFY_STATUS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JS_CXXFLAGS = @JS_CXXFLAGS@
-+JS_LIBS = @JS_LIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBDVDNAV_CFLAGS = @LIBDVDNAV_CFLAGS@
-+LIBDVDNAV_LIBS = @LIBDVDNAV_LIBS@
-+LIBDVDNAV_OPTION_ENABLED = @LIBDVDNAV_OPTION_ENABLED@
-+LIBDVDNAV_OPTION_REQUESTED = @LIBDVDNAV_OPTION_REQUESTED@
-+LIBDVDNAV_STATUS = @LIBDVDNAV_STATUS@
-+LIBDVDNAV_VERSION = @LIBDVDNAV_VERSION@
-+LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-+LIBEXIF_LDFLAGS = @LIBEXIF_LDFLAGS@
-+LIBEXIF_LIBS = @LIBEXIF_LIBS@
-+LIBEXIF_OPTION_ENABLED = @LIBEXIF_OPTION_ENABLED@
-+LIBEXIF_OPTION_REQUESTED = @LIBEXIF_OPTION_REQUESTED@
-+LIBEXIF_STATUS = @LIBEXIF_STATUS@
-+LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@
-+LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@
-+LIBEXTRACTOR_OPTION_ENABLED = @LIBEXTRACTOR_OPTION_ENABLED@
-+LIBEXTRACTOR_OPTION_REQUESTED = @LIBEXTRACTOR_OPTION_REQUESTED@
-+LIBEXTRACTOR_STATUS = @LIBEXTRACTOR_STATUS@
-+LIBEXTRACTOR_VERSION = @LIBEXTRACTOR_VERSION@
-+LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@
-+LIBMAGIC_LDFLAGS = @LIBMAGIC_LDFLAGS@
-+LIBMAGIC_LIBS = @LIBMAGIC_LIBS@
-+LIBMAGIC_OPTION_ENABLED = @LIBMAGIC_OPTION_ENABLED@
-+LIBMAGIC_OPTION_REQUESTED = @LIBMAGIC_OPTION_REQUESTED@
-+LIBMAGIC_STATUS = @LIBMAGIC_STATUS@
-+LIBMAGIC_VERSION = @LIBMAGIC_VERSION@
-+LIBMP4V2_CFLAGS = @LIBMP4V2_CFLAGS@
-+LIBMP4V2_LDFLAGS = @LIBMP4V2_LDFLAGS@
-+LIBMP4V2_LIBS = @LIBMP4V2_LIBS@
-+LIBMP4V2_OPTION_ENABLED = @LIBMP4V2_OPTION_ENABLED@
-+LIBMP4V2_OPTION_REQUESTED = @LIBMP4V2_OPTION_REQUESTED@
-+LIBMP4V2_STATUS = @LIBMP4V2_STATUS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LOG_OPTION_ENABLED = @LOG_OPTION_ENABLED@
-+LOG_OPTION_REQUESTED = @LOG_OPTION_REQUESTED@
-+LTLIBOBJS = @LTLIBOBJS@
-+LWRES_LIBS = @LWRES_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+MRREG_SERVICE_OPTION_ENABLED = @MRREG_SERVICE_OPTION_ENABLED@
-+MRREG_SERVICE_OPTION_REQUESTED = @MRREG_SERVICE_OPTION_REQUESTED@
-+MT_SEARCHPATH = @MT_SEARCHPATH@
-+MT_SEARCHPATH_HEADERS = @MT_SEARCHPATH_HEADERS@
-+MT_SEARCHPATH_LIBS = @MT_SEARCHPATH_LIBS@
-+MT_SEARCHPATH_PROGS = @MT_SEARCHPATH_PROGS@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+MYSQL_OPTION_ENABLED = @MYSQL_OPTION_ENABLED@
-+MYSQL_OPTION_REQUESTED = @MYSQL_OPTION_REQUESTED@
-+MYSQL_STATUS = @MYSQL_STATUS@
-+MYSQL_VERSION = @MYSQL_VERSION@
-+NSL_LIBS = @NSL_LIBS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+@@ -192,6 +192,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@
-+POW_LIB = @POW_LIB@
-+PROTOCOLINFO_EXTENSION_OPTION_ENABLED = @PROTOCOLINFO_EXTENSION_OPTION_ENABLED@
-+PROTOCOLINFO_EXTENSION_OPTION_REQUESTED = @PROTOCOLINFO_EXTENSION_OPTION_REQUESTED@
-+PTHREAD_CC = @PTHREAD_CC@
-+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-+PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
-+PTHREAD_LIBS = @PTHREAD_LIBS@
-+PTHREAD_LIB_OPTION_ENABLED = @PTHREAD_LIB_OPTION_ENABLED@
-+PTHREAD_LIB_OPTION_REQUESTED = @PTHREAD_LIB_OPTION_REQUESTED@
-+PTHREAD_STATUS = @PTHREAD_STATUS@
-+RANLIB = @RANLIB@
-+RT_LDFLAGS = @RT_LDFLAGS@
-+RT_LIBS = @RT_LIBS@
-+RT_STATUS = @RT_STATUS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SOPCAST_OPTION_ENABLED = @SOPCAST_OPTION_ENABLED@
-+SOPCAST_OPTION_REQUESTED = @SOPCAST_OPTION_REQUESTED@
-+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
-+SQLITE3_LDFLAGS = @SQLITE3_LDFLAGS@
-+SQLITE3_LIBS = @SQLITE3_LIBS@
-+SQLITE3_OPTION_ENABLED = @SQLITE3_OPTION_ENABLED@
-+SQLITE3_OPTION_REQUESTED = @SQLITE3_OPTION_REQUESTED@
-+SQLITE3_STATUS = @SQLITE3_STATUS@
-+SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED = @SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED@
-+SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED = @SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED@
-+STATIC_OPTION_ENABLED = @STATIC_OPTION_ENABLED@
-+STATIC_OPTION_REQUESTED = @STATIC_OPTION_REQUESTED@
-+STRIP = @STRIP@
-+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
-+TAGLIB_LIBS = @TAGLIB_LIBS@
-+TAGLIB_OPTION_ENABLED = @TAGLIB_OPTION_ENABLED@
-+TAGLIB_OPTION_REQUESTED = @TAGLIB_OPTION_REQUESTED@
-+TAGLIB_STATUS = @TAGLIB_STATUS@
-+TAGLIB_VERSION = @TAGLIB_VERSION@
-+TOMBDEBUG_OPTION_ENABLED = @TOMBDEBUG_OPTION_ENABLED@
-+TOMBDEBUG_OPTION_REQUESTED = @TOMBDEBUG_OPTION_REQUESTED@
-+UPNPDEBUG_OPTION_ENABLED = @UPNPDEBUG_OPTION_ENABLED@
-+UPNPDEBUG_OPTION_REQUESTED = @UPNPDEBUG_OPTION_REQUESTED@
-+VERSION = @VERSION@
-+WEBORAMA_OPTION_ENABLED = @WEBORAMA_OPTION_ENABLED@
-+WEBORAMA_OPTION_REQUESTED = @WEBORAMA_OPTION_REQUESTED@
-+YOUTUBE_OPTION_ENABLED = @YOUTUBE_OPTION_ENABLED@
-+YOUTUBE_OPTION_REQUESTED = @YOUTUBE_OPTION_REQUESTED@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+ZLIB_OPTION_ENABLED = @ZLIB_OPTION_ENABLED@
-+ZLIB_OPTION_REQUESTED = @ZLIB_OPTION_REQUESTED@
-+ZLIB_STATUS = @ZLIB_STATUS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+acx_pthread_config = @acx_pthread_config@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+curlconfig = @curlconfig@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+mt_libdvdnav_config = @mt_libdvdnav_config@
-+mt_mysql_config = @mt_mysql_config@
-+mt_taglib_config = @mt_taglib_config@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+EXTRA_DIST = mediatomb.xpm
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu artwork/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu artwork/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am html html-am info info-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 \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- /dev/null
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POW_LIB = @POW_LIB@
+diff --git a/autoconfig.h.in b/autoconfig.h.in
+index 60154dd..b3171fb 100644
+--- a/autoconfig.h.in
 +++ b/autoconfig.h.in
-@@ -0,0 +1,721 @@
-+/* autoconfig.h.in.  Generated from configure.ac by autoheader.  */
-+
-+/* Define if building universal (internal helper macro) */
-+#undef AC_APPLE_UNIVERSAL_BUILD
-+
-+/* NEVER use this! This is only for devel/debugging - disables all atomic
-+   arithmetics code. */
-+#undef ATOMIC_TORTURE
-+
-+/* use x86 assembler code for atomic arithmetic operations that will only work
-+   oni singleprocessor systems - compiled binary will be buggy on SMP */
-+#undef ATOMIC_X86
-+
-+/* use x86 assembler code for atomic arithmetic operations - default for SMP
-+   and UP systems */
-+#undef ATOMIC_X86_SMP
-+
-+/* Enable support for the apple trailers */
-+#undef ATRAILERS
-+
-+/* create database automatically if it does not exist */
-+#undef AUTO_CREATE_DATABASE
-+
-+/* ffmpeg/avformat.h */
-+#undef AVFORMAT_INCLUDE
-+
-+/* Define to 1 if the `closedir' function returns void instead of `int'. */
-+#undef CLOSEDIR_VOID
-+
-+/* compile option summary */
-+#undef COMPILE_INFO
-+
-+/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-+   systems. This function is required for `alloca.c' support on those systems.
-+   */
-+#undef CRAY_STACKSEG_END
-+
-+/* Define to 1 if using `alloca.c'. */
-+#undef C_ALLOCA
-+
-+/* Define to 1 to compile debug code */
-+#undef DEBUG
-+
-+/* compile with debug messages */
-+#undef DEBUG_LOG_ENABLED
-+
-+/* debug: abort on malloc/realloc of zero bytes */
-+#undef DEBUG_MALLOC_0
-+
-+/* Enable the X_MS_MediaReceiverRegistrar UPnP service. This is for future
-+   XBox 360 support, other renderers will probably not need it */
-+#undef ENABLE_MRREG
-+
-+/* enable SIGHUP handling */
-+#undef ENABLE_SIGHUP
-+
-+/* exif_entry_get_value() has 1 parameter */
-+#undef EXIF_EGV_1
-+
-+/* exif_entry_get_value() has 3 parameters */
-+#undef EXIF_EGV_3
-+
-+/* This is required for Playstation 3 support, it adds certain tags to the
-+   protocolInfo attribute */
-+#undef EXTEND_PROTOCOLINFO
-+
-+/* external transcoding feature */
-+#undef EXTERNAL_TRANSCODING
-+
-+/* use ffmpegthumbnailer API */
-+#undef FFMPEGTHUMBNAILER_OLD_API
-+
-+/* Define to 1 if you have `alloca', as a function or macro. */
-+#undef HAVE_ALLOCA
-+
-+/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-+   */
-+#undef HAVE_ALLOCA_H
-+
-+/* Define to 1 if you have the <arpa/inet.h> header file. */
-+#undef HAVE_ARPA_INET_H
-+
-+/* Define to 1 if you have the <attachedpictureframe.h> header file. */
-+#undef HAVE_ATTACHEDPICTUREFRAME_H
-+
-+/* Define to 1 if you have the <audioproperties.h> header file. */
-+#undef HAVE_AUDIOPROPERTIES_H
-+
-+/* Define to 1 if you have the `backtrace' function. */
-+#undef HAVE_BACKTRACE
-+
-+/* Define to 1 if you have the `backtrace_symbols' function. */
-+#undef HAVE_BACKTRACE_SYMBOLS
-+
-+/* Define to 1 if you have the <ctype.h> header file. */
-+#undef HAVE_CTYPE_H
-+
-+/* curl library presence */
-+#undef HAVE_CURL
-+
-+/* Define to 1 if you have the <curl/curl.h> header file. */
-+#undef HAVE_CURL_CURL_H
-+
-+/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
-+   don't. */
-+#undef HAVE_DECL_STRERROR_R
-+
-+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-+   */
-+#undef HAVE_DIRENT_H
-+
-+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-+#undef HAVE_DOPRNT
-+
-+/* Define to 1 if you have the <dvdnav/dvdnav.h> header file. */
-+#undef HAVE_DVDNAV_DVDNAV_H
-+
-+/* Define to 1 if you have the `dvdnav_get_audio_attr' function. */
-+#undef HAVE_DVDNAV_GET_AUDIO_ATTR
-+
-+/* Define to 1 if you have the <execinfo.h> header file. */
-+#undef HAVE_EXECINFO_H
-+
-+/* expat library presence */
-+#undef HAVE_EXPAT
-+
-+/* Define to 1 if you have the <fcntl.h> header file. */
-+#undef HAVE_FCNTL_H
-+
-+/* FFMPEG library presence */
-+#undef HAVE_FFMPEG
-+
-+/* ffmpegthumbnailer library presence */
-+#undef HAVE_FFMPEGTHUMBNAILER
-+
-+/* Define to 1 if you have the <fileref.h> header file. */
-+#undef HAVE_FILEREF_H
-+
-+/* Define to 1 if you have the `fork' function. */
-+#undef HAVE_FORK
-+
-+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-+#undef HAVE_FSEEKO
-+
-+/* Define to 1 if you have the `gethostbyname' function. */
-+#undef HAVE_GETHOSTBYNAME
-+
-+/* Define to 1 if you have the `gethostbyname_r' function. */
-+#undef HAVE_GETHOSTBYNAME_R
-+
-+/* Define to 1 if you have the `gethostname' function. */
-+#undef HAVE_GETHOSTNAME
-+
-+/* Define to 1 if you have the <getopt.h> header file. */
-+#undef HAVE_GETOPT_H
-+
-+/* Define to 1 if you have the `getopt_long' function. */
-+#undef HAVE_GETOPT_LONG
-+
-+/* Define to 1 if you have the `gettimeofday' function. */
-+#undef HAVE_GETTIMEOFDAY
-+
-+/* id3lib library presence */
-+#undef HAVE_ID3LIB
-+
-+/* this version of id3lib has album art support */
-+#undef HAVE_ID3_ALBUMART
-+
-+/* Define to 1 if you have the `if_freenameindex' function. */
-+#undef HAVE_IF_FREENAMEINDEX
-+
-+/* Define to 1 if you have the `if_nameindex' function. */
-+#undef HAVE_IF_NAMEINDEX
-+
-+/* Define to 1 if you have the `inet_ntoa' function. */
-+#undef HAVE_INET_NTOA
-+
-+/* inotify presence */
-+#undef HAVE_INOTIFY
-+
-+/* Define to 1 if you have the `inotify_init' function. */
-+#undef HAVE_INOTIFY_INIT
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#undef HAVE_INTTYPES_H
-+
-+/* Define to 1 if you have the `ioctl' function. */
-+#undef HAVE_IOCTL
-+
-+/* libjs presence */
-+#undef HAVE_JS
-+
-+/* Define to 1 if you have the <langinfo.h> header file. */
-+#undef HAVE_LANGINFO_H
-+
-+/* Define to 1 if you have the `' library (-l). */
-+#undef HAVE_LIB
-+
-+/* Define to 1 if you have the `curl' library (-lcurl). */
-+#undef HAVE_LIBCURL
-+
-+/* libdvdnav library presence */
-+#undef HAVE_LIBDVDNAV
-+
-+/* libexif library presence */
-+#undef HAVE_LIBEXIF
-+
-+/* libextractor library presence */
-+#undef HAVE_LIBEXTRACTOR
-+
-+/* we are using the libiconv library */
-+#undef HAVE_LIBICONV
-+
-+/* lwres library presence */
-+#undef HAVE_LIBLWRES
-+
-+/* libmagic library presence */
-+#undef HAVE_LIBMAGIC
-+
-+/* libmp4v2 library presence */
-+#undef HAVE_LIBMP4V2
-+
-+/* Define to 1 if you have the `nsl' library (-lnsl). */
-+#undef HAVE_LIBNSL
-+
-+/* Define to 1 if you have the `socket' library (-lsocket). */
-+#undef HAVE_LIBSOCKET
-+
-+/* Define to 1 if you have the `tag' library (-ltag). */
-+#undef HAVE_LIBTAG
-+
-+/* Define to 1 if you have the <limits.h> header file. */
-+#undef HAVE_LIMITS_H
-+
-+/* Define to 1 if you have the <locale.h> header file. */
-+#undef HAVE_LOCALE_H
-+
-+/* Define to 1 if you have the `localtime_r' function. */
-+#undef HAVE_LOCALTIME_R
-+
-+/* LONG_MAX definition available */
-+#undef HAVE_LONG_MAX
-+
-+/* Define to 1 if you have the <lwres/netdb.h> header file. */
-+#undef HAVE_LWRES_NETDB_H
-+
-+/* filemagic library presence */
-+#undef HAVE_MAGIC
-+
-+/* Define to 1 if you have the `main' function. */
-+#undef HAVE_MAIN
-+
-+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
-+   to 0 otherwise. */
-+#undef HAVE_MALLOC
-+
-+/* Define to 1 if you have the `memmove' function. */
-+#undef HAVE_MEMMOVE
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#undef HAVE_MEMORY_H
-+
-+/* Define to 1 if you have the `memset' function. */
-+#undef HAVE_MEMSET
-+
-+/* Define to 1 if you have the `mkdir' function. */
-+#undef HAVE_MKDIR
-+
-+/* Define to 1 if you have the `mkfifo' function. */
-+#undef HAVE_MKFIFO
-+
-+/* this version of libmp4v2 has MP4GetMetadataCoverArtCount() support */
-+#undef HAVE_MP4_GET_METADATA_COVER_ART_COUNT
-+
-+/* this version of libmp4 has MP4GetTrackAudioChannels support */
-+#undef HAVE_MP4_GET_TRACK_AUDIO_CHANNELS
-+
-+/* MySQL library presence */
-+#undef HAVE_MYSQL
-+
-+/* Define to 1 if you have the <mysql.h> header file. */
-+#undef HAVE_MYSQL_H
-+
-+/* Define to 1 if you have the `mysql_init' function. */
-+#undef HAVE_MYSQL_INIT
-+
-+/* MYSQL_OPT_RECONNECT parameter available */
-+#undef HAVE_MYSQL_OPT_RECONNECT
-+
-+/* Define to 1 if you have the `mysql_stmt_init' function. */
-+#undef HAVE_MYSQL_STMT_INIT
-+
-+/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-+#undef HAVE_NDIR_H
-+
-+/* Define to 1 if you have the <netdb.h> header file. */
-+#undef HAVE_NETDB_H
-+
-+/* Define to 1 if you have the <netinet/in.h> header file. */
-+#undef HAVE_NETINET_IN_H
-+
-+/* Define to 1 if you have the `nl_langinfo' function. */
-+#undef HAVE_NL_LANGINFO
-+
-+/* Define if you have POSIX threads libraries and header files. */
-+#undef HAVE_PTHREAD
-+
-+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
-+   and to 0 otherwise. */
-+#undef HAVE_REALLOC
-+
-+/* Define to 1 if you have the `regcomp' function. */
-+#undef HAVE_REGCOMP
-+
-+/* Define to 1 if you have the `sched_getparam' function. */
-+#undef HAVE_SCHED_GETPARAM
-+
-+/* Define to 1 if you have the `sched_get_priority_max' function. */
-+#undef HAVE_SCHED_GET_PRIORITY_MAX
-+
-+/* Define to 1 if you have the `sched_get_priority_min' function. */
-+#undef HAVE_SCHED_GET_PRIORITY_MIN
-+
-+/* Define to 1 if you have the <sched.h> header file. */
-+#undef HAVE_SCHED_H
-+
-+/* Define to 1 if you have the `sched_setparam' function. */
-+#undef HAVE_SCHED_SETPARAM
-+
-+/* Define to 1 if you have the `select' function. */
-+#undef HAVE_SELECT
-+
-+/* Define to 1 if you have the `setlocale' function. */
-+#undef HAVE_SETLOCALE
-+
-+/* Define to 1 if you have the `sigaction' function. */
-+#undef HAVE_SIGACTION
-+
-+/* Define to 1 if you have the `sigprocmask' function. */
-+#undef HAVE_SIGPROCMASK
-+
-+/* Define to 1 if you have the `socket' function. */
-+#undef HAVE_SOCKET
-+
-+/* sqlite3 library presence */
-+#undef HAVE_SQLITE3
-+
-+/* Define to 1 if `stat' has the bug that it succeeds when given the
-+   zero-length file name argument. */
-+#undef HAVE_STAT_EMPTY_STRING_BUG
-+
-+/* Define to 1 if stdbool.h conforms to C99. */
-+#undef HAVE_STDBOOL_H
-+
-+/* Define to 1 if you have the <stddef.h> header file. */
-+#undef HAVE_STDDEF_H
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#undef HAVE_STDINT_H
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#undef HAVE_STDLIB_H
-+
-+/* Define to 1 if you have the `strcasecmp' function. */
-+#undef HAVE_STRCASECMP
-+
-+/* Define to 1 if you have the `strchr' function. */
-+#undef HAVE_STRCHR
-+
-+/* Define to 1 if you have the `strdup' function. */
-+#undef HAVE_STRDUP
-+
-+/* Define to 1 if you have the `strerror' function. */
-+#undef HAVE_STRERROR
-+
-+/* Define to 1 if you have the `strerror_r' function. */
-+#undef HAVE_STRERROR_R
-+
-+/* Define to 1 if you have the `strftime' function. */
-+#undef HAVE_STRFTIME
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#undef HAVE_STRINGS_H
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#undef HAVE_STRING_H
-+
-+/* Define to 1 if you have the `strncasecmp' function. */
-+#undef HAVE_STRNCASECMP
-+
-+/* Define to 1 if you have the `strrchr' function. */
-+#undef HAVE_STRRCHR
-+
-+/* Define to 1 if you have the `strstr' function. */
-+#undef HAVE_STRSTR
-+
-+/* Define to 1 if you have the `strtol' function. */
-+#undef HAVE_STRTOL
-+
-+/* Define to 1 if you have the `strtoll' function. */
-+#undef HAVE_STRTOLL
-+
-+/* Define to 1 if you have the `strtoul' function. */
-+#undef HAVE_STRTOUL
-+
-+/* Define to 1 if you have the <syslog.h> header file. */
-+#undef HAVE_SYSLOG_H
-+
-+/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-+   */
-+#undef HAVE_SYS_DIR_H
-+
-+/* Define to 1 if you have the <sys/file.h> header file. */
-+#undef HAVE_SYS_FILE_H
-+
-+/* Define to 1 if you have the <sys/ioctl.h> header file. */
-+#undef HAVE_SYS_IOCTL_H
-+
-+/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-+   */
-+#undef HAVE_SYS_NDIR_H
-+
-+/* Define to 1 if you have the <sys/select.h> header file. */
-+#undef HAVE_SYS_SELECT_H
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#undef HAVE_SYS_SOCKET_H
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#undef HAVE_SYS_STAT_H
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#undef HAVE_SYS_TIME_H
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#undef HAVE_SYS_TYPES_H
-+
-+/* Define to 1 if you have the <sys/utsname.h> header file. */
-+#undef HAVE_SYS_UTSNAME_H
-+
-+/* Define to 1 if you have the <sys/wait.h> header file. */
-+#undef HAVE_SYS_WAIT_H
-+
-+/* taglib library presence */
-+#undef HAVE_TAGLIB
-+
-+/* Define to 1 if you have the <taglib.h> header file. */
-+#undef HAVE_TAGLIB_H
-+
-+/* Define to 1 if you have the <tag.h> header file. */
-+#undef HAVE_TAG_H
-+
-+/* Define to 1 if you have the <textidentificationframe.h> header file. */
-+#undef HAVE_TEXTIDENTIFICATIONFRAME_H
-+
-+/* Define to 1 if you have the <time.h> header file. */
-+#undef HAVE_TIME_H
-+
-+/* Define to 1 if the system has the type `time_t'. */
-+#undef HAVE_TIME_T
-+
-+/* Define to 1 if you have the `tolower' function. */
-+#undef HAVE_TOLOWER
-+
-+/* Define to 1 if you have the `toupper' function. */
-+#undef HAVE_TOUPPER
-+
-+/* Define to 1 if you have the <tstring.h> header file. */
-+#undef HAVE_TSTRING_H
-+
-+/* Define to 1 if you have the `uname' function. */
-+#undef HAVE_UNAME
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#undef HAVE_UNISTD_H
-+
-+/* Define to 1 if you have the `vfork' function. */
-+#undef HAVE_VFORK
-+
-+/* Define to 1 if you have the <vfork.h> header file. */
-+#undef HAVE_VFORK_H
-+
-+/* Define to 1 if you have the `vprintf' function. */
-+#undef HAVE_VPRINTF
-+
-+/* Define to 1 if `fork' works. */
-+#undef HAVE_WORKING_FORK
-+
-+/* Define to 1 if `vfork' works. */
-+#undef HAVE_WORKING_VFORK
-+
-+/* zlib library presence */
-+#undef HAVE_ZLIB
-+
-+/* Define to 1 if the system has the type `_Bool'. */
-+#undef HAVE__BOOL
-+
-+/* iconv needs const char cast */
-+#undef ICONV_CONST
-+
-+/* this version of spidermonkey is threadsafe */
-+#undef JS_THREADSAFE
-+
-+/* if defined compile with log output */
-+#undef LOG_ENABLED
-+
-+/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
-+   slash. */
-+#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
-+
-+/* LLONG_MAX not available */
-+#undef MAXLLONG
-+
-+/* make sure there are no asserts in the retail build */
-+#undef NDEBUG
-+
-+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-+#undef NO_MINUS_C_MINUS_O
-+
-+/* at least one online service is supported */
-+#undef ONLINE_SERVICES
-+
-+/* Name of package */
-+#undef PACKAGE
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#undef PACKAGE_BUGREPORT
-+
-+/* MediaTomb data directory */
-+#undef PACKAGE_DATADIR
-+
-+/* Define to the full name of this package. */
-+#undef PACKAGE_NAME
-+
-+/* Define to the full name and version of this package. */
-+#undef PACKAGE_STRING
-+
-+/* Define to the one symbol short name of this package. */
-+#undef PACKAGE_TARNAME
-+
+@@ -535,6 +535,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
-+
-+/* Define to necessary symbol if this constant uses a non-standard name on
-+   your system. */
-+#undef PTHREAD_CREATE_JOINABLE
-+
-+/* Define as the return type of signal handlers (`int' or `void'). */
-+#undef RETSIGTYPE
-+
-+/* Define to the type of arg 1 for `select'. */
-+#undef SELECT_TYPE_ARG1
-+
-+/* Define to the type of args 2, 3 and 4 for `select'. */
-+#undef SELECT_TYPE_ARG234
-+
-+/* Define to the type of arg 5 for `select'. */
-+#undef SELECT_TYPE_ARG5
-+
-+/* The size of `off_t', as computed by sizeof. */
-+#undef SIZEOF_OFF_T
-+
-+/* The size of `size_t', as computed by sizeof. */
-+#undef SIZEOF_SIZE_T
-+
-+/* The size of `time_t', as computed by sizeof. */
-+#undef SIZEOF_TIME_T
-+
-+/* The size of `unsigned int', as computed by sizeof. */
-+#undef SIZEOF_UNSIGNED_INT
-+
-+/* The size of `unsigned long', as computed by sizeof. */
-+#undef SIZEOF_UNSIGNED_LONG
-+
-+/* we are on solaris */
-+#undef SOLARIS
-+
-+/* Enable support for the SopCast service */
-+#undef SOPCAST
-+
-+/* enable sqlite db backup settings in config.xml by default */
-+#undef SQLITE_BACKUP_ENABLED
-+
-+/* If using the C implementation of alloca, define if you know the
-+   direction of stack growth for your system; otherwise it will be
-+   automatically deduced at runtime.
-+	STACK_DIRECTION > 0 => grows toward higher addresses
-+	STACK_DIRECTION < 0 => grows toward lower addresses
-+	STACK_DIRECTION = 0 => direction of growth unknown */
-+#undef STACK_DIRECTION
-+
-+/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-+#undef STAT_MACROS_BROKEN
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#undef STDC_HEADERS
-+
-+/* Define to 1 if strerror_r returns char *. */
-+#undef STRERROR_R_CHAR_P
-+
-+/* sys/inotify.h exists */
-+#undef SYS_INOTIFY_H_OK
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#undef TIME_WITH_SYS_TIME
-+
-+/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-+#undef TM_IN_SYS_TIME
-+
-+/* if defined compile with debug log output */
-+#undef TOMBDEBUG
-+
-+/* see upnpconfig.h */
-+#undef UPNP_HAVE_DEBUG
-+
-+/* Compile device API */
-+#undef UPNP_HAVE_DEVICE
-+
-+/* Compile internal web server */
-+#undef UPNP_HAVE_WEBSERVER
-+
-+/* see upnpconfig.h */
-+#undef UPNP_VERSION_MAJOR
-+
-+/* see upnpconfig.h */
-+#undef UPNP_VERSION_MINOR
-+
-+/* see upnpconfig.h */
-+#undef UPNP_VERSION_PATCH
-+
-+/* see upnpconfig.h */
-+#undef UPNP_VERSION_STRING
-+
-+/* Version number of package */
-+#undef VERSION
-+
-+/* Enable support for the Weborama service */
-+#undef WEBORAMA
-+
-+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-+   significant byte first (like Motorola and SPARC, unlike Intel). */
-+#if defined AC_APPLE_UNIVERSAL_BUILD
-+# if defined __BIG_ENDIAN__
-+#  define WORDS_BIGENDIAN 1
-+# endif
-+#else
-+# ifndef WORDS_BIGENDIAN
-+#  undef WORDS_BIGENDIAN
-+# endif
-+#endif
-+
-+/* Enable support for the YouTube service */
-+#undef YOUTUBE
-+
-+/* Number of bits in a file offset, on hosts where this is settable. */
-+#undef _FILE_OFFSET_BITS
-+
-+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-+#undef _LARGEFILE_SOURCE
-+
-+/* Define for large files, on AIX-style hosts. */
-+#undef _LARGE_FILES
-+
-+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
-+   <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
-+   #define below would cause a syntax error. */
-+#undef _UINT32_T
-+
-+/* needed for stdint.h */
-+#undef __STDC_CONSTANT_MACROS
-+
-+/* needed for stdint.h */
-+#undef __STDC_LIMIT_MACROS
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+#undef const
-+
-+/* fseeko not present */
-+#undef fseeko
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+   calls it, or to nothing if 'inline' is not supported under any name.  */
-+#ifndef __cplusplus
-+#undef inline
-+#endif
-+
-+/* Define to the type of a signed integer type of width exactly 64 bits if
-+   such a type exists and the standard includes do not define it. */
-+#undef int64_t
-+
-+/* Define to rpl_malloc if the replacement function should be used. */
-+#undef malloc
-+
-+/* Define to `long int' if <sys/types.h> does not define. */
-+#undef off_t
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+#undef pid_t
-+
-+/* Define to rpl_realloc if the replacement function should be used. */
-+#undef realloc
-+
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
-+#undef size_t
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+#undef ssize_t
-+
-+/* Define to the type of an unsigned integer type of width exactly 32 bits if
-+   such a type exists and the standard includes do not define it. */
-+#undef uint32_t
-+
-+/* Define as `fork' if `vfork' does not work. */
-+#undef vfork
-+
-+/* Define to empty if the keyword `volatile' does not work. Warning: valid
-+   code using `volatile' can become incorrect without. Disable with care. */
-+#undef volatile
---- /dev/null
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+ 
+diff --git a/build/Makefile.in b/build/Makefile.in
+index b3d9ac4..0131395 100644
+--- a/build/Makefile.in
 +++ b/build/Makefile.in
-@@ -0,0 +1,3393 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+	$(srcdir)/libmediatomb_src
-+bin_PROGRAMS = mediatomb$(EXEEXT)
-+subdir = build
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/autoconfig.h \
-+	$(top_builddir)/tombupnp/upnp/inc/upnpconfig.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+LIBRARIES = $(noinst_LIBRARIES)
-+AR = ar
-+ARFLAGS = cru
-+libmediatomb_a_AR = $(AR) $(ARFLAGS)
-+libmediatomb_a_LIBADD =
-+am_libmediatomb_a_OBJECTS = libmediatomb_a-action_request.$(OBJEXT) \
-+	libmediatomb_a-atrailers_content_handler.$(OBJEXT) \
-+	libmediatomb_a-atrailers_service.$(OBJEXT) \
-+	libmediatomb_a-autoscan.$(OBJEXT) \
-+	libmediatomb_a-autoscan_inotify.$(OBJEXT) \
-+	libmediatomb_a-buffered_io_handler.$(OBJEXT) \
-+	libmediatomb_a-cached_url.$(OBJEXT) \
-+	libmediatomb_a-cds_objects.$(OBJEXT) \
-+	libmediatomb_a-cds_resource.$(OBJEXT) \
-+	libmediatomb_a-cds_resource_manager.$(OBJEXT) \
-+	libmediatomb_a-config_manager.$(OBJEXT) \
-+	libmediatomb_a-content_manager.$(OBJEXT) \
-+	libmediatomb_a-curl_io_handler.$(OBJEXT) \
-+	libmediatomb_a-destroyer.$(OBJEXT) \
-+	libmediatomb_a-dictionary.$(OBJEXT) \
-+	libmediatomb_a-dvd_io_handler.$(OBJEXT) \
-+	libmediatomb_a-dvdnav_read.$(OBJEXT) \
-+	libmediatomb_a-exceptions.$(OBJEXT) \
-+	libmediatomb_a-fd_io_handler.$(OBJEXT) \
-+	libmediatomb_a-file_io_handler.$(OBJEXT) \
-+	libmediatomb_a-file_request_handler.$(OBJEXT) \
-+	libmediatomb_a-filesystem.$(OBJEXT) \
-+	libmediatomb_a-io_handler_buffer_helper.$(OBJEXT) \
-+	libmediatomb_a-io_handler.$(OBJEXT) \
-+	libmediatomb_a-io_handler_chainer.$(OBJEXT) \
-+	libmediatomb_a-jpeg_resolution.$(OBJEXT) \
-+	libmediatomb_a-fallback_layout.$(OBJEXT) \
-+	libmediatomb_a-js_layout.$(OBJEXT) \
-+	libmediatomb_a-logger.$(OBJEXT) libmediatomb_a-main.$(OBJEXT) \
-+	md5.$(OBJEXT) libmediatomb_a-mem_io_handler.$(OBJEXT) \
-+	libmediatomb_a-memory.$(OBJEXT) \
-+	libmediatomb_a-dvd_handler.$(OBJEXT) \
-+	libmediatomb_a-exiv2_handler.$(OBJEXT) \
-+	libmediatomb_a-extractor_handler.$(OBJEXT) \
-+	libmediatomb_a-ffmpeg_handler.$(OBJEXT) \
-+	libmediatomb_a-metadata_handler.$(OBJEXT) \
-+	libmediatomb_a-id3_handler.$(OBJEXT) \
-+	libmediatomb_a-libexif_handler.$(OBJEXT) \
-+	libmediatomb_a-libmp4v2_handler.$(OBJEXT) \
-+	libmediatomb_a-taglib_handler.$(OBJEXT) buffer.$(OBJEXT) \
-+	mpegdemux.$(OBJEXT) mpeg_parse.$(OBJEXT) mpeg_remux.$(OBJEXT) \
-+	libmediatomb_a-mpegremux_processor.$(OBJEXT) \
-+	libmediatomb_a-mt_inotify.$(OBJEXT) \
-+	libmediatomb_a-attribute.$(OBJEXT) \
-+	libmediatomb_a-comment.$(OBJEXT) \
-+	libmediatomb_a-context.$(OBJEXT) \
-+	libmediatomb_a-element.$(OBJEXT) libmediatomb_a-node.$(OBJEXT) \
-+	libmediatomb_a-parseexception.$(OBJEXT) \
-+	libmediatomb_a-parser_expat.$(OBJEXT) \
-+	libmediatomb_a-xml_text.$(OBJEXT) \
-+	libmediatomb_a-xml_to_json.$(OBJEXT) \
-+	libmediatomb_a-online_service.$(OBJEXT) \
-+	libmediatomb_a-online_service_helper.$(OBJEXT) \
-+	libmediatomb_a-play_hook.$(OBJEXT) \
-+	libmediatomb_a-process.$(OBJEXT) \
-+	libmediatomb_a-process_executor.$(OBJEXT) \
-+	libmediatomb_a-process_io_handler.$(OBJEXT) \
-+	libmediatomb_a-request_handler.$(OBJEXT) \
-+	libmediatomb_a-rexp.$(OBJEXT) \
-+	libmediatomb_a-dvd_image_import_script.$(OBJEXT) \
-+	libmediatomb_a-import_script.$(OBJEXT) \
-+	libmediatomb_a-js_functions.$(OBJEXT) \
-+	libmediatomb_a-playlist_parser_script.$(OBJEXT) \
-+	libmediatomb_a-runtime.$(OBJEXT) \
-+	libmediatomb_a-script.$(OBJEXT) \
-+	libmediatomb_a-server.$(OBJEXT) \
-+	libmediatomb_a-serve_request_handler.$(OBJEXT) \
-+	libmediatomb_a-session_manager.$(OBJEXT) \
-+	libmediatomb_a-singleton.$(OBJEXT) \
-+	libmediatomb_a-sopcast_content_handler.$(OBJEXT) \
-+	libmediatomb_a-sopcast_service.$(OBJEXT) \
-+	libmediatomb_a-cache_object.$(OBJEXT) \
-+	libmediatomb_a-storage.$(OBJEXT) \
-+	libmediatomb_a-mysql_storage.$(OBJEXT) \
-+	libmediatomb_a-sqlite3_storage.$(OBJEXT) \
-+	libmediatomb_a-sql_storage.$(OBJEXT) \
-+	libmediatomb_a-storage_cache.$(OBJEXT) \
-+	libmediatomb_a-string_converter.$(OBJEXT) \
-+	libmediatomb_a-subscription_request.$(OBJEXT) \
-+	libmediatomb_a-sync.$(OBJEXT) \
-+	libmediatomb_a-thread_executor.$(OBJEXT) \
-+	libmediatomb_a-timer.$(OBJEXT) libmediatomb_a-tools.$(OBJEXT) \
-+	libmediatomb_a-transcode_dispatcher.$(OBJEXT) \
-+	libmediatomb_a-transcode_ext_handler.$(OBJEXT) \
-+	libmediatomb_a-transcoding.$(OBJEXT) \
-+	libmediatomb_a-transcoding_process_executor.$(OBJEXT) \
-+	libmediatomb_a-update_manager.$(OBJEXT) \
-+	libmediatomb_a-upnp_cds_actions.$(OBJEXT) \
-+	libmediatomb_a-upnp_cds.$(OBJEXT) \
-+	libmediatomb_a-upnp_cds_subscriptions.$(OBJEXT) \
-+	libmediatomb_a-upnp_cm_actions.$(OBJEXT) \
-+	libmediatomb_a-upnp_cm.$(OBJEXT) \
-+	libmediatomb_a-upnp_cm_subscriptions.$(OBJEXT) \
-+	libmediatomb_a-upnp_mrreg_actions.$(OBJEXT) \
-+	libmediatomb_a-upnp_mrreg.$(OBJEXT) \
-+	libmediatomb_a-upnp_mrreg_subscriptions.$(OBJEXT) \
-+	libmediatomb_a-upnp_xml.$(OBJEXT) libmediatomb_a-url.$(OBJEXT) \
-+	libmediatomb_a-url_request_handler.$(OBJEXT) clear.$(OBJEXT) \
-+	compare.$(OBJEXT) copy.$(OBJEXT) gen_uuid.$(OBJEXT) \
-+	isnull.$(OBJEXT) pack.$(OBJEXT) parse.$(OBJEXT) \
-+	unpack.$(OBJEXT) unparse.$(OBJEXT) uuid_time.$(OBJEXT) \
-+	libmediatomb_a-action.$(OBJEXT) libmediatomb_a-add.$(OBJEXT) \
-+	libmediatomb_a-add_object.$(OBJEXT) \
-+	libmediatomb_a-auth.$(OBJEXT) \
-+	libmediatomb_a-web_callbacks.$(OBJEXT) \
-+	libmediatomb_a-containers.$(OBJEXT) \
-+	libmediatomb_a-directories.$(OBJEXT) \
-+	libmediatomb_a-edit_load.$(OBJEXT) \
-+	libmediatomb_a-edit_save.$(OBJEXT) \
-+	libmediatomb_a-files.$(OBJEXT) libmediatomb_a-items.$(OBJEXT) \
-+	libmediatomb_a-weborama_content_handler.$(OBJEXT) \
-+	libmediatomb_a-weborama_service.$(OBJEXT) \
-+	libmediatomb_a-pages.$(OBJEXT) libmediatomb_a-remove.$(OBJEXT) \
-+	libmediatomb_a-web_request_handler.$(OBJEXT) \
-+	libmediatomb_a-tasks.$(OBJEXT) \
-+	libmediatomb_a-web_autoscan.$(OBJEXT) \
-+	libmediatomb_a-web_update.$(OBJEXT) \
-+	libmediatomb_a-xpath.$(OBJEXT) \
-+	libmediatomb_a-youtube_content_handler.$(OBJEXT) \
-+	libmediatomb_a-youtube_service.$(OBJEXT) \
-+	libmediatomb_a-youtube_video_url.$(OBJEXT) \
-+	libmediatomb_a-array.$(OBJEXT) \
-+	libmediatomb_a-exception.$(OBJEXT) \
-+	libmediatomb_a-stringtokenizer.$(OBJEXT) \
-+	libmediatomb_a-nil.$(OBJEXT) libmediatomb_a-object.$(OBJEXT) \
-+	libmediatomb_a-stringbuffer.$(OBJEXT) \
-+	libmediatomb_a-strings.$(OBJEXT)
-+libmediatomb_a_OBJECTS = $(am_libmediatomb_a_OBJECTS)
-+am__installdirs = "$(DESTDIR)$(bindir)"
-+PROGRAMS = $(bin_PROGRAMS)
-+am_mediatomb_OBJECTS = mediatomb-main.$(OBJEXT)
-+mediatomb_OBJECTS = $(am_mediatomb_OBJECTS)
-+am__DEPENDENCIES_1 =
-+mediatomb_DEPENDENCIES = libmediatomb.a \
-+	$(top_srcdir)/tombupnp/build/libtombupnp.a \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
-+mediatomb_LINK = $(CXXLD) $(mediatomb_CXXFLAGS) $(CXXFLAGS) \
-+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) -I$(top_builddir)/tombupnp/upnp/inc
-+depcomp = $(SHELL) $(top_srcdir)/configure_aux/depcomp
-+am__depfiles_maybe = depfiles
-+am__mv = mv -f
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXLD = $(CXX)
-+CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-+	-o $@
-+SOURCES = $(libmediatomb_a_SOURCES) $(mediatomb_SOURCES)
-+DIST_SOURCES = $(libmediatomb_a_SOURCES) $(mediatomb_SOURCES)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMTAR = @AMTAR@
-+ATOMIC_OPTION_ENABLED = @ATOMIC_OPTION_ENABLED@
-+ATOMIC_OPTION_REQUESTED = @ATOMIC_OPTION_REQUESTED@
-+ATOMIC_X86_SINGLE_OPTION_ENABLED = @ATOMIC_X86_SINGLE_OPTION_ENABLED@
-+ATOMIC_X86_SINGLE_OPTION_REQUESTED = @ATOMIC_X86_SINGLE_OPTION_REQUESTED@
-+ATRAILERS_OPTION_ENABLED = @ATRAILERS_OPTION_ENABLED@
-+ATRAILERS_OPTION_REQUESTED = @ATRAILERS_OPTION_REQUESTED@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@
-+AVFORMAT_LDFLAGS = @AVFORMAT_LDFLAGS@
-+AVFORMAT_LIBS = @AVFORMAT_LIBS@
-+AVFORMAT_STATUS = @AVFORMAT_STATUS@
-+AVUTIL_LDFLAGS = @AVUTIL_LDFLAGS@
-+AVUTIL_LIBS = @AVUTIL_LIBS@
-+AVUTIL_STATUS = @AVUTIL_STATUS@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
-+DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-+DEBUG_LOG_OPTION_ENABLED = @DEBUG_LOG_OPTION_ENABLED@
-+DEBUG_LOG_OPTION_REQUESTED = @DEBUG_LOG_OPTION_REQUESTED@
-+DEBUG_MALLOC0_OPTION_ENABLED = @DEBUG_MALLOC0_OPTION_ENABLED@
-+DEBUG_MALLOC0_OPTION_REQUESTED = @DEBUG_MALLOC0_OPTION_REQUESTED@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+EXPAT_CFLAGS = @EXPAT_CFLAGS@
-+EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
-+EXPAT_LIBS = @EXPAT_LIBS@
-+EXPAT_STATUS = @EXPAT_STATUS@
-+EXTERNAL_TRANSCODING_OPTION_ENABLED = @EXTERNAL_TRANSCODING_OPTION_ENABLED@
-+EXTERNAL_TRANSCODING_OPTION_REQUESTED = @EXTERNAL_TRANSCODING_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_CFLAGS = @FFMPEGTHUMBNAILER_CFLAGS@
-+FFMPEGTHUMBNAILER_LDFLAGS = @FFMPEGTHUMBNAILER_LDFLAGS@
-+FFMPEGTHUMBNAILER_LIBS = @FFMPEGTHUMBNAILER_LIBS@
-+FFMPEGTHUMBNAILER_OPTION_ENABLED = @FFMPEGTHUMBNAILER_OPTION_ENABLED@
-+FFMPEGTHUMBNAILER_OPTION_REQUESTED = @FFMPEGTHUMBNAILER_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_STATUS = @FFMPEGTHUMBNAILER_STATUS@
-+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@
-+FFMPEG_LIBS = @FFMPEG_LIBS@
-+FFMPEG_OPTION_ENABLED = @FFMPEG_OPTION_ENABLED@
-+FFMPEG_OPTION_REQUESTED = @FFMPEG_OPTION_REQUESTED@
-+FSEEKO_CHECK_OPTION_ENABLED = @FSEEKO_CHECK_OPTION_ENABLED@
-+FSEEKO_CHECK_OPTION_REQUESTED = @FSEEKO_CHECK_OPTION_REQUESTED@
-+GREP = @GREP@
-+ICONV_CXXFLAGS = @ICONV_CXXFLAGS@
-+ICONV_LIBS = @ICONV_LIBS@
-+ICONV_LIB_OPTION_ENABLED = @ICONV_LIB_OPTION_ENABLED@
-+ICONV_LIB_OPTION_REQUESTED = @ICONV_LIB_OPTION_REQUESTED@
-+ID3LIB_CFLAGS = @ID3LIB_CFLAGS@
-+ID3LIB_LDFLAGS = @ID3LIB_LDFLAGS@
-+ID3LIB_LIBS = @ID3LIB_LIBS@
-+ID3LIB_OPTION_ENABLED = @ID3LIB_OPTION_ENABLED@
-+ID3LIB_OPTION_REQUESTED = @ID3LIB_OPTION_REQUESTED@
-+ID3LIB_STATUS = @ID3LIB_STATUS@
-+ID3LIB_VERSION = @ID3LIB_VERSION@
-+INOTIFY_CFLAGS = @INOTIFY_CFLAGS@
-+INOTIFY_OPTION_ENABLED = @INOTIFY_OPTION_ENABLED@
-+INOTIFY_OPTION_REQUESTED = @INOTIFY_OPTION_REQUESTED@
-+INOTIFY_STATUS = @INOTIFY_STATUS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JS_CXXFLAGS = @JS_CXXFLAGS@
-+JS_LIBS = @JS_LIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBDVDNAV_CFLAGS = @LIBDVDNAV_CFLAGS@
-+LIBDVDNAV_LIBS = @LIBDVDNAV_LIBS@
-+LIBDVDNAV_OPTION_ENABLED = @LIBDVDNAV_OPTION_ENABLED@
-+LIBDVDNAV_OPTION_REQUESTED = @LIBDVDNAV_OPTION_REQUESTED@
-+LIBDVDNAV_STATUS = @LIBDVDNAV_STATUS@
-+LIBDVDNAV_VERSION = @LIBDVDNAV_VERSION@
-+LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-+LIBEXIF_LDFLAGS = @LIBEXIF_LDFLAGS@
-+LIBEXIF_LIBS = @LIBEXIF_LIBS@
-+LIBEXIF_OPTION_ENABLED = @LIBEXIF_OPTION_ENABLED@
-+LIBEXIF_OPTION_REQUESTED = @LIBEXIF_OPTION_REQUESTED@
-+LIBEXIF_STATUS = @LIBEXIF_STATUS@
-+LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@
-+LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@
-+LIBEXTRACTOR_OPTION_ENABLED = @LIBEXTRACTOR_OPTION_ENABLED@
-+LIBEXTRACTOR_OPTION_REQUESTED = @LIBEXTRACTOR_OPTION_REQUESTED@
-+LIBEXTRACTOR_STATUS = @LIBEXTRACTOR_STATUS@
-+LIBEXTRACTOR_VERSION = @LIBEXTRACTOR_VERSION@
-+LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@
-+LIBMAGIC_LDFLAGS = @LIBMAGIC_LDFLAGS@
-+LIBMAGIC_LIBS = @LIBMAGIC_LIBS@
-+LIBMAGIC_OPTION_ENABLED = @LIBMAGIC_OPTION_ENABLED@
-+LIBMAGIC_OPTION_REQUESTED = @LIBMAGIC_OPTION_REQUESTED@
-+LIBMAGIC_STATUS = @LIBMAGIC_STATUS@
-+LIBMAGIC_VERSION = @LIBMAGIC_VERSION@
-+LIBMP4V2_CFLAGS = @LIBMP4V2_CFLAGS@
-+LIBMP4V2_LDFLAGS = @LIBMP4V2_LDFLAGS@
-+LIBMP4V2_LIBS = @LIBMP4V2_LIBS@
-+LIBMP4V2_OPTION_ENABLED = @LIBMP4V2_OPTION_ENABLED@
-+LIBMP4V2_OPTION_REQUESTED = @LIBMP4V2_OPTION_REQUESTED@
-+LIBMP4V2_STATUS = @LIBMP4V2_STATUS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LOG_OPTION_ENABLED = @LOG_OPTION_ENABLED@
-+LOG_OPTION_REQUESTED = @LOG_OPTION_REQUESTED@
-+LTLIBOBJS = @LTLIBOBJS@
-+LWRES_LIBS = @LWRES_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+MRREG_SERVICE_OPTION_ENABLED = @MRREG_SERVICE_OPTION_ENABLED@
-+MRREG_SERVICE_OPTION_REQUESTED = @MRREG_SERVICE_OPTION_REQUESTED@
-+MT_SEARCHPATH = @MT_SEARCHPATH@
-+MT_SEARCHPATH_HEADERS = @MT_SEARCHPATH_HEADERS@
-+MT_SEARCHPATH_LIBS = @MT_SEARCHPATH_LIBS@
-+MT_SEARCHPATH_PROGS = @MT_SEARCHPATH_PROGS@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+MYSQL_OPTION_ENABLED = @MYSQL_OPTION_ENABLED@
-+MYSQL_OPTION_REQUESTED = @MYSQL_OPTION_REQUESTED@
-+MYSQL_STATUS = @MYSQL_STATUS@
-+MYSQL_VERSION = @MYSQL_VERSION@
-+NSL_LIBS = @NSL_LIBS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+@@ -373,6 +373,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@
-+POW_LIB = @POW_LIB@
-+PROTOCOLINFO_EXTENSION_OPTION_ENABLED = @PROTOCOLINFO_EXTENSION_OPTION_ENABLED@
-+PROTOCOLINFO_EXTENSION_OPTION_REQUESTED = @PROTOCOLINFO_EXTENSION_OPTION_REQUESTED@
-+PTHREAD_CC = @PTHREAD_CC@
-+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-+PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
-+PTHREAD_LIBS = @PTHREAD_LIBS@
-+PTHREAD_LIB_OPTION_ENABLED = @PTHREAD_LIB_OPTION_ENABLED@
-+PTHREAD_LIB_OPTION_REQUESTED = @PTHREAD_LIB_OPTION_REQUESTED@
-+PTHREAD_STATUS = @PTHREAD_STATUS@
-+RANLIB = @RANLIB@
-+RT_LDFLAGS = @RT_LDFLAGS@
-+RT_LIBS = @RT_LIBS@
-+RT_STATUS = @RT_STATUS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SOPCAST_OPTION_ENABLED = @SOPCAST_OPTION_ENABLED@
-+SOPCAST_OPTION_REQUESTED = @SOPCAST_OPTION_REQUESTED@
-+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
-+SQLITE3_LDFLAGS = @SQLITE3_LDFLAGS@
-+SQLITE3_LIBS = @SQLITE3_LIBS@
-+SQLITE3_OPTION_ENABLED = @SQLITE3_OPTION_ENABLED@
-+SQLITE3_OPTION_REQUESTED = @SQLITE3_OPTION_REQUESTED@
-+SQLITE3_STATUS = @SQLITE3_STATUS@
-+SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED = @SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED@
-+SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED = @SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED@
-+STATIC_OPTION_ENABLED = @STATIC_OPTION_ENABLED@
-+STATIC_OPTION_REQUESTED = @STATIC_OPTION_REQUESTED@
-+STRIP = @STRIP@
-+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
-+TAGLIB_LIBS = @TAGLIB_LIBS@
-+TAGLIB_OPTION_ENABLED = @TAGLIB_OPTION_ENABLED@
-+TAGLIB_OPTION_REQUESTED = @TAGLIB_OPTION_REQUESTED@
-+TAGLIB_STATUS = @TAGLIB_STATUS@
-+TAGLIB_VERSION = @TAGLIB_VERSION@
-+TOMBDEBUG_OPTION_ENABLED = @TOMBDEBUG_OPTION_ENABLED@
-+TOMBDEBUG_OPTION_REQUESTED = @TOMBDEBUG_OPTION_REQUESTED@
-+UPNPDEBUG_OPTION_ENABLED = @UPNPDEBUG_OPTION_ENABLED@
-+UPNPDEBUG_OPTION_REQUESTED = @UPNPDEBUG_OPTION_REQUESTED@
-+VERSION = @VERSION@
-+WEBORAMA_OPTION_ENABLED = @WEBORAMA_OPTION_ENABLED@
-+WEBORAMA_OPTION_REQUESTED = @WEBORAMA_OPTION_REQUESTED@
-+YOUTUBE_OPTION_ENABLED = @YOUTUBE_OPTION_ENABLED@
-+YOUTUBE_OPTION_REQUESTED = @YOUTUBE_OPTION_REQUESTED@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+ZLIB_OPTION_ENABLED = @ZLIB_OPTION_ENABLED@
-+ZLIB_OPTION_REQUESTED = @ZLIB_OPTION_REQUESTED@
-+ZLIB_STATUS = @ZLIB_STATUS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+acx_pthread_config = @acx_pthread_config@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+curlconfig = @curlconfig@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+mt_libdvdnav_config = @mt_libdvdnav_config@
-+mt_mysql_config = @mt_mysql_config@
-+mt_taglib_config = @mt_taglib_config@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+EXTRA_DIST = gen_libmediatomb_src.sh
-+CLEANFILES = IUpnpErrFile.txt IUpnpInfoFile.txt
-+noinst_LIBRARIES = libmediatomb.a
-+libmediatomb_a_SOURCES = \
-+../src/action_request.cc \
-+../src/action_request.h \
-+../src/atrailers_content_handler.cc \
-+../src/atrailers_content_handler.h \
-+../src/atrailers_service.cc \
-+../src/atrailers_service.h \
-+../src/autoscan.cc \
-+../src/autoscan.h \
-+../src/autoscan_inotify.cc \
-+../src/autoscan_inotify.h \
-+../src/buffered_io_handler.cc \
-+../src/buffered_io_handler.h \
-+../src/cached_url.h \
-+../src/cached_url.cc \
-+../src/cds_objects.cc \
-+../src/cds_objects.h \
-+../src/cds_resource.cc \
-+../src/cds_resource.h \
-+../src/cds_resource_manager.cc \
-+../src/cds_resource_manager.h \
-+../src/common.h \
-+../src/config_manager.cc \
-+../src/config_manager.h \
-+../src/config_options.h \
-+../src/content_manager.cc \
-+../src/content_manager.h \
-+../src/curl_io_handler.cc \
-+../src/curl_io_handler.h \
-+../src/destroyer.cc \
-+../src/destroyer.h \
-+../src/dictionary.cc \
-+../src/dictionary.h \
-+../src/dvd_io_handler.cc \
-+../src/dvd_io_handler.h \
-+../src/dvdnav_read.cc \
-+../src/dvdnav_read.h \
-+../src/exceptions.cc \
-+../src/exceptions.h \
-+../src/executor.h \
-+../src/fd_io_handler.cc \
-+../src/fd_io_handler.h \
-+../src/file_io_handler.cc \
-+../src/file_io_handler.h \
-+../src/file_request_handler.cc \
-+../src/file_request_handler.h \
-+../src/filesystem.cc \
-+../src/filesystem.h \
-+../src/hash/dbb_hash.h \
-+../src/hash/db_hash.h \
-+../src/hash/dbo_hash.h \
-+../src/hash/dbr_hash.h \
-+../src/hash/direct_hash_base.h \
-+../src/hash/dsb_hash.h \
-+../src/hash/dso_hash.h \
-+../src/hash.h \
-+../src/inotify-nosys.h \
-+../src/io_handler_buffer_helper.cc \
-+../src/io_handler_buffer_helper.h \
-+../src/io_handler.cc \
-+../src/io_handler_chainer.cc \
-+../src/io_handler_chainer.h \
-+../src/io_handler.h \
-+../src/jpeg_resolution.cc \
-+../src/layout/fallback_layout.cc \
-+../src/layout/fallback_layout.h \
-+../src/layout/js_layout.cc \
-+../src/layout/js_layout.h \
-+../src/layout/layout.h \
-+../src/logger.cc \
-+../src/logger.h \
-+../src/main.cc \
-+../src/md5/md5.c \
-+../src/md5/md5.h \
-+../src/mem_io_handler.cc \
-+../src/mem_io_handler.h \
-+../src/memory.cc \
-+../src/memory.h \
-+../src/metadata/dvd_handler.cc \
-+../src/metadata/dvd_handler.h \
-+../src/metadata/exiv2_handler.cc \
-+../src/metadata/exiv2_handler.h \
-+../src/metadata/extractor_handler.cc \
-+../src/metadata/extractor_handler.h \
-+../src/metadata/ffmpeg_handler.cc \
-+../src/metadata/ffmpeg_handler.h \
-+../src/metadata_handler.cc \
-+../src/metadata_handler.h \
-+../src/metadata/id3_handler.cc \
-+../src/metadata/id3_handler.h \
-+../src/metadata/libexif_handler.cc \
-+../src/metadata/libexif_handler.h \
-+../src/metadata/libmp4v2_handler.cc \
-+../src/metadata/libmp4v2_handler.h \
-+../src/metadata/taglib_handler.cc \
-+../src/metadata/taglib_handler.h \
-+../src/mpegdemux/buffer.c \
-+../src/mpegdemux/buffer.h \
-+../src/mpegdemux/mpegdemux.c \
-+../src/mpegdemux/mpegdemux.h \
-+../src/mpegdemux/mpegdemux_internal.h \
-+../src/mpegdemux/mpeg_parse.c \
-+../src/mpegdemux/mpeg_parse.h \
-+../src/mpegdemux/mpeg_remux.c \
-+../src/mpegdemux/mpeg_remux.h \
-+../src/mpegremux_processor.cc \
-+../src/mpegremux_processor.h \
-+../src/mt_inotify.cc \
-+../src/mt_inotify.h \
-+../src/mxml/attribute.cc \
-+../src/mxml/attribute.h \
-+../src/mxml/comment.cc \
-+../src/mxml/comment.h \
-+../src/mxml/context.cc \
-+../src/mxml/context.h \
-+../src/mxml/element.cc \
-+../src/mxml/element.h \
-+../src/mxml/mxml.h \
-+../src/mxml/node.cc \
-+../src/mxml/node.h \
-+../src/mxml/parseexception.cc \
-+../src/mxml/parseexception.h \
-+../src/mxml/parser_expat.cc \
-+../src/mxml/parser.h \
-+../src/mxml/xml_text.cc \
-+../src/mxml/xml_text.h \
-+../src/mxml/xml_to_json.cc \
-+../src/mxml/xml_to_json.h \
-+../src/object_dictionary.h \
-+../src/online_service.cc \
-+../src/online_service.h \
-+../src/online_service_helper.cc \
-+../src/online_service_helper.h \
-+../src/play_hook.cc \
-+../src/play_hook.h \
-+../src/process.cc \
-+../src/process_executor.cc \
-+../src/process_executor.h \
-+../src/process.h \
-+../src/process_io_handler.cc \
-+../src/process_io_handler.h \
-+../src/reentrant_array.h \
-+../src/request_handler.cc \
-+../src/request_handler.h \
-+../src/rexp.cc \
-+../src/rexp.h \
-+../src/scripting/dvd_image_import_script.cc \
-+../src/scripting/dvd_image_import_script.h \
-+../src/scripting/import_script.cc \
-+../src/scripting/import_script.h \
-+../src/scripting/js_functions.cc \
-+../src/scripting/js_functions.h \
-+../src/scripting/playlist_parser_script.cc \
-+../src/scripting/playlist_parser_script.h \
-+../src/scripting/runtime.cc \
-+../src/scripting/runtime.h \
-+../src/scripting/script.cc \
-+../src/scripting/script.h \
-+../src/server.cc \
-+../src/serve_request_handler.cc \
-+../src/serve_request_handler.h \
-+../src/server.h \
-+../src/session_manager.cc \
-+../src/session_manager.h \
-+../src/singleton.cc \
-+../src/singleton.h \
-+../src/sopcast_content_handler.cc \
-+../src/sopcast_content_handler.h \
-+../src/sopcast_service.cc \
-+../src/sopcast_service.h \
-+../src/storage/cache_object.cc \
-+../src/storage/cache_object.h \
-+../src/storage.cc \
-+../src/storage.h \
-+../src/storage/mysql/mysql_create_sql.h \
-+../src/storage/mysql/mysql_storage.cc \
-+../src/storage/mysql/mysql_storage.h \
-+../src/storage/sqlite3/sqlite3_create_sql.h \
-+../src/storage/sqlite3/sqlite3_storage.cc \
-+../src/storage/sqlite3/sqlite3_storage.h \
-+../src/storage/sql_storage.cc \
-+../src/storage/sql_storage.h \
-+../src/storage/storage_cache.cc \
-+../src/storage/storage_cache.h \
-+../src/string_converter.cc \
-+../src/string_converter.h \
-+../src/subscription_request.cc \
-+../src/subscription_request.h \
-+../src/sync.cc \
-+../src/sync.h \
-+../src/thread_executor.cc \
-+../src/thread_executor.h \
-+../src/timer.cc \
-+../src/timer.h \
-+../src/tools.cc \
-+../src/tools.h \
-+../src/transcoding/transcode_dispatcher.cc \
-+../src/transcoding/transcode_dispatcher.h \
-+../src/transcoding/transcode_ext_handler.cc \
-+../src/transcoding/transcode_ext_handler.h \
-+../src/transcoding/transcode_handler.h \
-+../src/transcoding/transcoding.cc \
-+../src/transcoding/transcoding.h \
-+../src/transcoding/transcoding_process_executor.cc \
-+../src/transcoding/transcoding_process_executor.h \
-+../src/update_manager.cc \
-+../src/update_manager.h \
-+../src/upnp_cds_actions.cc \
-+../src/upnp_cds.cc \
-+../src/upnp_cds.h \
-+../src/upnp_cds_subscriptions.cc \
-+../src/upnp_cm_actions.cc \
-+../src/upnp_cm.cc \
-+../src/upnp_cm.h \
-+../src/upnp_cm_subscriptions.cc \
-+../src/upnp_mrreg_actions.cc \
-+../src/upnp_mrreg.cc \
-+../src/upnp_mrreg.h \
-+../src/upnp_mrreg_subscriptions.cc \
-+../src/upnp_xml.cc \
-+../src/upnp_xml.h \
-+../src/url.cc \
-+../src/url.h \
-+../src/url_request_handler.cc \
-+../src/url_request_handler.h \
-+../src/uuid/clear.c \
-+../src/uuid/compare.c \
-+../src/uuid/copy.c \
-+../src/uuid/gen_uuid.c \
-+../src/uuid/isnull.c \
-+../src/uuid/pack.c \
-+../src/uuid/parse.c \
-+../src/uuid/unpack.c \
-+../src/uuid/unparse.c \
-+../src/uuid/uuid.h \
-+../src/uuid/uuidP.h \
-+../src/uuid/uuid_time.c \
-+../src/uuid/uuid_types.h \
-+../src/web/action.cc \
-+../src/web/add.cc \
-+../src/web/add_object.cc \
-+../src/web/auth.cc \
-+../src/web_callbacks.cc \
-+../src/web_callbacks.h \
-+../src/web/containers.cc \
-+../src/web/directories.cc \
-+../src/web/edit_load.cc \
-+../src/web/edit_save.cc \
-+../src/web/files.cc \
-+../src/web/items.cc \
-+../src/weborama_content_handler.cc \
-+../src/weborama_content_handler.h \
-+../src/weborama_service.cc \
-+../src/weborama_service.h \
-+../src/web/pages.cc \
-+../src/web/pages.h \
-+../src/web/remove.cc \
-+../src/web_request_handler.cc \
-+../src/web_request_handler.h \
-+../src/web/tasks.cc \
-+../src/web/web_autoscan.cc \
-+../src/web/web_update.cc \
-+../src/xpath.cc \
-+../src/xpath.h \
-+../src/youtube_content_handler.cc \
-+../src/youtube_content_handler.h \
-+../src/youtube_service.cc \
-+../src/youtube_service.h \
-+../src/youtube_video_url.cc \
-+../src/youtube_video_url.h \
-+../src/zmm/atomic.h \
-+../src/zmmf/array.cc \
-+../src/zmmf/array.h \
-+../src/zmmf/base_array.h \
-+../src/zmmf/base_queue.h \
-+../src/zmmf/base_stack.h \
-+../src/zmmf/exception.cc \
-+../src/zmmf/exception.h \
-+../src/zmmf/object_queue.h \
-+../src/zmmf/object_stack.h \
-+../src/zmmf/stringtokenizer.cc \
-+../src/zmmf/stringtokenizer.h \
-+../src/zmmf/zmmf.h \
-+../src/zmm/nil.cc \
-+../src/zmm/nil.h \
-+../src/zmm/null.h \
-+../src/zmm/object.cc \
-+../src/zmm/object.h \
-+../src/zmm/ref.h \
-+../src/zmm/stringbuffer.cc \
-+../src/zmm/stringbuffer.h \
-+../src/zmm/strings.cc \
-+../src/zmm/strings.h \
-+../src/zmm/zmm.h \
-+dummy.h
-+
-+libmediatomb_a_CXXFLAGS = \
-+                     -I$(top_srcdir)/src \
-+                     -I$(top_srcdir)/tombupnp/ixml/inc \
-+                     -I$(top_srcdir)/tombupnp/threadutil/inc \
-+                     -I$(top_srcdir)/tombupnp/upnp/inc \
-+                     -I$(top_srcdir) \
-+                     $(SQLITE3_CFLAGS) \
-+                     $(MYSQL_CFLAGS) \
-+                     $(JS_CXXFLAGS) \
-+                     $(TAGLIB_CFLAGS) \
-+                     $(LIBEXTRACTOR_CFLAGS) \
-+                     $(ICONV_CXXFLAGS) \
-+                     $(LIBMAGIC_CFLAGS) \
-+                     $(ID3LIB_CFLAGS) \
-+                     $(LIBEXIF_CFLAGS) \
-+                     $(ZLIB_CFLAGS) \
-+                     $(PTHREAD_CFLAGS) \
-+                     $(INOTIFY_CFLAGS) \
-+                     $(FFMPEG_CFLAGS) \
-+                     $(FFMPEGTHUMBNAILER_CFLAGS) \
-+                     $(CURL_CFLAGS) \
-+                     $(EXPAT_CFLAGS) \
-+                     $(LIBMP4V2_CFLAGS) \
-+                     $(LIBDVDNAV_CFLAGS)
-+
-+mediatomb_SOURCES = $(top_srcdir)/src/main.cc
-+mediatomb_CXXFLAGS = -I$(top_srcdir)/src \
-+                     -I$(top_srcdir)/tombupnp/ixml/inc \
-+                     -I$(top_srcdir)/tombupnp/threadutil/inc \
-+                     -I$(top_srcdir)/tombupnp/upnp/inc \
-+                     -I$(top_srcdir) \
-+                     $(SQLITE3_CFLAGS) \
-+                     $(MYSQL_CFLAGS) \
-+                     $(JS_CXXFLAGS) \
-+                     $(TAGLIB_CFLAGS) \
-+                     $(LIBEXTRACTOR_CFLAGS) \
-+                     $(ICONV_CXXFLAGS) \
-+                     $(LIBMAGIC_CFLAGS) \
-+                     $(ID3LIB_CFLAGS) \
-+                     $(LIBEXIF_CFLAGS) \
-+                     $(ZLIB_CFLAGS) \
-+                     $(PTHREAD_CFLAGS) \
-+                     $(INOTIFY_CFLAGS) \
-+                     $(FFMPEG_CFLAGS) \
-+                     $(FFMPEGTHUMBNAILER_CFLAGS) \
-+                     $(CURL_CFLAGS) \
-+                     $(EXPAT_CFLAGS) \
-+                     $(LIBMP4V2_CFLAGS) \
-+                     $(LIBDVDNAV_CFLAGS)
-+
-+mediatomb_LDADD = \
-+    libmediatomb.a \
-+    $(top_srcdir)/tombupnp/build/libtombupnp.a \
-+    $(LIBEXIF_LDFLAGS) \
-+    $(ZLIB_LDFLAGS) \
-+    $(EXPAT_LDFLAGS) \
-+    $(RT_LDFLAGS) \
-+    $(SQLITE3_LDFLAGS) \
-+    $(LIBMP4V2_LDFLAGS) \
-+    $(LIBMAGIC_LDFLAGS) \
-+    $(PTHREAD_LDFLAGS) \
-+    $(LIBDVDNAV_LDFLAGS) \
-+    $(LIBEXTRACTOR_LDFLAGS) \
-+    $(FFMPEG_LDFLAGS) \
-+    $(FFMPEGTHUMBNAILER_LDFLAGS) \
-+    $(ICONV_LIBS) \
-+    $(SQLITE3_LIBS) \
-+    $(MYSQL_LIBS) \
-+    $(TAGLIB_LIBS) \
-+    $(LIBEXTRACTOR_LIBS) \
-+    $(JS_LIBS) \
-+    $(LIBMAGIC_LIBS) \
-+    $(ID3LIB_LIBS) \
-+    $(LIBEXIF_LIBS) \
-+    $(Z_LIBS) \
-+    $(RT_LIBS) \
-+    $(PTHREAD_CFLAGS) \
-+    $(PTHREAD_LIBS) \
-+    $(FFMPEG_LIBS) \
-+    $(FFMPEGTHUMBNAILER_LIBS) \
-+    $(EXPAT_LIBS) \
-+    $(LIBMP4V2_LIBS) \
-+    $(NSL_LIBS) \
-+    $(LWRES_LIBS) \
-+    $(LIBDVDNAV_LIBS) \
-+    $(CURL_LIBS)
-+
-+all: all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .cc .o .obj
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/libmediatomb_src $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu build/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+
-+clean-noinstLIBRARIES:
-+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-+libmediatomb.a: $(libmediatomb_a_OBJECTS) $(libmediatomb_a_DEPENDENCIES) 
-+	-rm -f libmediatomb.a
-+	$(libmediatomb_a_AR) libmediatomb.a $(libmediatomb_a_OBJECTS) $(libmediatomb_a_LIBADD)
-+	$(RANLIB) libmediatomb.a
-+install-binPROGRAMS: $(bin_PROGRAMS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+	for p in $$list; do echo "$$p $$p"; done | \
-+	sed 's/$(EXEEXT)$$//' | \
-+	while read p p1; do if test -f $$p; \
-+	  then echo "$$p"; echo "$$p"; else :; fi; \
-+	done | \
-+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
-+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
-+	sed 'N;N;N;s,\n, ,g' | \
-+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
-+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
-+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
-+	    else { print "f", $$3 "/" $$4, $$1; } } \
-+	  END { for (d in files) print "f", d, files[d] }' | \
-+	while read type dir files; do \
-+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
-+	    test -z "$$files" || { \
-+	      echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
-+	      $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
-+	    } \
-+	; done
-+
-+uninstall-binPROGRAMS:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-+	files=`for p in $$list; do echo "$$p"; done | \
-+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
-+	      -e 's/$$/$(EXEEXT)/' `; \
-+	test -n "$$list" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
-+
-+clean-binPROGRAMS:
-+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-+mediatomb$(EXEEXT): $(mediatomb_OBJECTS) $(mediatomb_DEPENDENCIES) 
-+	@rm -f mediatomb$(EXEEXT)
-+	$(mediatomb_LINK) $(mediatomb_OBJECTS) $(mediatomb_LDADD) $(LIBS)
-+
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/buffer.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/clear.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/compare.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/copy.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gen_uuid.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/isnull.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-action.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-action_request.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-add.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-add_object.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-array.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-atrailers_content_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-atrailers_service.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-attribute.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-auth.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-autoscan.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-autoscan_inotify.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-buffered_io_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-cache_object.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-cached_url.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-cds_objects.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-cds_resource.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-cds_resource_manager.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-comment.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-config_manager.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-containers.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-content_manager.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-context.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-curl_io_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-destroyer.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-dictionary.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-directories.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-dvd_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-dvd_image_import_script.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-dvd_io_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-dvdnav_read.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-edit_load.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-edit_save.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-element.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-exception.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-exceptions.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-exiv2_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-extractor_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-fallback_layout.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-fd_io_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-ffmpeg_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-file_io_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-file_request_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-files.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-filesystem.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-id3_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-import_script.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-io_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-io_handler_buffer_helper.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-io_handler_chainer.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-items.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-jpeg_resolution.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-js_functions.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-js_layout.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-libexif_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-libmp4v2_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-logger.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-main.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-mem_io_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-memory.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-metadata_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-mpegremux_processor.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-mt_inotify.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-mysql_storage.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-nil.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-node.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-object.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-online_service.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-online_service_helper.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-pages.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-parseexception.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-parser_expat.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-play_hook.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-playlist_parser_script.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-process.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-process_executor.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-process_io_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-remove.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-request_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-rexp.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-runtime.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-script.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-serve_request_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-server.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-session_manager.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-singleton.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-sopcast_content_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-sopcast_service.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-sql_storage.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-sqlite3_storage.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-storage.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-storage_cache.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-string_converter.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-stringbuffer.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-strings.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-stringtokenizer.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-subscription_request.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-sync.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-taglib_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-tasks.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-thread_executor.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-timer.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-tools.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-transcode_dispatcher.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-transcode_ext_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-transcoding.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-transcoding_process_executor.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-update_manager.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-upnp_cds.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-upnp_cds_actions.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-upnp_cds_subscriptions.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-upnp_cm.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-upnp_cm_actions.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-upnp_cm_subscriptions.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-upnp_mrreg.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-upnp_mrreg_actions.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-upnp_mrreg_subscriptions.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-upnp_xml.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-url.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-url_request_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-web_autoscan.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-web_callbacks.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-web_request_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-web_update.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-weborama_content_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-weborama_service.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-xml_text.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-xml_to_json.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-xpath.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-youtube_content_handler.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-youtube_service.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libmediatomb_a-youtube_video_url.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/md5.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mediatomb-main.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpeg_parse.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpeg_remux.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mpegdemux.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/pack.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parse.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/unpack.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/unparse.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uuid_time.Po at am__quote@
-+
-+.c.o:
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
-+
-+.c.obj:
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+md5.o: ../src/md5/md5.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.o -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.o `test -f '../src/md5/md5.c' || echo '$(srcdir)/'`../src/md5/md5.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/md5/md5.c' object='md5.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.o `test -f '../src/md5/md5.c' || echo '$(srcdir)/'`../src/md5/md5.c
-+
-+md5.obj: ../src/md5/md5.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT md5.obj -MD -MP -MF $(DEPDIR)/md5.Tpo -c -o md5.obj `if test -f '../src/md5/md5.c'; then $(CYGPATH_W) '../src/md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/../src/md5/md5.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/md5.Tpo $(DEPDIR)/md5.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/md5/md5.c' object='md5.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o md5.obj `if test -f '../src/md5/md5.c'; then $(CYGPATH_W) '../src/md5/md5.c'; else $(CYGPATH_W) '$(srcdir)/../src/md5/md5.c'; fi`
-+
-+buffer.o: ../src/mpegdemux/buffer.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT buffer.o -MD -MP -MF $(DEPDIR)/buffer.Tpo -c -o buffer.o `test -f '../src/mpegdemux/buffer.c' || echo '$(srcdir)/'`../src/mpegdemux/buffer.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/buffer.Tpo $(DEPDIR)/buffer.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/mpegdemux/buffer.c' object='buffer.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o buffer.o `test -f '../src/mpegdemux/buffer.c' || echo '$(srcdir)/'`../src/mpegdemux/buffer.c
-+
-+buffer.obj: ../src/mpegdemux/buffer.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT buffer.obj -MD -MP -MF $(DEPDIR)/buffer.Tpo -c -o buffer.obj `if test -f '../src/mpegdemux/buffer.c'; then $(CYGPATH_W) '../src/mpegdemux/buffer.c'; else $(CYGPATH_W) '$(srcdir)/../src/mpegdemux/buffer.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/buffer.Tpo $(DEPDIR)/buffer.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/mpegdemux/buffer.c' object='buffer.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o buffer.obj `if test -f '../src/mpegdemux/buffer.c'; then $(CYGPATH_W) '../src/mpegdemux/buffer.c'; else $(CYGPATH_W) '$(srcdir)/../src/mpegdemux/buffer.c'; fi`
-+
-+mpegdemux.o: ../src/mpegdemux/mpegdemux.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpegdemux.o -MD -MP -MF $(DEPDIR)/mpegdemux.Tpo -c -o mpegdemux.o `test -f '../src/mpegdemux/mpegdemux.c' || echo '$(srcdir)/'`../src/mpegdemux/mpegdemux.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpegdemux.Tpo $(DEPDIR)/mpegdemux.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/mpegdemux/mpegdemux.c' object='mpegdemux.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpegdemux.o `test -f '../src/mpegdemux/mpegdemux.c' || echo '$(srcdir)/'`../src/mpegdemux/mpegdemux.c
-+
-+mpegdemux.obj: ../src/mpegdemux/mpegdemux.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpegdemux.obj -MD -MP -MF $(DEPDIR)/mpegdemux.Tpo -c -o mpegdemux.obj `if test -f '../src/mpegdemux/mpegdemux.c'; then $(CYGPATH_W) '../src/mpegdemux/mpegdemux.c'; else $(CYGPATH_W) '$(srcdir)/../src/mpegdemux/mpegdemux.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpegdemux.Tpo $(DEPDIR)/mpegdemux.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/mpegdemux/mpegdemux.c' object='mpegdemux.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpegdemux.obj `if test -f '../src/mpegdemux/mpegdemux.c'; then $(CYGPATH_W) '../src/mpegdemux/mpegdemux.c'; else $(CYGPATH_W) '$(srcdir)/../src/mpegdemux/mpegdemux.c'; fi`
-+
-+mpeg_parse.o: ../src/mpegdemux/mpeg_parse.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpeg_parse.o -MD -MP -MF $(DEPDIR)/mpeg_parse.Tpo -c -o mpeg_parse.o `test -f '../src/mpegdemux/mpeg_parse.c' || echo '$(srcdir)/'`../src/mpegdemux/mpeg_parse.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpeg_parse.Tpo $(DEPDIR)/mpeg_parse.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/mpegdemux/mpeg_parse.c' object='mpeg_parse.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpeg_parse.o `test -f '../src/mpegdemux/mpeg_parse.c' || echo '$(srcdir)/'`../src/mpegdemux/mpeg_parse.c
-+
-+mpeg_parse.obj: ../src/mpegdemux/mpeg_parse.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpeg_parse.obj -MD -MP -MF $(DEPDIR)/mpeg_parse.Tpo -c -o mpeg_parse.obj `if test -f '../src/mpegdemux/mpeg_parse.c'; then $(CYGPATH_W) '../src/mpegdemux/mpeg_parse.c'; else $(CYGPATH_W) '$(srcdir)/../src/mpegdemux/mpeg_parse.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpeg_parse.Tpo $(DEPDIR)/mpeg_parse.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/mpegdemux/mpeg_parse.c' object='mpeg_parse.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpeg_parse.obj `if test -f '../src/mpegdemux/mpeg_parse.c'; then $(CYGPATH_W) '../src/mpegdemux/mpeg_parse.c'; else $(CYGPATH_W) '$(srcdir)/../src/mpegdemux/mpeg_parse.c'; fi`
-+
-+mpeg_remux.o: ../src/mpegdemux/mpeg_remux.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpeg_remux.o -MD -MP -MF $(DEPDIR)/mpeg_remux.Tpo -c -o mpeg_remux.o `test -f '../src/mpegdemux/mpeg_remux.c' || echo '$(srcdir)/'`../src/mpegdemux/mpeg_remux.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpeg_remux.Tpo $(DEPDIR)/mpeg_remux.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/mpegdemux/mpeg_remux.c' object='mpeg_remux.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpeg_remux.o `test -f '../src/mpegdemux/mpeg_remux.c' || echo '$(srcdir)/'`../src/mpegdemux/mpeg_remux.c
-+
-+mpeg_remux.obj: ../src/mpegdemux/mpeg_remux.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mpeg_remux.obj -MD -MP -MF $(DEPDIR)/mpeg_remux.Tpo -c -o mpeg_remux.obj `if test -f '../src/mpegdemux/mpeg_remux.c'; then $(CYGPATH_W) '../src/mpegdemux/mpeg_remux.c'; else $(CYGPATH_W) '$(srcdir)/../src/mpegdemux/mpeg_remux.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/mpeg_remux.Tpo $(DEPDIR)/mpeg_remux.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/mpegdemux/mpeg_remux.c' object='mpeg_remux.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mpeg_remux.obj `if test -f '../src/mpegdemux/mpeg_remux.c'; then $(CYGPATH_W) '../src/mpegdemux/mpeg_remux.c'; else $(CYGPATH_W) '$(srcdir)/../src/mpegdemux/mpeg_remux.c'; fi`
-+
-+clear.o: ../src/uuid/clear.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clear.o -MD -MP -MF $(DEPDIR)/clear.Tpo -c -o clear.o `test -f '../src/uuid/clear.c' || echo '$(srcdir)/'`../src/uuid/clear.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/clear.Tpo $(DEPDIR)/clear.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/clear.c' object='clear.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clear.o `test -f '../src/uuid/clear.c' || echo '$(srcdir)/'`../src/uuid/clear.c
-+
-+clear.obj: ../src/uuid/clear.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT clear.obj -MD -MP -MF $(DEPDIR)/clear.Tpo -c -o clear.obj `if test -f '../src/uuid/clear.c'; then $(CYGPATH_W) '../src/uuid/clear.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/clear.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/clear.Tpo $(DEPDIR)/clear.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/clear.c' object='clear.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o clear.obj `if test -f '../src/uuid/clear.c'; then $(CYGPATH_W) '../src/uuid/clear.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/clear.c'; fi`
-+
-+compare.o: ../src/uuid/compare.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compare.o -MD -MP -MF $(DEPDIR)/compare.Tpo -c -o compare.o `test -f '../src/uuid/compare.c' || echo '$(srcdir)/'`../src/uuid/compare.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/compare.Tpo $(DEPDIR)/compare.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/compare.c' object='compare.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compare.o `test -f '../src/uuid/compare.c' || echo '$(srcdir)/'`../src/uuid/compare.c
-+
-+compare.obj: ../src/uuid/compare.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT compare.obj -MD -MP -MF $(DEPDIR)/compare.Tpo -c -o compare.obj `if test -f '../src/uuid/compare.c'; then $(CYGPATH_W) '../src/uuid/compare.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/compare.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/compare.Tpo $(DEPDIR)/compare.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/compare.c' object='compare.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compare.obj `if test -f '../src/uuid/compare.c'; then $(CYGPATH_W) '../src/uuid/compare.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/compare.c'; fi`
-+
-+copy.o: ../src/uuid/copy.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT copy.o -MD -MP -MF $(DEPDIR)/copy.Tpo -c -o copy.o `test -f '../src/uuid/copy.c' || echo '$(srcdir)/'`../src/uuid/copy.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/copy.Tpo $(DEPDIR)/copy.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/copy.c' object='copy.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o copy.o `test -f '../src/uuid/copy.c' || echo '$(srcdir)/'`../src/uuid/copy.c
-+
-+copy.obj: ../src/uuid/copy.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT copy.obj -MD -MP -MF $(DEPDIR)/copy.Tpo -c -o copy.obj `if test -f '../src/uuid/copy.c'; then $(CYGPATH_W) '../src/uuid/copy.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/copy.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/copy.Tpo $(DEPDIR)/copy.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/copy.c' object='copy.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o copy.obj `if test -f '../src/uuid/copy.c'; then $(CYGPATH_W) '../src/uuid/copy.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/copy.c'; fi`
-+
-+gen_uuid.o: ../src/uuid/gen_uuid.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gen_uuid.o -MD -MP -MF $(DEPDIR)/gen_uuid.Tpo -c -o gen_uuid.o `test -f '../src/uuid/gen_uuid.c' || echo '$(srcdir)/'`../src/uuid/gen_uuid.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gen_uuid.Tpo $(DEPDIR)/gen_uuid.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/gen_uuid.c' object='gen_uuid.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gen_uuid.o `test -f '../src/uuid/gen_uuid.c' || echo '$(srcdir)/'`../src/uuid/gen_uuid.c
-+
-+gen_uuid.obj: ../src/uuid/gen_uuid.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gen_uuid.obj -MD -MP -MF $(DEPDIR)/gen_uuid.Tpo -c -o gen_uuid.obj `if test -f '../src/uuid/gen_uuid.c'; then $(CYGPATH_W) '../src/uuid/gen_uuid.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/gen_uuid.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/gen_uuid.Tpo $(DEPDIR)/gen_uuid.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/gen_uuid.c' object='gen_uuid.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gen_uuid.obj `if test -f '../src/uuid/gen_uuid.c'; then $(CYGPATH_W) '../src/uuid/gen_uuid.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/gen_uuid.c'; fi`
-+
-+isnull.o: ../src/uuid/isnull.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT isnull.o -MD -MP -MF $(DEPDIR)/isnull.Tpo -c -o isnull.o `test -f '../src/uuid/isnull.c' || echo '$(srcdir)/'`../src/uuid/isnull.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/isnull.Tpo $(DEPDIR)/isnull.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/isnull.c' object='isnull.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o isnull.o `test -f '../src/uuid/isnull.c' || echo '$(srcdir)/'`../src/uuid/isnull.c
-+
-+isnull.obj: ../src/uuid/isnull.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT isnull.obj -MD -MP -MF $(DEPDIR)/isnull.Tpo -c -o isnull.obj `if test -f '../src/uuid/isnull.c'; then $(CYGPATH_W) '../src/uuid/isnull.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/isnull.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/isnull.Tpo $(DEPDIR)/isnull.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/isnull.c' object='isnull.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o isnull.obj `if test -f '../src/uuid/isnull.c'; then $(CYGPATH_W) '../src/uuid/isnull.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/isnull.c'; fi`
-+
-+pack.o: ../src/uuid/pack.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pack.o -MD -MP -MF $(DEPDIR)/pack.Tpo -c -o pack.o `test -f '../src/uuid/pack.c' || echo '$(srcdir)/'`../src/uuid/pack.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pack.Tpo $(DEPDIR)/pack.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/pack.c' object='pack.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pack.o `test -f '../src/uuid/pack.c' || echo '$(srcdir)/'`../src/uuid/pack.c
-+
-+pack.obj: ../src/uuid/pack.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT pack.obj -MD -MP -MF $(DEPDIR)/pack.Tpo -c -o pack.obj `if test -f '../src/uuid/pack.c'; then $(CYGPATH_W) '../src/uuid/pack.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/pack.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/pack.Tpo $(DEPDIR)/pack.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/pack.c' object='pack.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pack.obj `if test -f '../src/uuid/pack.c'; then $(CYGPATH_W) '../src/uuid/pack.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/pack.c'; fi`
-+
-+parse.o: ../src/uuid/parse.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parse.o -MD -MP -MF $(DEPDIR)/parse.Tpo -c -o parse.o `test -f '../src/uuid/parse.c' || echo '$(srcdir)/'`../src/uuid/parse.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/parse.Tpo $(DEPDIR)/parse.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/parse.c' object='parse.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o parse.o `test -f '../src/uuid/parse.c' || echo '$(srcdir)/'`../src/uuid/parse.c
-+
-+parse.obj: ../src/uuid/parse.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT parse.obj -MD -MP -MF $(DEPDIR)/parse.Tpo -c -o parse.obj `if test -f '../src/uuid/parse.c'; then $(CYGPATH_W) '../src/uuid/parse.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/parse.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/parse.Tpo $(DEPDIR)/parse.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/parse.c' object='parse.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o parse.obj `if test -f '../src/uuid/parse.c'; then $(CYGPATH_W) '../src/uuid/parse.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/parse.c'; fi`
-+
-+unpack.o: ../src/uuid/unpack.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unpack.o -MD -MP -MF $(DEPDIR)/unpack.Tpo -c -o unpack.o `test -f '../src/uuid/unpack.c' || echo '$(srcdir)/'`../src/uuid/unpack.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/unpack.Tpo $(DEPDIR)/unpack.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/unpack.c' object='unpack.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unpack.o `test -f '../src/uuid/unpack.c' || echo '$(srcdir)/'`../src/uuid/unpack.c
-+
-+unpack.obj: ../src/uuid/unpack.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unpack.obj -MD -MP -MF $(DEPDIR)/unpack.Tpo -c -o unpack.obj `if test -f '../src/uuid/unpack.c'; then $(CYGPATH_W) '../src/uuid/unpack.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/unpack.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/unpack.Tpo $(DEPDIR)/unpack.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/unpack.c' object='unpack.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unpack.obj `if test -f '../src/uuid/unpack.c'; then $(CYGPATH_W) '../src/uuid/unpack.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/unpack.c'; fi`
-+
-+unparse.o: ../src/uuid/unparse.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unparse.o -MD -MP -MF $(DEPDIR)/unparse.Tpo -c -o unparse.o `test -f '../src/uuid/unparse.c' || echo '$(srcdir)/'`../src/uuid/unparse.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/unparse.Tpo $(DEPDIR)/unparse.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/unparse.c' object='unparse.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unparse.o `test -f '../src/uuid/unparse.c' || echo '$(srcdir)/'`../src/uuid/unparse.c
-+
-+unparse.obj: ../src/uuid/unparse.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT unparse.obj -MD -MP -MF $(DEPDIR)/unparse.Tpo -c -o unparse.obj `if test -f '../src/uuid/unparse.c'; then $(CYGPATH_W) '../src/uuid/unparse.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/unparse.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/unparse.Tpo $(DEPDIR)/unparse.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/unparse.c' object='unparse.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o unparse.obj `if test -f '../src/uuid/unparse.c'; then $(CYGPATH_W) '../src/uuid/unparse.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/unparse.c'; fi`
-+
-+uuid_time.o: ../src/uuid/uuid_time.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uuid_time.o -MD -MP -MF $(DEPDIR)/uuid_time.Tpo -c -o uuid_time.o `test -f '../src/uuid/uuid_time.c' || echo '$(srcdir)/'`../src/uuid/uuid_time.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/uuid_time.Tpo $(DEPDIR)/uuid_time.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/uuid_time.c' object='uuid_time.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uuid_time.o `test -f '../src/uuid/uuid_time.c' || echo '$(srcdir)/'`../src/uuid/uuid_time.c
-+
-+uuid_time.obj: ../src/uuid/uuid_time.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT uuid_time.obj -MD -MP -MF $(DEPDIR)/uuid_time.Tpo -c -o uuid_time.obj `if test -f '../src/uuid/uuid_time.c'; then $(CYGPATH_W) '../src/uuid/uuid_time.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/uuid_time.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/uuid_time.Tpo $(DEPDIR)/uuid_time.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../src/uuid/uuid_time.c' object='uuid_time.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uuid_time.obj `if test -f '../src/uuid/uuid_time.c'; then $(CYGPATH_W) '../src/uuid/uuid_time.c'; else $(CYGPATH_W) '$(srcdir)/../src/uuid/uuid_time.c'; fi`
-+
-+.cc.o:
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
-+
-+.cc.obj:
-+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-+
-+libmediatomb_a-action_request.o: ../src/action_request.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-action_request.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-action_request.Tpo -c -o libmediatomb_a-action_request.o `test -f '../src/action_request.cc' || echo '$(srcdir)/'`../src/action_request.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-action_request.Tpo $(DEPDIR)/libmediatomb_a-action_request.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/action_request.cc' object='libmediatomb_a-action_request.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-action_request.o `test -f '../src/action_request.cc' || echo '$(srcdir)/'`../src/action_request.cc
-+
-+libmediatomb_a-action_request.obj: ../src/action_request.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-action_request.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-action_request.Tpo -c -o libmediatomb_a-action_request.obj `if test -f '../src/action_request.cc'; then $(CYGPATH_W) '../src/action_request.cc'; else $(CYGPATH_W) '$(srcdir)/../src/action_request.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-action_request.Tpo $(DEPDIR)/libmediatomb_a-action_request.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/action_request.cc' object='libmediatomb_a-action_request.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-action_request.obj `if test -f '../src/action_request.cc'; then $(CYGPATH_W) '../src/action_request.cc'; else $(CYGPATH_W) '$(srcdir)/../src/action_request.cc'; fi`
-+
-+libmediatomb_a-atrailers_content_handler.o: ../src/atrailers_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-atrailers_content_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-atrailers_content_handler.Tpo -c -o libmediatomb_a-atrailers_content_handler.o `test -f '../src/atrailers_content_handler.cc' || echo '$(srcdir)/'`../src/atrailers_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-atrailers_content_handler.Tpo $(DEPDIR)/libmediatomb_a-atrailers_content_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/atrailers_content_handler.cc' object='libmediatomb_a-atrailers_content_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-atrailers_content_handler.o `test -f '../src/atrailers_content_handler.cc' || echo '$(srcdir)/'`../src/atrailers_content_handler.cc
-+
-+libmediatomb_a-atrailers_content_handler.obj: ../src/atrailers_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-atrailers_content_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-atrailers_content_handler.Tpo -c -o libmediatomb_a-atrailers_content_handler.obj `if test -f '../src/atrailers_content_handler.cc'; then $(CYGPATH_W) '../src/atrailers_content_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/atrailers_content_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-atrailers_content_handler.Tpo $(DEPDIR)/libmediatomb_a-atrailers_content_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/atrailers_content_handler.cc' object='libmediatomb_a-atrailers_content_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-atrailers_content_handler.obj `if test -f '../src/atrailers_content_handler.cc'; then $(CYGPATH_W) '../src/atrailers_content_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/atrailers_content_handler.cc'; fi`
-+
-+libmediatomb_a-atrailers_service.o: ../src/atrailers_service.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-atrailers_service.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-atrailers_service.Tpo -c -o libmediatomb_a-atrailers_service.o `test -f '../src/atrailers_service.cc' || echo '$(srcdir)/'`../src/atrailers_service.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-atrailers_service.Tpo $(DEPDIR)/libmediatomb_a-atrailers_service.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/atrailers_service.cc' object='libmediatomb_a-atrailers_service.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-atrailers_service.o `test -f '../src/atrailers_service.cc' || echo '$(srcdir)/'`../src/atrailers_service.cc
-+
-+libmediatomb_a-atrailers_service.obj: ../src/atrailers_service.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-atrailers_service.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-atrailers_service.Tpo -c -o libmediatomb_a-atrailers_service.obj `if test -f '../src/atrailers_service.cc'; then $(CYGPATH_W) '../src/atrailers_service.cc'; else $(CYGPATH_W) '$(srcdir)/../src/atrailers_service.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-atrailers_service.Tpo $(DEPDIR)/libmediatomb_a-atrailers_service.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/atrailers_service.cc' object='libmediatomb_a-atrailers_service.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-atrailers_service.obj `if test -f '../src/atrailers_service.cc'; then $(CYGPATH_W) '../src/atrailers_service.cc'; else $(CYGPATH_W) '$(srcdir)/../src/atrailers_service.cc'; fi`
-+
-+libmediatomb_a-autoscan.o: ../src/autoscan.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-autoscan.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-autoscan.Tpo -c -o libmediatomb_a-autoscan.o `test -f '../src/autoscan.cc' || echo '$(srcdir)/'`../src/autoscan.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-autoscan.Tpo $(DEPDIR)/libmediatomb_a-autoscan.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/autoscan.cc' object='libmediatomb_a-autoscan.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-autoscan.o `test -f '../src/autoscan.cc' || echo '$(srcdir)/'`../src/autoscan.cc
-+
-+libmediatomb_a-autoscan.obj: ../src/autoscan.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-autoscan.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-autoscan.Tpo -c -o libmediatomb_a-autoscan.obj `if test -f '../src/autoscan.cc'; then $(CYGPATH_W) '../src/autoscan.cc'; else $(CYGPATH_W) '$(srcdir)/../src/autoscan.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-autoscan.Tpo $(DEPDIR)/libmediatomb_a-autoscan.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/autoscan.cc' object='libmediatomb_a-autoscan.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-autoscan.obj `if test -f '../src/autoscan.cc'; then $(CYGPATH_W) '../src/autoscan.cc'; else $(CYGPATH_W) '$(srcdir)/../src/autoscan.cc'; fi`
-+
-+libmediatomb_a-autoscan_inotify.o: ../src/autoscan_inotify.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-autoscan_inotify.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-autoscan_inotify.Tpo -c -o libmediatomb_a-autoscan_inotify.o `test -f '../src/autoscan_inotify.cc' || echo '$(srcdir)/'`../src/autoscan_inotify.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-autoscan_inotify.Tpo $(DEPDIR)/libmediatomb_a-autoscan_inotify.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/autoscan_inotify.cc' object='libmediatomb_a-autoscan_inotify.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-autoscan_inotify.o `test -f '../src/autoscan_inotify.cc' || echo '$(srcdir)/'`../src/autoscan_inotify.cc
-+
-+libmediatomb_a-autoscan_inotify.obj: ../src/autoscan_inotify.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-autoscan_inotify.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-autoscan_inotify.Tpo -c -o libmediatomb_a-autoscan_inotify.obj `if test -f '../src/autoscan_inotify.cc'; then $(CYGPATH_W) '../src/autoscan_inotify.cc'; else $(CYGPATH_W) '$(srcdir)/../src/autoscan_inotify.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-autoscan_inotify.Tpo $(DEPDIR)/libmediatomb_a-autoscan_inotify.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/autoscan_inotify.cc' object='libmediatomb_a-autoscan_inotify.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-autoscan_inotify.obj `if test -f '../src/autoscan_inotify.cc'; then $(CYGPATH_W) '../src/autoscan_inotify.cc'; else $(CYGPATH_W) '$(srcdir)/../src/autoscan_inotify.cc'; fi`
-+
-+libmediatomb_a-buffered_io_handler.o: ../src/buffered_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-buffered_io_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-buffered_io_handler.Tpo -c -o libmediatomb_a-buffered_io_handler.o `test -f '../src/buffered_io_handler.cc' || echo '$(srcdir)/'`../src/buffered_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-buffered_io_handler.Tpo $(DEPDIR)/libmediatomb_a-buffered_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/buffered_io_handler.cc' object='libmediatomb_a-buffered_io_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-buffered_io_handler.o `test -f '../src/buffered_io_handler.cc' || echo '$(srcdir)/'`../src/buffered_io_handler.cc
-+
-+libmediatomb_a-buffered_io_handler.obj: ../src/buffered_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-buffered_io_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-buffered_io_handler.Tpo -c -o libmediatomb_a-buffered_io_handler.obj `if test -f '../src/buffered_io_handler.cc'; then $(CYGPATH_W) '../src/buffered_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/buffered_io_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-buffered_io_handler.Tpo $(DEPDIR)/libmediatomb_a-buffered_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/buffered_io_handler.cc' object='libmediatomb_a-buffered_io_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-buffered_io_handler.obj `if test -f '../src/buffered_io_handler.cc'; then $(CYGPATH_W) '../src/buffered_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/buffered_io_handler.cc'; fi`
-+
-+libmediatomb_a-cached_url.o: ../src/cached_url.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-cached_url.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-cached_url.Tpo -c -o libmediatomb_a-cached_url.o `test -f '../src/cached_url.cc' || echo '$(srcdir)/'`../src/cached_url.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-cached_url.Tpo $(DEPDIR)/libmediatomb_a-cached_url.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/cached_url.cc' object='libmediatomb_a-cached_url.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-cached_url.o `test -f '../src/cached_url.cc' || echo '$(srcdir)/'`../src/cached_url.cc
-+
-+libmediatomb_a-cached_url.obj: ../src/cached_url.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-cached_url.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-cached_url.Tpo -c -o libmediatomb_a-cached_url.obj `if test -f '../src/cached_url.cc'; then $(CYGPATH_W) '../src/cached_url.cc'; else $(CYGPATH_W) '$(srcdir)/../src/cached_url.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-cached_url.Tpo $(DEPDIR)/libmediatomb_a-cached_url.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/cached_url.cc' object='libmediatomb_a-cached_url.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-cached_url.obj `if test -f '../src/cached_url.cc'; then $(CYGPATH_W) '../src/cached_url.cc'; else $(CYGPATH_W) '$(srcdir)/../src/cached_url.cc'; fi`
-+
-+libmediatomb_a-cds_objects.o: ../src/cds_objects.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-cds_objects.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-cds_objects.Tpo -c -o libmediatomb_a-cds_objects.o `test -f '../src/cds_objects.cc' || echo '$(srcdir)/'`../src/cds_objects.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-cds_objects.Tpo $(DEPDIR)/libmediatomb_a-cds_objects.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/cds_objects.cc' object='libmediatomb_a-cds_objects.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-cds_objects.o `test -f '../src/cds_objects.cc' || echo '$(srcdir)/'`../src/cds_objects.cc
-+
-+libmediatomb_a-cds_objects.obj: ../src/cds_objects.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-cds_objects.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-cds_objects.Tpo -c -o libmediatomb_a-cds_objects.obj `if test -f '../src/cds_objects.cc'; then $(CYGPATH_W) '../src/cds_objects.cc'; else $(CYGPATH_W) '$(srcdir)/../src/cds_objects.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-cds_objects.Tpo $(DEPDIR)/libmediatomb_a-cds_objects.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/cds_objects.cc' object='libmediatomb_a-cds_objects.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-cds_objects.obj `if test -f '../src/cds_objects.cc'; then $(CYGPATH_W) '../src/cds_objects.cc'; else $(CYGPATH_W) '$(srcdir)/../src/cds_objects.cc'; fi`
-+
-+libmediatomb_a-cds_resource.o: ../src/cds_resource.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-cds_resource.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-cds_resource.Tpo -c -o libmediatomb_a-cds_resource.o `test -f '../src/cds_resource.cc' || echo '$(srcdir)/'`../src/cds_resource.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-cds_resource.Tpo $(DEPDIR)/libmediatomb_a-cds_resource.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/cds_resource.cc' object='libmediatomb_a-cds_resource.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-cds_resource.o `test -f '../src/cds_resource.cc' || echo '$(srcdir)/'`../src/cds_resource.cc
-+
-+libmediatomb_a-cds_resource.obj: ../src/cds_resource.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-cds_resource.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-cds_resource.Tpo -c -o libmediatomb_a-cds_resource.obj `if test -f '../src/cds_resource.cc'; then $(CYGPATH_W) '../src/cds_resource.cc'; else $(CYGPATH_W) '$(srcdir)/../src/cds_resource.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-cds_resource.Tpo $(DEPDIR)/libmediatomb_a-cds_resource.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/cds_resource.cc' object='libmediatomb_a-cds_resource.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-cds_resource.obj `if test -f '../src/cds_resource.cc'; then $(CYGPATH_W) '../src/cds_resource.cc'; else $(CYGPATH_W) '$(srcdir)/../src/cds_resource.cc'; fi`
-+
-+libmediatomb_a-cds_resource_manager.o: ../src/cds_resource_manager.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-cds_resource_manager.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-cds_resource_manager.Tpo -c -o libmediatomb_a-cds_resource_manager.o `test -f '../src/cds_resource_manager.cc' || echo '$(srcdir)/'`../src/cds_resource_manager.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-cds_resource_manager.Tpo $(DEPDIR)/libmediatomb_a-cds_resource_manager.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/cds_resource_manager.cc' object='libmediatomb_a-cds_resource_manager.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-cds_resource_manager.o `test -f '../src/cds_resource_manager.cc' || echo '$(srcdir)/'`../src/cds_resource_manager.cc
-+
-+libmediatomb_a-cds_resource_manager.obj: ../src/cds_resource_manager.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-cds_resource_manager.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-cds_resource_manager.Tpo -c -o libmediatomb_a-cds_resource_manager.obj `if test -f '../src/cds_resource_manager.cc'; then $(CYGPATH_W) '../src/cds_resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/../src/cds_resource_manager.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-cds_resource_manager.Tpo $(DEPDIR)/libmediatomb_a-cds_resource_manager.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/cds_resource_manager.cc' object='libmediatomb_a-cds_resource_manager.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-cds_resource_manager.obj `if test -f '../src/cds_resource_manager.cc'; then $(CYGPATH_W) '../src/cds_resource_manager.cc'; else $(CYGPATH_W) '$(srcdir)/../src/cds_resource_manager.cc'; fi`
-+
-+libmediatomb_a-config_manager.o: ../src/config_manager.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-config_manager.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-config_manager.Tpo -c -o libmediatomb_a-config_manager.o `test -f '../src/config_manager.cc' || echo '$(srcdir)/'`../src/config_manager.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-config_manager.Tpo $(DEPDIR)/libmediatomb_a-config_manager.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/config_manager.cc' object='libmediatomb_a-config_manager.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-config_manager.o `test -f '../src/config_manager.cc' || echo '$(srcdir)/'`../src/config_manager.cc
-+
-+libmediatomb_a-config_manager.obj: ../src/config_manager.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-config_manager.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-config_manager.Tpo -c -o libmediatomb_a-config_manager.obj `if test -f '../src/config_manager.cc'; then $(CYGPATH_W) '../src/config_manager.cc'; else $(CYGPATH_W) '$(srcdir)/../src/config_manager.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-config_manager.Tpo $(DEPDIR)/libmediatomb_a-config_manager.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/config_manager.cc' object='libmediatomb_a-config_manager.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-config_manager.obj `if test -f '../src/config_manager.cc'; then $(CYGPATH_W) '../src/config_manager.cc'; else $(CYGPATH_W) '$(srcdir)/../src/config_manager.cc'; fi`
-+
-+libmediatomb_a-content_manager.o: ../src/content_manager.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-content_manager.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-content_manager.Tpo -c -o libmediatomb_a-content_manager.o `test -f '../src/content_manager.cc' || echo '$(srcdir)/'`../src/content_manager.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-content_manager.Tpo $(DEPDIR)/libmediatomb_a-content_manager.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/content_manager.cc' object='libmediatomb_a-content_manager.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-content_manager.o `test -f '../src/content_manager.cc' || echo '$(srcdir)/'`../src/content_manager.cc
-+
-+libmediatomb_a-content_manager.obj: ../src/content_manager.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-content_manager.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-content_manager.Tpo -c -o libmediatomb_a-content_manager.obj `if test -f '../src/content_manager.cc'; then $(CYGPATH_W) '../src/content_manager.cc'; else $(CYGPATH_W) '$(srcdir)/../src/content_manager.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-content_manager.Tpo $(DEPDIR)/libmediatomb_a-content_manager.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/content_manager.cc' object='libmediatomb_a-content_manager.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-content_manager.obj `if test -f '../src/content_manager.cc'; then $(CYGPATH_W) '../src/content_manager.cc'; else $(CYGPATH_W) '$(srcdir)/../src/content_manager.cc'; fi`
-+
-+libmediatomb_a-curl_io_handler.o: ../src/curl_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-curl_io_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-curl_io_handler.Tpo -c -o libmediatomb_a-curl_io_handler.o `test -f '../src/curl_io_handler.cc' || echo '$(srcdir)/'`../src/curl_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-curl_io_handler.Tpo $(DEPDIR)/libmediatomb_a-curl_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/curl_io_handler.cc' object='libmediatomb_a-curl_io_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-curl_io_handler.o `test -f '../src/curl_io_handler.cc' || echo '$(srcdir)/'`../src/curl_io_handler.cc
-+
-+libmediatomb_a-curl_io_handler.obj: ../src/curl_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-curl_io_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-curl_io_handler.Tpo -c -o libmediatomb_a-curl_io_handler.obj `if test -f '../src/curl_io_handler.cc'; then $(CYGPATH_W) '../src/curl_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/curl_io_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-curl_io_handler.Tpo $(DEPDIR)/libmediatomb_a-curl_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/curl_io_handler.cc' object='libmediatomb_a-curl_io_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-curl_io_handler.obj `if test -f '../src/curl_io_handler.cc'; then $(CYGPATH_W) '../src/curl_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/curl_io_handler.cc'; fi`
-+
-+libmediatomb_a-destroyer.o: ../src/destroyer.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-destroyer.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-destroyer.Tpo -c -o libmediatomb_a-destroyer.o `test -f '../src/destroyer.cc' || echo '$(srcdir)/'`../src/destroyer.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-destroyer.Tpo $(DEPDIR)/libmediatomb_a-destroyer.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/destroyer.cc' object='libmediatomb_a-destroyer.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-destroyer.o `test -f '../src/destroyer.cc' || echo '$(srcdir)/'`../src/destroyer.cc
-+
-+libmediatomb_a-destroyer.obj: ../src/destroyer.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-destroyer.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-destroyer.Tpo -c -o libmediatomb_a-destroyer.obj `if test -f '../src/destroyer.cc'; then $(CYGPATH_W) '../src/destroyer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/destroyer.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-destroyer.Tpo $(DEPDIR)/libmediatomb_a-destroyer.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/destroyer.cc' object='libmediatomb_a-destroyer.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-destroyer.obj `if test -f '../src/destroyer.cc'; then $(CYGPATH_W) '../src/destroyer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/destroyer.cc'; fi`
-+
-+libmediatomb_a-dictionary.o: ../src/dictionary.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-dictionary.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-dictionary.Tpo -c -o libmediatomb_a-dictionary.o `test -f '../src/dictionary.cc' || echo '$(srcdir)/'`../src/dictionary.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-dictionary.Tpo $(DEPDIR)/libmediatomb_a-dictionary.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/dictionary.cc' object='libmediatomb_a-dictionary.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-dictionary.o `test -f '../src/dictionary.cc' || echo '$(srcdir)/'`../src/dictionary.cc
-+
-+libmediatomb_a-dictionary.obj: ../src/dictionary.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-dictionary.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-dictionary.Tpo -c -o libmediatomb_a-dictionary.obj `if test -f '../src/dictionary.cc'; then $(CYGPATH_W) '../src/dictionary.cc'; else $(CYGPATH_W) '$(srcdir)/../src/dictionary.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-dictionary.Tpo $(DEPDIR)/libmediatomb_a-dictionary.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/dictionary.cc' object='libmediatomb_a-dictionary.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-dictionary.obj `if test -f '../src/dictionary.cc'; then $(CYGPATH_W) '../src/dictionary.cc'; else $(CYGPATH_W) '$(srcdir)/../src/dictionary.cc'; fi`
-+
-+libmediatomb_a-dvd_io_handler.o: ../src/dvd_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-dvd_io_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-dvd_io_handler.Tpo -c -o libmediatomb_a-dvd_io_handler.o `test -f '../src/dvd_io_handler.cc' || echo '$(srcdir)/'`../src/dvd_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-dvd_io_handler.Tpo $(DEPDIR)/libmediatomb_a-dvd_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/dvd_io_handler.cc' object='libmediatomb_a-dvd_io_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-dvd_io_handler.o `test -f '../src/dvd_io_handler.cc' || echo '$(srcdir)/'`../src/dvd_io_handler.cc
-+
-+libmediatomb_a-dvd_io_handler.obj: ../src/dvd_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-dvd_io_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-dvd_io_handler.Tpo -c -o libmediatomb_a-dvd_io_handler.obj `if test -f '../src/dvd_io_handler.cc'; then $(CYGPATH_W) '../src/dvd_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/dvd_io_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-dvd_io_handler.Tpo $(DEPDIR)/libmediatomb_a-dvd_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/dvd_io_handler.cc' object='libmediatomb_a-dvd_io_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-dvd_io_handler.obj `if test -f '../src/dvd_io_handler.cc'; then $(CYGPATH_W) '../src/dvd_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/dvd_io_handler.cc'; fi`
-+
-+libmediatomb_a-dvdnav_read.o: ../src/dvdnav_read.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-dvdnav_read.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-dvdnav_read.Tpo -c -o libmediatomb_a-dvdnav_read.o `test -f '../src/dvdnav_read.cc' || echo '$(srcdir)/'`../src/dvdnav_read.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-dvdnav_read.Tpo $(DEPDIR)/libmediatomb_a-dvdnav_read.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/dvdnav_read.cc' object='libmediatomb_a-dvdnav_read.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-dvdnav_read.o `test -f '../src/dvdnav_read.cc' || echo '$(srcdir)/'`../src/dvdnav_read.cc
-+
-+libmediatomb_a-dvdnav_read.obj: ../src/dvdnav_read.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-dvdnav_read.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-dvdnav_read.Tpo -c -o libmediatomb_a-dvdnav_read.obj `if test -f '../src/dvdnav_read.cc'; then $(CYGPATH_W) '../src/dvdnav_read.cc'; else $(CYGPATH_W) '$(srcdir)/../src/dvdnav_read.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-dvdnav_read.Tpo $(DEPDIR)/libmediatomb_a-dvdnav_read.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/dvdnav_read.cc' object='libmediatomb_a-dvdnav_read.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-dvdnav_read.obj `if test -f '../src/dvdnav_read.cc'; then $(CYGPATH_W) '../src/dvdnav_read.cc'; else $(CYGPATH_W) '$(srcdir)/../src/dvdnav_read.cc'; fi`
-+
-+libmediatomb_a-exceptions.o: ../src/exceptions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-exceptions.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-exceptions.Tpo -c -o libmediatomb_a-exceptions.o `test -f '../src/exceptions.cc' || echo '$(srcdir)/'`../src/exceptions.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-exceptions.Tpo $(DEPDIR)/libmediatomb_a-exceptions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/exceptions.cc' object='libmediatomb_a-exceptions.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-exceptions.o `test -f '../src/exceptions.cc' || echo '$(srcdir)/'`../src/exceptions.cc
-+
-+libmediatomb_a-exceptions.obj: ../src/exceptions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-exceptions.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-exceptions.Tpo -c -o libmediatomb_a-exceptions.obj `if test -f '../src/exceptions.cc'; then $(CYGPATH_W) '../src/exceptions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/exceptions.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-exceptions.Tpo $(DEPDIR)/libmediatomb_a-exceptions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/exceptions.cc' object='libmediatomb_a-exceptions.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-exceptions.obj `if test -f '../src/exceptions.cc'; then $(CYGPATH_W) '../src/exceptions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/exceptions.cc'; fi`
-+
-+libmediatomb_a-fd_io_handler.o: ../src/fd_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-fd_io_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-fd_io_handler.Tpo -c -o libmediatomb_a-fd_io_handler.o `test -f '../src/fd_io_handler.cc' || echo '$(srcdir)/'`../src/fd_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-fd_io_handler.Tpo $(DEPDIR)/libmediatomb_a-fd_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/fd_io_handler.cc' object='libmediatomb_a-fd_io_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-fd_io_handler.o `test -f '../src/fd_io_handler.cc' || echo '$(srcdir)/'`../src/fd_io_handler.cc
-+
-+libmediatomb_a-fd_io_handler.obj: ../src/fd_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-fd_io_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-fd_io_handler.Tpo -c -o libmediatomb_a-fd_io_handler.obj `if test -f '../src/fd_io_handler.cc'; then $(CYGPATH_W) '../src/fd_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/fd_io_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-fd_io_handler.Tpo $(DEPDIR)/libmediatomb_a-fd_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/fd_io_handler.cc' object='libmediatomb_a-fd_io_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-fd_io_handler.obj `if test -f '../src/fd_io_handler.cc'; then $(CYGPATH_W) '../src/fd_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/fd_io_handler.cc'; fi`
-+
-+libmediatomb_a-file_io_handler.o: ../src/file_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-file_io_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-file_io_handler.Tpo -c -o libmediatomb_a-file_io_handler.o `test -f '../src/file_io_handler.cc' || echo '$(srcdir)/'`../src/file_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-file_io_handler.Tpo $(DEPDIR)/libmediatomb_a-file_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/file_io_handler.cc' object='libmediatomb_a-file_io_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-file_io_handler.o `test -f '../src/file_io_handler.cc' || echo '$(srcdir)/'`../src/file_io_handler.cc
-+
-+libmediatomb_a-file_io_handler.obj: ../src/file_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-file_io_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-file_io_handler.Tpo -c -o libmediatomb_a-file_io_handler.obj `if test -f '../src/file_io_handler.cc'; then $(CYGPATH_W) '../src/file_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/file_io_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-file_io_handler.Tpo $(DEPDIR)/libmediatomb_a-file_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/file_io_handler.cc' object='libmediatomb_a-file_io_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-file_io_handler.obj `if test -f '../src/file_io_handler.cc'; then $(CYGPATH_W) '../src/file_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/file_io_handler.cc'; fi`
-+
-+libmediatomb_a-file_request_handler.o: ../src/file_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-file_request_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-file_request_handler.Tpo -c -o libmediatomb_a-file_request_handler.o `test -f '../src/file_request_handler.cc' || echo '$(srcdir)/'`../src/file_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-file_request_handler.Tpo $(DEPDIR)/libmediatomb_a-file_request_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/file_request_handler.cc' object='libmediatomb_a-file_request_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-file_request_handler.o `test -f '../src/file_request_handler.cc' || echo '$(srcdir)/'`../src/file_request_handler.cc
-+
-+libmediatomb_a-file_request_handler.obj: ../src/file_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-file_request_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-file_request_handler.Tpo -c -o libmediatomb_a-file_request_handler.obj `if test -f '../src/file_request_handler.cc'; then $(CYGPATH_W) '../src/file_request_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/file_request_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-file_request_handler.Tpo $(DEPDIR)/libmediatomb_a-file_request_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/file_request_handler.cc' object='libmediatomb_a-file_request_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-file_request_handler.obj `if test -f '../src/file_request_handler.cc'; then $(CYGPATH_W) '../src/file_request_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/file_request_handler.cc'; fi`
-+
-+libmediatomb_a-filesystem.o: ../src/filesystem.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-filesystem.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-filesystem.Tpo -c -o libmediatomb_a-filesystem.o `test -f '../src/filesystem.cc' || echo '$(srcdir)/'`../src/filesystem.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-filesystem.Tpo $(DEPDIR)/libmediatomb_a-filesystem.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/filesystem.cc' object='libmediatomb_a-filesystem.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-filesystem.o `test -f '../src/filesystem.cc' || echo '$(srcdir)/'`../src/filesystem.cc
-+
-+libmediatomb_a-filesystem.obj: ../src/filesystem.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-filesystem.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-filesystem.Tpo -c -o libmediatomb_a-filesystem.obj `if test -f '../src/filesystem.cc'; then $(CYGPATH_W) '../src/filesystem.cc'; else $(CYGPATH_W) '$(srcdir)/../src/filesystem.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-filesystem.Tpo $(DEPDIR)/libmediatomb_a-filesystem.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/filesystem.cc' object='libmediatomb_a-filesystem.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-filesystem.obj `if test -f '../src/filesystem.cc'; then $(CYGPATH_W) '../src/filesystem.cc'; else $(CYGPATH_W) '$(srcdir)/../src/filesystem.cc'; fi`
-+
-+libmediatomb_a-io_handler_buffer_helper.o: ../src/io_handler_buffer_helper.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-io_handler_buffer_helper.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-io_handler_buffer_helper.Tpo -c -o libmediatomb_a-io_handler_buffer_helper.o `test -f '../src/io_handler_buffer_helper.cc' || echo '$(srcdir)/'`../src/io_handler_buffer_helper.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-io_handler_buffer_helper.Tpo $(DEPDIR)/libmediatomb_a-io_handler_buffer_helper.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/io_handler_buffer_helper.cc' object='libmediatomb_a-io_handler_buffer_helper.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-io_handler_buffer_helper.o `test -f '../src/io_handler_buffer_helper.cc' || echo '$(srcdir)/'`../src/io_handler_buffer_helper.cc
-+
-+libmediatomb_a-io_handler_buffer_helper.obj: ../src/io_handler_buffer_helper.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-io_handler_buffer_helper.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-io_handler_buffer_helper.Tpo -c -o libmediatomb_a-io_handler_buffer_helper.obj `if test -f '../src/io_handler_buffer_helper.cc'; then $(CYGPATH_W) '../src/io_handler_buffer_helper.cc'; else $(CYGPATH_W) '$(srcdir)/../src/io_handler_buffer_helper.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-io_handler_buffer_helper.Tpo $(DEPDIR)/libmediatomb_a-io_handler_buffer_helper.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/io_handler_buffer_helper.cc' object='libmediatomb_a-io_handler_buffer_helper.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-io_handler_buffer_helper.obj `if test -f '../src/io_handler_buffer_helper.cc'; then $(CYGPATH_W) '../src/io_handler_buffer_helper.cc'; else $(CYGPATH_W) '$(srcdir)/../src/io_handler_buffer_helper.cc'; fi`
-+
-+libmediatomb_a-io_handler.o: ../src/io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-io_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-io_handler.Tpo -c -o libmediatomb_a-io_handler.o `test -f '../src/io_handler.cc' || echo '$(srcdir)/'`../src/io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-io_handler.Tpo $(DEPDIR)/libmediatomb_a-io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/io_handler.cc' object='libmediatomb_a-io_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-io_handler.o `test -f '../src/io_handler.cc' || echo '$(srcdir)/'`../src/io_handler.cc
-+
-+libmediatomb_a-io_handler.obj: ../src/io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-io_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-io_handler.Tpo -c -o libmediatomb_a-io_handler.obj `if test -f '../src/io_handler.cc'; then $(CYGPATH_W) '../src/io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/io_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-io_handler.Tpo $(DEPDIR)/libmediatomb_a-io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/io_handler.cc' object='libmediatomb_a-io_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-io_handler.obj `if test -f '../src/io_handler.cc'; then $(CYGPATH_W) '../src/io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/io_handler.cc'; fi`
-+
-+libmediatomb_a-io_handler_chainer.o: ../src/io_handler_chainer.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-io_handler_chainer.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-io_handler_chainer.Tpo -c -o libmediatomb_a-io_handler_chainer.o `test -f '../src/io_handler_chainer.cc' || echo '$(srcdir)/'`../src/io_handler_chainer.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-io_handler_chainer.Tpo $(DEPDIR)/libmediatomb_a-io_handler_chainer.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/io_handler_chainer.cc' object='libmediatomb_a-io_handler_chainer.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-io_handler_chainer.o `test -f '../src/io_handler_chainer.cc' || echo '$(srcdir)/'`../src/io_handler_chainer.cc
-+
-+libmediatomb_a-io_handler_chainer.obj: ../src/io_handler_chainer.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-io_handler_chainer.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-io_handler_chainer.Tpo -c -o libmediatomb_a-io_handler_chainer.obj `if test -f '../src/io_handler_chainer.cc'; then $(CYGPATH_W) '../src/io_handler_chainer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/io_handler_chainer.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-io_handler_chainer.Tpo $(DEPDIR)/libmediatomb_a-io_handler_chainer.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/io_handler_chainer.cc' object='libmediatomb_a-io_handler_chainer.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-io_handler_chainer.obj `if test -f '../src/io_handler_chainer.cc'; then $(CYGPATH_W) '../src/io_handler_chainer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/io_handler_chainer.cc'; fi`
-+
-+libmediatomb_a-jpeg_resolution.o: ../src/jpeg_resolution.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-jpeg_resolution.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-jpeg_resolution.Tpo -c -o libmediatomb_a-jpeg_resolution.o `test -f '../src/jpeg_resolution.cc' || echo '$(srcdir)/'`../src/jpeg_resolution.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-jpeg_resolution.Tpo $(DEPDIR)/libmediatomb_a-jpeg_resolution.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/jpeg_resolution.cc' object='libmediatomb_a-jpeg_resolution.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-jpeg_resolution.o `test -f '../src/jpeg_resolution.cc' || echo '$(srcdir)/'`../src/jpeg_resolution.cc
-+
-+libmediatomb_a-jpeg_resolution.obj: ../src/jpeg_resolution.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-jpeg_resolution.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-jpeg_resolution.Tpo -c -o libmediatomb_a-jpeg_resolution.obj `if test -f '../src/jpeg_resolution.cc'; then $(CYGPATH_W) '../src/jpeg_resolution.cc'; else $(CYGPATH_W) '$(srcdir)/../src/jpeg_resolution.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-jpeg_resolution.Tpo $(DEPDIR)/libmediatomb_a-jpeg_resolution.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/jpeg_resolution.cc' object='libmediatomb_a-jpeg_resolution.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-jpeg_resolution.obj `if test -f '../src/jpeg_resolution.cc'; then $(CYGPATH_W) '../src/jpeg_resolution.cc'; else $(CYGPATH_W) '$(srcdir)/../src/jpeg_resolution.cc'; fi`
-+
-+libmediatomb_a-fallback_layout.o: ../src/layout/fallback_layout.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-fallback_layout.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-fallback_layout.Tpo -c -o libmediatomb_a-fallback_layout.o `test -f '../src/layout/fallback_layout.cc' || echo '$(srcdir)/'`../src/layout/fallback_layout.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-fallback_layout.Tpo $(DEPDIR)/libmediatomb_a-fallback_layout.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/layout/fallback_layout.cc' object='libmediatomb_a-fallback_layout.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-fallback_layout.o `test -f '../src/layout/fallback_layout.cc' || echo '$(srcdir)/'`../src/layout/fallback_layout.cc
-+
-+libmediatomb_a-fallback_layout.obj: ../src/layout/fallback_layout.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-fallback_layout.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-fallback_layout.Tpo -c -o libmediatomb_a-fallback_layout.obj `if test -f '../src/layout/fallback_layout.cc'; then $(CYGPATH_W) '../src/layout/fallback_layout.cc'; else $(CYGPATH_W) '$(srcdir)/../src/layout/fallback_layout.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-fallback_layout.Tpo $(DEPDIR)/libmediatomb_a-fallback_layout.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/layout/fallback_layout.cc' object='libmediatomb_a-fallback_layout.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-fallback_layout.obj `if test -f '../src/layout/fallback_layout.cc'; then $(CYGPATH_W) '../src/layout/fallback_layout.cc'; else $(CYGPATH_W) '$(srcdir)/../src/layout/fallback_layout.cc'; fi`
-+
-+libmediatomb_a-js_layout.o: ../src/layout/js_layout.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-js_layout.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-js_layout.Tpo -c -o libmediatomb_a-js_layout.o `test -f '../src/layout/js_layout.cc' || echo '$(srcdir)/'`../src/layout/js_layout.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-js_layout.Tpo $(DEPDIR)/libmediatomb_a-js_layout.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/layout/js_layout.cc' object='libmediatomb_a-js_layout.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-js_layout.o `test -f '../src/layout/js_layout.cc' || echo '$(srcdir)/'`../src/layout/js_layout.cc
-+
-+libmediatomb_a-js_layout.obj: ../src/layout/js_layout.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-js_layout.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-js_layout.Tpo -c -o libmediatomb_a-js_layout.obj `if test -f '../src/layout/js_layout.cc'; then $(CYGPATH_W) '../src/layout/js_layout.cc'; else $(CYGPATH_W) '$(srcdir)/../src/layout/js_layout.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-js_layout.Tpo $(DEPDIR)/libmediatomb_a-js_layout.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/layout/js_layout.cc' object='libmediatomb_a-js_layout.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-js_layout.obj `if test -f '../src/layout/js_layout.cc'; then $(CYGPATH_W) '../src/layout/js_layout.cc'; else $(CYGPATH_W) '$(srcdir)/../src/layout/js_layout.cc'; fi`
-+
-+libmediatomb_a-logger.o: ../src/logger.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-logger.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-logger.Tpo -c -o libmediatomb_a-logger.o `test -f '../src/logger.cc' || echo '$(srcdir)/'`../src/logger.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-logger.Tpo $(DEPDIR)/libmediatomb_a-logger.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/logger.cc' object='libmediatomb_a-logger.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-logger.o `test -f '../src/logger.cc' || echo '$(srcdir)/'`../src/logger.cc
-+
-+libmediatomb_a-logger.obj: ../src/logger.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-logger.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-logger.Tpo -c -o libmediatomb_a-logger.obj `if test -f '../src/logger.cc'; then $(CYGPATH_W) '../src/logger.cc'; else $(CYGPATH_W) '$(srcdir)/../src/logger.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-logger.Tpo $(DEPDIR)/libmediatomb_a-logger.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/logger.cc' object='libmediatomb_a-logger.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-logger.obj `if test -f '../src/logger.cc'; then $(CYGPATH_W) '../src/logger.cc'; else $(CYGPATH_W) '$(srcdir)/../src/logger.cc'; fi`
-+
-+libmediatomb_a-main.o: ../src/main.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-main.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-main.Tpo -c -o libmediatomb_a-main.o `test -f '../src/main.cc' || echo '$(srcdir)/'`../src/main.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-main.Tpo $(DEPDIR)/libmediatomb_a-main.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/main.cc' object='libmediatomb_a-main.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-main.o `test -f '../src/main.cc' || echo '$(srcdir)/'`../src/main.cc
-+
-+libmediatomb_a-main.obj: ../src/main.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-main.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-main.Tpo -c -o libmediatomb_a-main.obj `if test -f '../src/main.cc'; then $(CYGPATH_W) '../src/main.cc'; else $(CYGPATH_W) '$(srcdir)/../src/main.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-main.Tpo $(DEPDIR)/libmediatomb_a-main.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/main.cc' object='libmediatomb_a-main.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-main.obj `if test -f '../src/main.cc'; then $(CYGPATH_W) '../src/main.cc'; else $(CYGPATH_W) '$(srcdir)/../src/main.cc'; fi`
-+
-+libmediatomb_a-mem_io_handler.o: ../src/mem_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-mem_io_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-mem_io_handler.Tpo -c -o libmediatomb_a-mem_io_handler.o `test -f '../src/mem_io_handler.cc' || echo '$(srcdir)/'`../src/mem_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-mem_io_handler.Tpo $(DEPDIR)/libmediatomb_a-mem_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mem_io_handler.cc' object='libmediatomb_a-mem_io_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-mem_io_handler.o `test -f '../src/mem_io_handler.cc' || echo '$(srcdir)/'`../src/mem_io_handler.cc
-+
-+libmediatomb_a-mem_io_handler.obj: ../src/mem_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-mem_io_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-mem_io_handler.Tpo -c -o libmediatomb_a-mem_io_handler.obj `if test -f '../src/mem_io_handler.cc'; then $(CYGPATH_W) '../src/mem_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mem_io_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-mem_io_handler.Tpo $(DEPDIR)/libmediatomb_a-mem_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mem_io_handler.cc' object='libmediatomb_a-mem_io_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-mem_io_handler.obj `if test -f '../src/mem_io_handler.cc'; then $(CYGPATH_W) '../src/mem_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mem_io_handler.cc'; fi`
-+
-+libmediatomb_a-memory.o: ../src/memory.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-memory.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-memory.Tpo -c -o libmediatomb_a-memory.o `test -f '../src/memory.cc' || echo '$(srcdir)/'`../src/memory.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-memory.Tpo $(DEPDIR)/libmediatomb_a-memory.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/memory.cc' object='libmediatomb_a-memory.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-memory.o `test -f '../src/memory.cc' || echo '$(srcdir)/'`../src/memory.cc
-+
-+libmediatomb_a-memory.obj: ../src/memory.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-memory.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-memory.Tpo -c -o libmediatomb_a-memory.obj `if test -f '../src/memory.cc'; then $(CYGPATH_W) '../src/memory.cc'; else $(CYGPATH_W) '$(srcdir)/../src/memory.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-memory.Tpo $(DEPDIR)/libmediatomb_a-memory.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/memory.cc' object='libmediatomb_a-memory.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-memory.obj `if test -f '../src/memory.cc'; then $(CYGPATH_W) '../src/memory.cc'; else $(CYGPATH_W) '$(srcdir)/../src/memory.cc'; fi`
-+
-+libmediatomb_a-dvd_handler.o: ../src/metadata/dvd_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-dvd_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-dvd_handler.Tpo -c -o libmediatomb_a-dvd_handler.o `test -f '../src/metadata/dvd_handler.cc' || echo '$(srcdir)/'`../src/metadata/dvd_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-dvd_handler.Tpo $(DEPDIR)/libmediatomb_a-dvd_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/dvd_handler.cc' object='libmediatomb_a-dvd_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-dvd_handler.o `test -f '../src/metadata/dvd_handler.cc' || echo '$(srcdir)/'`../src/metadata/dvd_handler.cc
-+
-+libmediatomb_a-dvd_handler.obj: ../src/metadata/dvd_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-dvd_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-dvd_handler.Tpo -c -o libmediatomb_a-dvd_handler.obj `if test -f '../src/metadata/dvd_handler.cc'; then $(CYGPATH_W) '../src/metadata/dvd_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/dvd_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-dvd_handler.Tpo $(DEPDIR)/libmediatomb_a-dvd_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/dvd_handler.cc' object='libmediatomb_a-dvd_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-dvd_handler.obj `if test -f '../src/metadata/dvd_handler.cc'; then $(CYGPATH_W) '../src/metadata/dvd_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/dvd_handler.cc'; fi`
-+
-+libmediatomb_a-exiv2_handler.o: ../src/metadata/exiv2_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-exiv2_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-exiv2_handler.Tpo -c -o libmediatomb_a-exiv2_handler.o `test -f '../src/metadata/exiv2_handler.cc' || echo '$(srcdir)/'`../src/metadata/exiv2_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-exiv2_handler.Tpo $(DEPDIR)/libmediatomb_a-exiv2_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/exiv2_handler.cc' object='libmediatomb_a-exiv2_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-exiv2_handler.o `test -f '../src/metadata/exiv2_handler.cc' || echo '$(srcdir)/'`../src/metadata/exiv2_handler.cc
-+
-+libmediatomb_a-exiv2_handler.obj: ../src/metadata/exiv2_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-exiv2_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-exiv2_handler.Tpo -c -o libmediatomb_a-exiv2_handler.obj `if test -f '../src/metadata/exiv2_handler.cc'; then $(CYGPATH_W) '../src/metadata/exiv2_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/exiv2_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-exiv2_handler.Tpo $(DEPDIR)/libmediatomb_a-exiv2_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/exiv2_handler.cc' object='libmediatomb_a-exiv2_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-exiv2_handler.obj `if test -f '../src/metadata/exiv2_handler.cc'; then $(CYGPATH_W) '../src/metadata/exiv2_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/exiv2_handler.cc'; fi`
-+
-+libmediatomb_a-extractor_handler.o: ../src/metadata/extractor_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-extractor_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-extractor_handler.Tpo -c -o libmediatomb_a-extractor_handler.o `test -f '../src/metadata/extractor_handler.cc' || echo '$(srcdir)/'`../src/metadata/extractor_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-extractor_handler.Tpo $(DEPDIR)/libmediatomb_a-extractor_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/extractor_handler.cc' object='libmediatomb_a-extractor_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-extractor_handler.o `test -f '../src/metadata/extractor_handler.cc' || echo '$(srcdir)/'`../src/metadata/extractor_handler.cc
-+
-+libmediatomb_a-extractor_handler.obj: ../src/metadata/extractor_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-extractor_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-extractor_handler.Tpo -c -o libmediatomb_a-extractor_handler.obj `if test -f '../src/metadata/extractor_handler.cc'; then $(CYGPATH_W) '../src/metadata/extractor_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/extractor_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-extractor_handler.Tpo $(DEPDIR)/libmediatomb_a-extractor_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/extractor_handler.cc' object='libmediatomb_a-extractor_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-extractor_handler.obj `if test -f '../src/metadata/extractor_handler.cc'; then $(CYGPATH_W) '../src/metadata/extractor_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/extractor_handler.cc'; fi`
-+
-+libmediatomb_a-ffmpeg_handler.o: ../src/metadata/ffmpeg_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-ffmpeg_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-ffmpeg_handler.Tpo -c -o libmediatomb_a-ffmpeg_handler.o `test -f '../src/metadata/ffmpeg_handler.cc' || echo '$(srcdir)/'`../src/metadata/ffmpeg_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-ffmpeg_handler.Tpo $(DEPDIR)/libmediatomb_a-ffmpeg_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/ffmpeg_handler.cc' object='libmediatomb_a-ffmpeg_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-ffmpeg_handler.o `test -f '../src/metadata/ffmpeg_handler.cc' || echo '$(srcdir)/'`../src/metadata/ffmpeg_handler.cc
-+
-+libmediatomb_a-ffmpeg_handler.obj: ../src/metadata/ffmpeg_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-ffmpeg_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-ffmpeg_handler.Tpo -c -o libmediatomb_a-ffmpeg_handler.obj `if test -f '../src/metadata/ffmpeg_handler.cc'; then $(CYGPATH_W) '../src/metadata/ffmpeg_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/ffmpeg_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-ffmpeg_handler.Tpo $(DEPDIR)/libmediatomb_a-ffmpeg_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/ffmpeg_handler.cc' object='libmediatomb_a-ffmpeg_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-ffmpeg_handler.obj `if test -f '../src/metadata/ffmpeg_handler.cc'; then $(CYGPATH_W) '../src/metadata/ffmpeg_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/ffmpeg_handler.cc'; fi`
-+
-+libmediatomb_a-metadata_handler.o: ../src/metadata_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-metadata_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-metadata_handler.Tpo -c -o libmediatomb_a-metadata_handler.o `test -f '../src/metadata_handler.cc' || echo '$(srcdir)/'`../src/metadata_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-metadata_handler.Tpo $(DEPDIR)/libmediatomb_a-metadata_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata_handler.cc' object='libmediatomb_a-metadata_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-metadata_handler.o `test -f '../src/metadata_handler.cc' || echo '$(srcdir)/'`../src/metadata_handler.cc
-+
-+libmediatomb_a-metadata_handler.obj: ../src/metadata_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-metadata_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-metadata_handler.Tpo -c -o libmediatomb_a-metadata_handler.obj `if test -f '../src/metadata_handler.cc'; then $(CYGPATH_W) '../src/metadata_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-metadata_handler.Tpo $(DEPDIR)/libmediatomb_a-metadata_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata_handler.cc' object='libmediatomb_a-metadata_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-metadata_handler.obj `if test -f '../src/metadata_handler.cc'; then $(CYGPATH_W) '../src/metadata_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata_handler.cc'; fi`
-+
-+libmediatomb_a-id3_handler.o: ../src/metadata/id3_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-id3_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-id3_handler.Tpo -c -o libmediatomb_a-id3_handler.o `test -f '../src/metadata/id3_handler.cc' || echo '$(srcdir)/'`../src/metadata/id3_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-id3_handler.Tpo $(DEPDIR)/libmediatomb_a-id3_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/id3_handler.cc' object='libmediatomb_a-id3_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-id3_handler.o `test -f '../src/metadata/id3_handler.cc' || echo '$(srcdir)/'`../src/metadata/id3_handler.cc
-+
-+libmediatomb_a-id3_handler.obj: ../src/metadata/id3_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-id3_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-id3_handler.Tpo -c -o libmediatomb_a-id3_handler.obj `if test -f '../src/metadata/id3_handler.cc'; then $(CYGPATH_W) '../src/metadata/id3_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/id3_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-id3_handler.Tpo $(DEPDIR)/libmediatomb_a-id3_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/id3_handler.cc' object='libmediatomb_a-id3_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-id3_handler.obj `if test -f '../src/metadata/id3_handler.cc'; then $(CYGPATH_W) '../src/metadata/id3_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/id3_handler.cc'; fi`
-+
-+libmediatomb_a-libexif_handler.o: ../src/metadata/libexif_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-libexif_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-libexif_handler.Tpo -c -o libmediatomb_a-libexif_handler.o `test -f '../src/metadata/libexif_handler.cc' || echo '$(srcdir)/'`../src/metadata/libexif_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-libexif_handler.Tpo $(DEPDIR)/libmediatomb_a-libexif_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/libexif_handler.cc' object='libmediatomb_a-libexif_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-libexif_handler.o `test -f '../src/metadata/libexif_handler.cc' || echo '$(srcdir)/'`../src/metadata/libexif_handler.cc
-+
-+libmediatomb_a-libexif_handler.obj: ../src/metadata/libexif_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-libexif_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-libexif_handler.Tpo -c -o libmediatomb_a-libexif_handler.obj `if test -f '../src/metadata/libexif_handler.cc'; then $(CYGPATH_W) '../src/metadata/libexif_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/libexif_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-libexif_handler.Tpo $(DEPDIR)/libmediatomb_a-libexif_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/libexif_handler.cc' object='libmediatomb_a-libexif_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-libexif_handler.obj `if test -f '../src/metadata/libexif_handler.cc'; then $(CYGPATH_W) '../src/metadata/libexif_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/libexif_handler.cc'; fi`
-+
-+libmediatomb_a-libmp4v2_handler.o: ../src/metadata/libmp4v2_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-libmp4v2_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-libmp4v2_handler.Tpo -c -o libmediatomb_a-libmp4v2_handler.o `test -f '../src/metadata/libmp4v2_handler.cc' || echo '$(srcdir)/'`../src/metadata/libmp4v2_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-libmp4v2_handler.Tpo $(DEPDIR)/libmediatomb_a-libmp4v2_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/libmp4v2_handler.cc' object='libmediatomb_a-libmp4v2_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-libmp4v2_handler.o `test -f '../src/metadata/libmp4v2_handler.cc' || echo '$(srcdir)/'`../src/metadata/libmp4v2_handler.cc
-+
-+libmediatomb_a-libmp4v2_handler.obj: ../src/metadata/libmp4v2_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-libmp4v2_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-libmp4v2_handler.Tpo -c -o libmediatomb_a-libmp4v2_handler.obj `if test -f '../src/metadata/libmp4v2_handler.cc'; then $(CYGPATH_W) '../src/metadata/libmp4v2_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/libmp4v2_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-libmp4v2_handler.Tpo $(DEPDIR)/libmediatomb_a-libmp4v2_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/libmp4v2_handler.cc' object='libmediatomb_a-libmp4v2_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-libmp4v2_handler.obj `if test -f '../src/metadata/libmp4v2_handler.cc'; then $(CYGPATH_W) '../src/metadata/libmp4v2_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/libmp4v2_handler.cc'; fi`
-+
-+libmediatomb_a-taglib_handler.o: ../src/metadata/taglib_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-taglib_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-taglib_handler.Tpo -c -o libmediatomb_a-taglib_handler.o `test -f '../src/metadata/taglib_handler.cc' || echo '$(srcdir)/'`../src/metadata/taglib_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-taglib_handler.Tpo $(DEPDIR)/libmediatomb_a-taglib_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/taglib_handler.cc' object='libmediatomb_a-taglib_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-taglib_handler.o `test -f '../src/metadata/taglib_handler.cc' || echo '$(srcdir)/'`../src/metadata/taglib_handler.cc
-+
-+libmediatomb_a-taglib_handler.obj: ../src/metadata/taglib_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-taglib_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-taglib_handler.Tpo -c -o libmediatomb_a-taglib_handler.obj `if test -f '../src/metadata/taglib_handler.cc'; then $(CYGPATH_W) '../src/metadata/taglib_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/taglib_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-taglib_handler.Tpo $(DEPDIR)/libmediatomb_a-taglib_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/metadata/taglib_handler.cc' object='libmediatomb_a-taglib_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-taglib_handler.obj `if test -f '../src/metadata/taglib_handler.cc'; then $(CYGPATH_W) '../src/metadata/taglib_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/metadata/taglib_handler.cc'; fi`
-+
-+libmediatomb_a-mpegremux_processor.o: ../src/mpegremux_processor.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-mpegremux_processor.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-mpegremux_processor.Tpo -c -o libmediatomb_a-mpegremux_processor.o `test -f '../src/mpegremux_processor.cc' || echo '$(srcdir)/'`../src/mpegremux_processor.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-mpegremux_processor.Tpo $(DEPDIR)/libmediatomb_a-mpegremux_processor.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mpegremux_processor.cc' object='libmediatomb_a-mpegremux_processor.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-mpegremux_processor.o `test -f '../src/mpegremux_processor.cc' || echo '$(srcdir)/'`../src/mpegremux_processor.cc
-+
-+libmediatomb_a-mpegremux_processor.obj: ../src/mpegremux_processor.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-mpegremux_processor.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-mpegremux_processor.Tpo -c -o libmediatomb_a-mpegremux_processor.obj `if test -f '../src/mpegremux_processor.cc'; then $(CYGPATH_W) '../src/mpegremux_processor.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mpegremux_processor.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-mpegremux_processor.Tpo $(DEPDIR)/libmediatomb_a-mpegremux_processor.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mpegremux_processor.cc' object='libmediatomb_a-mpegremux_processor.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-mpegremux_processor.obj `if test -f '../src/mpegremux_processor.cc'; then $(CYGPATH_W) '../src/mpegremux_processor.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mpegremux_processor.cc'; fi`
-+
-+libmediatomb_a-mt_inotify.o: ../src/mt_inotify.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-mt_inotify.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-mt_inotify.Tpo -c -o libmediatomb_a-mt_inotify.o `test -f '../src/mt_inotify.cc' || echo '$(srcdir)/'`../src/mt_inotify.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-mt_inotify.Tpo $(DEPDIR)/libmediatomb_a-mt_inotify.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mt_inotify.cc' object='libmediatomb_a-mt_inotify.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-mt_inotify.o `test -f '../src/mt_inotify.cc' || echo '$(srcdir)/'`../src/mt_inotify.cc
-+
-+libmediatomb_a-mt_inotify.obj: ../src/mt_inotify.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-mt_inotify.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-mt_inotify.Tpo -c -o libmediatomb_a-mt_inotify.obj `if test -f '../src/mt_inotify.cc'; then $(CYGPATH_W) '../src/mt_inotify.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mt_inotify.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-mt_inotify.Tpo $(DEPDIR)/libmediatomb_a-mt_inotify.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mt_inotify.cc' object='libmediatomb_a-mt_inotify.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-mt_inotify.obj `if test -f '../src/mt_inotify.cc'; then $(CYGPATH_W) '../src/mt_inotify.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mt_inotify.cc'; fi`
-+
-+libmediatomb_a-attribute.o: ../src/mxml/attribute.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-attribute.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-attribute.Tpo -c -o libmediatomb_a-attribute.o `test -f '../src/mxml/attribute.cc' || echo '$(srcdir)/'`../src/mxml/attribute.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-attribute.Tpo $(DEPDIR)/libmediatomb_a-attribute.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/attribute.cc' object='libmediatomb_a-attribute.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-attribute.o `test -f '../src/mxml/attribute.cc' || echo '$(srcdir)/'`../src/mxml/attribute.cc
-+
-+libmediatomb_a-attribute.obj: ../src/mxml/attribute.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-attribute.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-attribute.Tpo -c -o libmediatomb_a-attribute.obj `if test -f '../src/mxml/attribute.cc'; then $(CYGPATH_W) '../src/mxml/attribute.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/attribute.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-attribute.Tpo $(DEPDIR)/libmediatomb_a-attribute.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/attribute.cc' object='libmediatomb_a-attribute.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-attribute.obj `if test -f '../src/mxml/attribute.cc'; then $(CYGPATH_W) '../src/mxml/attribute.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/attribute.cc'; fi`
-+
-+libmediatomb_a-comment.o: ../src/mxml/comment.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-comment.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-comment.Tpo -c -o libmediatomb_a-comment.o `test -f '../src/mxml/comment.cc' || echo '$(srcdir)/'`../src/mxml/comment.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-comment.Tpo $(DEPDIR)/libmediatomb_a-comment.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/comment.cc' object='libmediatomb_a-comment.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-comment.o `test -f '../src/mxml/comment.cc' || echo '$(srcdir)/'`../src/mxml/comment.cc
-+
-+libmediatomb_a-comment.obj: ../src/mxml/comment.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-comment.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-comment.Tpo -c -o libmediatomb_a-comment.obj `if test -f '../src/mxml/comment.cc'; then $(CYGPATH_W) '../src/mxml/comment.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/comment.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-comment.Tpo $(DEPDIR)/libmediatomb_a-comment.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/comment.cc' object='libmediatomb_a-comment.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-comment.obj `if test -f '../src/mxml/comment.cc'; then $(CYGPATH_W) '../src/mxml/comment.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/comment.cc'; fi`
-+
-+libmediatomb_a-context.o: ../src/mxml/context.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-context.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-context.Tpo -c -o libmediatomb_a-context.o `test -f '../src/mxml/context.cc' || echo '$(srcdir)/'`../src/mxml/context.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-context.Tpo $(DEPDIR)/libmediatomb_a-context.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/context.cc' object='libmediatomb_a-context.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-context.o `test -f '../src/mxml/context.cc' || echo '$(srcdir)/'`../src/mxml/context.cc
-+
-+libmediatomb_a-context.obj: ../src/mxml/context.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-context.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-context.Tpo -c -o libmediatomb_a-context.obj `if test -f '../src/mxml/context.cc'; then $(CYGPATH_W) '../src/mxml/context.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/context.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-context.Tpo $(DEPDIR)/libmediatomb_a-context.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/context.cc' object='libmediatomb_a-context.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-context.obj `if test -f '../src/mxml/context.cc'; then $(CYGPATH_W) '../src/mxml/context.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/context.cc'; fi`
-+
-+libmediatomb_a-element.o: ../src/mxml/element.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-element.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-element.Tpo -c -o libmediatomb_a-element.o `test -f '../src/mxml/element.cc' || echo '$(srcdir)/'`../src/mxml/element.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-element.Tpo $(DEPDIR)/libmediatomb_a-element.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/element.cc' object='libmediatomb_a-element.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-element.o `test -f '../src/mxml/element.cc' || echo '$(srcdir)/'`../src/mxml/element.cc
-+
-+libmediatomb_a-element.obj: ../src/mxml/element.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-element.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-element.Tpo -c -o libmediatomb_a-element.obj `if test -f '../src/mxml/element.cc'; then $(CYGPATH_W) '../src/mxml/element.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/element.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-element.Tpo $(DEPDIR)/libmediatomb_a-element.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/element.cc' object='libmediatomb_a-element.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-element.obj `if test -f '../src/mxml/element.cc'; then $(CYGPATH_W) '../src/mxml/element.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/element.cc'; fi`
-+
-+libmediatomb_a-node.o: ../src/mxml/node.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-node.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-node.Tpo -c -o libmediatomb_a-node.o `test -f '../src/mxml/node.cc' || echo '$(srcdir)/'`../src/mxml/node.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-node.Tpo $(DEPDIR)/libmediatomb_a-node.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/node.cc' object='libmediatomb_a-node.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-node.o `test -f '../src/mxml/node.cc' || echo '$(srcdir)/'`../src/mxml/node.cc
-+
-+libmediatomb_a-node.obj: ../src/mxml/node.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-node.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-node.Tpo -c -o libmediatomb_a-node.obj `if test -f '../src/mxml/node.cc'; then $(CYGPATH_W) '../src/mxml/node.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/node.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-node.Tpo $(DEPDIR)/libmediatomb_a-node.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/node.cc' object='libmediatomb_a-node.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-node.obj `if test -f '../src/mxml/node.cc'; then $(CYGPATH_W) '../src/mxml/node.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/node.cc'; fi`
-+
-+libmediatomb_a-parseexception.o: ../src/mxml/parseexception.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-parseexception.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-parseexception.Tpo -c -o libmediatomb_a-parseexception.o `test -f '../src/mxml/parseexception.cc' || echo '$(srcdir)/'`../src/mxml/parseexception.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-parseexception.Tpo $(DEPDIR)/libmediatomb_a-parseexception.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/parseexception.cc' object='libmediatomb_a-parseexception.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-parseexception.o `test -f '../src/mxml/parseexception.cc' || echo '$(srcdir)/'`../src/mxml/parseexception.cc
-+
-+libmediatomb_a-parseexception.obj: ../src/mxml/parseexception.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-parseexception.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-parseexception.Tpo -c -o libmediatomb_a-parseexception.obj `if test -f '../src/mxml/parseexception.cc'; then $(CYGPATH_W) '../src/mxml/parseexception.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/parseexception.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-parseexception.Tpo $(DEPDIR)/libmediatomb_a-parseexception.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/parseexception.cc' object='libmediatomb_a-parseexception.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-parseexception.obj `if test -f '../src/mxml/parseexception.cc'; then $(CYGPATH_W) '../src/mxml/parseexception.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/parseexception.cc'; fi`
-+
-+libmediatomb_a-parser_expat.o: ../src/mxml/parser_expat.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-parser_expat.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-parser_expat.Tpo -c -o libmediatomb_a-parser_expat.o `test -f '../src/mxml/parser_expat.cc' || echo '$(srcdir)/'`../src/mxml/parser_expat.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-parser_expat.Tpo $(DEPDIR)/libmediatomb_a-parser_expat.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/parser_expat.cc' object='libmediatomb_a-parser_expat.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-parser_expat.o `test -f '../src/mxml/parser_expat.cc' || echo '$(srcdir)/'`../src/mxml/parser_expat.cc
-+
-+libmediatomb_a-parser_expat.obj: ../src/mxml/parser_expat.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-parser_expat.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-parser_expat.Tpo -c -o libmediatomb_a-parser_expat.obj `if test -f '../src/mxml/parser_expat.cc'; then $(CYGPATH_W) '../src/mxml/parser_expat.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/parser_expat.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-parser_expat.Tpo $(DEPDIR)/libmediatomb_a-parser_expat.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/parser_expat.cc' object='libmediatomb_a-parser_expat.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-parser_expat.obj `if test -f '../src/mxml/parser_expat.cc'; then $(CYGPATH_W) '../src/mxml/parser_expat.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/parser_expat.cc'; fi`
-+
-+libmediatomb_a-xml_text.o: ../src/mxml/xml_text.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-xml_text.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-xml_text.Tpo -c -o libmediatomb_a-xml_text.o `test -f '../src/mxml/xml_text.cc' || echo '$(srcdir)/'`../src/mxml/xml_text.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-xml_text.Tpo $(DEPDIR)/libmediatomb_a-xml_text.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/xml_text.cc' object='libmediatomb_a-xml_text.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-xml_text.o `test -f '../src/mxml/xml_text.cc' || echo '$(srcdir)/'`../src/mxml/xml_text.cc
-+
-+libmediatomb_a-xml_text.obj: ../src/mxml/xml_text.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-xml_text.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-xml_text.Tpo -c -o libmediatomb_a-xml_text.obj `if test -f '../src/mxml/xml_text.cc'; then $(CYGPATH_W) '../src/mxml/xml_text.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/xml_text.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-xml_text.Tpo $(DEPDIR)/libmediatomb_a-xml_text.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/xml_text.cc' object='libmediatomb_a-xml_text.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-xml_text.obj `if test -f '../src/mxml/xml_text.cc'; then $(CYGPATH_W) '../src/mxml/xml_text.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/xml_text.cc'; fi`
-+
-+libmediatomb_a-xml_to_json.o: ../src/mxml/xml_to_json.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-xml_to_json.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-xml_to_json.Tpo -c -o libmediatomb_a-xml_to_json.o `test -f '../src/mxml/xml_to_json.cc' || echo '$(srcdir)/'`../src/mxml/xml_to_json.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-xml_to_json.Tpo $(DEPDIR)/libmediatomb_a-xml_to_json.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/xml_to_json.cc' object='libmediatomb_a-xml_to_json.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-xml_to_json.o `test -f '../src/mxml/xml_to_json.cc' || echo '$(srcdir)/'`../src/mxml/xml_to_json.cc
-+
-+libmediatomb_a-xml_to_json.obj: ../src/mxml/xml_to_json.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-xml_to_json.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-xml_to_json.Tpo -c -o libmediatomb_a-xml_to_json.obj `if test -f '../src/mxml/xml_to_json.cc'; then $(CYGPATH_W) '../src/mxml/xml_to_json.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/xml_to_json.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-xml_to_json.Tpo $(DEPDIR)/libmediatomb_a-xml_to_json.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/mxml/xml_to_json.cc' object='libmediatomb_a-xml_to_json.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-xml_to_json.obj `if test -f '../src/mxml/xml_to_json.cc'; then $(CYGPATH_W) '../src/mxml/xml_to_json.cc'; else $(CYGPATH_W) '$(srcdir)/../src/mxml/xml_to_json.cc'; fi`
-+
-+libmediatomb_a-online_service.o: ../src/online_service.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-online_service.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-online_service.Tpo -c -o libmediatomb_a-online_service.o `test -f '../src/online_service.cc' || echo '$(srcdir)/'`../src/online_service.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-online_service.Tpo $(DEPDIR)/libmediatomb_a-online_service.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/online_service.cc' object='libmediatomb_a-online_service.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-online_service.o `test -f '../src/online_service.cc' || echo '$(srcdir)/'`../src/online_service.cc
-+
-+libmediatomb_a-online_service.obj: ../src/online_service.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-online_service.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-online_service.Tpo -c -o libmediatomb_a-online_service.obj `if test -f '../src/online_service.cc'; then $(CYGPATH_W) '../src/online_service.cc'; else $(CYGPATH_W) '$(srcdir)/../src/online_service.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-online_service.Tpo $(DEPDIR)/libmediatomb_a-online_service.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/online_service.cc' object='libmediatomb_a-online_service.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-online_service.obj `if test -f '../src/online_service.cc'; then $(CYGPATH_W) '../src/online_service.cc'; else $(CYGPATH_W) '$(srcdir)/../src/online_service.cc'; fi`
-+
-+libmediatomb_a-online_service_helper.o: ../src/online_service_helper.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-online_service_helper.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-online_service_helper.Tpo -c -o libmediatomb_a-online_service_helper.o `test -f '../src/online_service_helper.cc' || echo '$(srcdir)/'`../src/online_service_helper.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-online_service_helper.Tpo $(DEPDIR)/libmediatomb_a-online_service_helper.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/online_service_helper.cc' object='libmediatomb_a-online_service_helper.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-online_service_helper.o `test -f '../src/online_service_helper.cc' || echo '$(srcdir)/'`../src/online_service_helper.cc
-+
-+libmediatomb_a-online_service_helper.obj: ../src/online_service_helper.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-online_service_helper.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-online_service_helper.Tpo -c -o libmediatomb_a-online_service_helper.obj `if test -f '../src/online_service_helper.cc'; then $(CYGPATH_W) '../src/online_service_helper.cc'; else $(CYGPATH_W) '$(srcdir)/../src/online_service_helper.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-online_service_helper.Tpo $(DEPDIR)/libmediatomb_a-online_service_helper.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/online_service_helper.cc' object='libmediatomb_a-online_service_helper.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-online_service_helper.obj `if test -f '../src/online_service_helper.cc'; then $(CYGPATH_W) '../src/online_service_helper.cc'; else $(CYGPATH_W) '$(srcdir)/../src/online_service_helper.cc'; fi`
-+
-+libmediatomb_a-play_hook.o: ../src/play_hook.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-play_hook.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-play_hook.Tpo -c -o libmediatomb_a-play_hook.o `test -f '../src/play_hook.cc' || echo '$(srcdir)/'`../src/play_hook.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-play_hook.Tpo $(DEPDIR)/libmediatomb_a-play_hook.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/play_hook.cc' object='libmediatomb_a-play_hook.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-play_hook.o `test -f '../src/play_hook.cc' || echo '$(srcdir)/'`../src/play_hook.cc
-+
-+libmediatomb_a-play_hook.obj: ../src/play_hook.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-play_hook.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-play_hook.Tpo -c -o libmediatomb_a-play_hook.obj `if test -f '../src/play_hook.cc'; then $(CYGPATH_W) '../src/play_hook.cc'; else $(CYGPATH_W) '$(srcdir)/../src/play_hook.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-play_hook.Tpo $(DEPDIR)/libmediatomb_a-play_hook.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/play_hook.cc' object='libmediatomb_a-play_hook.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-play_hook.obj `if test -f '../src/play_hook.cc'; then $(CYGPATH_W) '../src/play_hook.cc'; else $(CYGPATH_W) '$(srcdir)/../src/play_hook.cc'; fi`
-+
-+libmediatomb_a-process.o: ../src/process.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-process.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-process.Tpo -c -o libmediatomb_a-process.o `test -f '../src/process.cc' || echo '$(srcdir)/'`../src/process.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-process.Tpo $(DEPDIR)/libmediatomb_a-process.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/process.cc' object='libmediatomb_a-process.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-process.o `test -f '../src/process.cc' || echo '$(srcdir)/'`../src/process.cc
-+
-+libmediatomb_a-process.obj: ../src/process.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-process.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-process.Tpo -c -o libmediatomb_a-process.obj `if test -f '../src/process.cc'; then $(CYGPATH_W) '../src/process.cc'; else $(CYGPATH_W) '$(srcdir)/../src/process.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-process.Tpo $(DEPDIR)/libmediatomb_a-process.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/process.cc' object='libmediatomb_a-process.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-process.obj `if test -f '../src/process.cc'; then $(CYGPATH_W) '../src/process.cc'; else $(CYGPATH_W) '$(srcdir)/../src/process.cc'; fi`
-+
-+libmediatomb_a-process_executor.o: ../src/process_executor.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-process_executor.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-process_executor.Tpo -c -o libmediatomb_a-process_executor.o `test -f '../src/process_executor.cc' || echo '$(srcdir)/'`../src/process_executor.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-process_executor.Tpo $(DEPDIR)/libmediatomb_a-process_executor.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/process_executor.cc' object='libmediatomb_a-process_executor.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-process_executor.o `test -f '../src/process_executor.cc' || echo '$(srcdir)/'`../src/process_executor.cc
-+
-+libmediatomb_a-process_executor.obj: ../src/process_executor.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-process_executor.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-process_executor.Tpo -c -o libmediatomb_a-process_executor.obj `if test -f '../src/process_executor.cc'; then $(CYGPATH_W) '../src/process_executor.cc'; else $(CYGPATH_W) '$(srcdir)/../src/process_executor.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-process_executor.Tpo $(DEPDIR)/libmediatomb_a-process_executor.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/process_executor.cc' object='libmediatomb_a-process_executor.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-process_executor.obj `if test -f '../src/process_executor.cc'; then $(CYGPATH_W) '../src/process_executor.cc'; else $(CYGPATH_W) '$(srcdir)/../src/process_executor.cc'; fi`
-+
-+libmediatomb_a-process_io_handler.o: ../src/process_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-process_io_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-process_io_handler.Tpo -c -o libmediatomb_a-process_io_handler.o `test -f '../src/process_io_handler.cc' || echo '$(srcdir)/'`../src/process_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-process_io_handler.Tpo $(DEPDIR)/libmediatomb_a-process_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/process_io_handler.cc' object='libmediatomb_a-process_io_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-process_io_handler.o `test -f '../src/process_io_handler.cc' || echo '$(srcdir)/'`../src/process_io_handler.cc
-+
-+libmediatomb_a-process_io_handler.obj: ../src/process_io_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-process_io_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-process_io_handler.Tpo -c -o libmediatomb_a-process_io_handler.obj `if test -f '../src/process_io_handler.cc'; then $(CYGPATH_W) '../src/process_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/process_io_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-process_io_handler.Tpo $(DEPDIR)/libmediatomb_a-process_io_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/process_io_handler.cc' object='libmediatomb_a-process_io_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-process_io_handler.obj `if test -f '../src/process_io_handler.cc'; then $(CYGPATH_W) '../src/process_io_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/process_io_handler.cc'; fi`
-+
-+libmediatomb_a-request_handler.o: ../src/request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-request_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-request_handler.Tpo -c -o libmediatomb_a-request_handler.o `test -f '../src/request_handler.cc' || echo '$(srcdir)/'`../src/request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-request_handler.Tpo $(DEPDIR)/libmediatomb_a-request_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/request_handler.cc' object='libmediatomb_a-request_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-request_handler.o `test -f '../src/request_handler.cc' || echo '$(srcdir)/'`../src/request_handler.cc
-+
-+libmediatomb_a-request_handler.obj: ../src/request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-request_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-request_handler.Tpo -c -o libmediatomb_a-request_handler.obj `if test -f '../src/request_handler.cc'; then $(CYGPATH_W) '../src/request_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/request_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-request_handler.Tpo $(DEPDIR)/libmediatomb_a-request_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/request_handler.cc' object='libmediatomb_a-request_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-request_handler.obj `if test -f '../src/request_handler.cc'; then $(CYGPATH_W) '../src/request_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/request_handler.cc'; fi`
-+
-+libmediatomb_a-rexp.o: ../src/rexp.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-rexp.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-rexp.Tpo -c -o libmediatomb_a-rexp.o `test -f '../src/rexp.cc' || echo '$(srcdir)/'`../src/rexp.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-rexp.Tpo $(DEPDIR)/libmediatomb_a-rexp.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/rexp.cc' object='libmediatomb_a-rexp.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-rexp.o `test -f '../src/rexp.cc' || echo '$(srcdir)/'`../src/rexp.cc
-+
-+libmediatomb_a-rexp.obj: ../src/rexp.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-rexp.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-rexp.Tpo -c -o libmediatomb_a-rexp.obj `if test -f '../src/rexp.cc'; then $(CYGPATH_W) '../src/rexp.cc'; else $(CYGPATH_W) '$(srcdir)/../src/rexp.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-rexp.Tpo $(DEPDIR)/libmediatomb_a-rexp.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/rexp.cc' object='libmediatomb_a-rexp.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-rexp.obj `if test -f '../src/rexp.cc'; then $(CYGPATH_W) '../src/rexp.cc'; else $(CYGPATH_W) '$(srcdir)/../src/rexp.cc'; fi`
-+
-+libmediatomb_a-dvd_image_import_script.o: ../src/scripting/dvd_image_import_script.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-dvd_image_import_script.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-dvd_image_import_script.Tpo -c -o libmediatomb_a-dvd_image_import_script.o `test -f '../src/scripting/dvd_image_import_script.cc' || echo '$(srcdir)/'`../src/scripting/dvd_image_import_script.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-dvd_image_import_script.Tpo $(DEPDIR)/libmediatomb_a-dvd_image_import_script.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/dvd_image_import_script.cc' object='libmediatomb_a-dvd_image_import_script.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-dvd_image_import_script.o `test -f '../src/scripting/dvd_image_import_script.cc' || echo '$(srcdir)/'`../src/scripting/dvd_image_import_script.cc
-+
-+libmediatomb_a-dvd_image_import_script.obj: ../src/scripting/dvd_image_import_script.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-dvd_image_import_script.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-dvd_image_import_script.Tpo -c -o libmediatomb_a-dvd_image_import_script.obj `if test -f '../src/scripting/dvd_image_import_script.cc'; then $(CYGPATH_W) '../src/scripting/dvd_image_import_script.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/dvd_image_import_script.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-dvd_image_import_script.Tpo $(DEPDIR)/libmediatomb_a-dvd_image_import_script.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/dvd_image_import_script.cc' object='libmediatomb_a-dvd_image_import_script.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-dvd_image_import_script.obj `if test -f '../src/scripting/dvd_image_import_script.cc'; then $(CYGPATH_W) '../src/scripting/dvd_image_import_script.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/dvd_image_import_script.cc'; fi`
-+
-+libmediatomb_a-import_script.o: ../src/scripting/import_script.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-import_script.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-import_script.Tpo -c -o libmediatomb_a-import_script.o `test -f '../src/scripting/import_script.cc' || echo '$(srcdir)/'`../src/scripting/import_script.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-import_script.Tpo $(DEPDIR)/libmediatomb_a-import_script.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/import_script.cc' object='libmediatomb_a-import_script.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-import_script.o `test -f '../src/scripting/import_script.cc' || echo '$(srcdir)/'`../src/scripting/import_script.cc
-+
-+libmediatomb_a-import_script.obj: ../src/scripting/import_script.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-import_script.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-import_script.Tpo -c -o libmediatomb_a-import_script.obj `if test -f '../src/scripting/import_script.cc'; then $(CYGPATH_W) '../src/scripting/import_script.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/import_script.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-import_script.Tpo $(DEPDIR)/libmediatomb_a-import_script.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/import_script.cc' object='libmediatomb_a-import_script.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-import_script.obj `if test -f '../src/scripting/import_script.cc'; then $(CYGPATH_W) '../src/scripting/import_script.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/import_script.cc'; fi`
-+
-+libmediatomb_a-js_functions.o: ../src/scripting/js_functions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-js_functions.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-js_functions.Tpo -c -o libmediatomb_a-js_functions.o `test -f '../src/scripting/js_functions.cc' || echo '$(srcdir)/'`../src/scripting/js_functions.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-js_functions.Tpo $(DEPDIR)/libmediatomb_a-js_functions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/js_functions.cc' object='libmediatomb_a-js_functions.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-js_functions.o `test -f '../src/scripting/js_functions.cc' || echo '$(srcdir)/'`../src/scripting/js_functions.cc
-+
-+libmediatomb_a-js_functions.obj: ../src/scripting/js_functions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-js_functions.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-js_functions.Tpo -c -o libmediatomb_a-js_functions.obj `if test -f '../src/scripting/js_functions.cc'; then $(CYGPATH_W) '../src/scripting/js_functions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/js_functions.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-js_functions.Tpo $(DEPDIR)/libmediatomb_a-js_functions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/js_functions.cc' object='libmediatomb_a-js_functions.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-js_functions.obj `if test -f '../src/scripting/js_functions.cc'; then $(CYGPATH_W) '../src/scripting/js_functions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/js_functions.cc'; fi`
-+
-+libmediatomb_a-playlist_parser_script.o: ../src/scripting/playlist_parser_script.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-playlist_parser_script.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-playlist_parser_script.Tpo -c -o libmediatomb_a-playlist_parser_script.o `test -f '../src/scripting/playlist_parser_script.cc' || echo '$(srcdir)/'`../src/scripting/playlist_parser_script.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-playlist_parser_script.Tpo $(DEPDIR)/libmediatomb_a-playlist_parser_script.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/playlist_parser_script.cc' object='libmediatomb_a-playlist_parser_script.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-playlist_parser_script.o `test -f '../src/scripting/playlist_parser_script.cc' || echo '$(srcdir)/'`../src/scripting/playlist_parser_script.cc
-+
-+libmediatomb_a-playlist_parser_script.obj: ../src/scripting/playlist_parser_script.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-playlist_parser_script.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-playlist_parser_script.Tpo -c -o libmediatomb_a-playlist_parser_script.obj `if test -f '../src/scripting/playlist_parser_script.cc'; then $(CYGPATH_W) '../src/scripting/playlist_parser_script.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/playlist_parser_script.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-playlist_parser_script.Tpo $(DEPDIR)/libmediatomb_a-playlist_parser_script.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/playlist_parser_script.cc' object='libmediatomb_a-playlist_parser_script.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-playlist_parser_script.obj `if test -f '../src/scripting/playlist_parser_script.cc'; then $(CYGPATH_W) '../src/scripting/playlist_parser_script.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/playlist_parser_script.cc'; fi`
-+
-+libmediatomb_a-runtime.o: ../src/scripting/runtime.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-runtime.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-runtime.Tpo -c -o libmediatomb_a-runtime.o `test -f '../src/scripting/runtime.cc' || echo '$(srcdir)/'`../src/scripting/runtime.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-runtime.Tpo $(DEPDIR)/libmediatomb_a-runtime.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/runtime.cc' object='libmediatomb_a-runtime.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-runtime.o `test -f '../src/scripting/runtime.cc' || echo '$(srcdir)/'`../src/scripting/runtime.cc
-+
-+libmediatomb_a-runtime.obj: ../src/scripting/runtime.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-runtime.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-runtime.Tpo -c -o libmediatomb_a-runtime.obj `if test -f '../src/scripting/runtime.cc'; then $(CYGPATH_W) '../src/scripting/runtime.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/runtime.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-runtime.Tpo $(DEPDIR)/libmediatomb_a-runtime.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/runtime.cc' object='libmediatomb_a-runtime.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-runtime.obj `if test -f '../src/scripting/runtime.cc'; then $(CYGPATH_W) '../src/scripting/runtime.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/runtime.cc'; fi`
-+
-+libmediatomb_a-script.o: ../src/scripting/script.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-script.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-script.Tpo -c -o libmediatomb_a-script.o `test -f '../src/scripting/script.cc' || echo '$(srcdir)/'`../src/scripting/script.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-script.Tpo $(DEPDIR)/libmediatomb_a-script.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/script.cc' object='libmediatomb_a-script.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-script.o `test -f '../src/scripting/script.cc' || echo '$(srcdir)/'`../src/scripting/script.cc
-+
-+libmediatomb_a-script.obj: ../src/scripting/script.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-script.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-script.Tpo -c -o libmediatomb_a-script.obj `if test -f '../src/scripting/script.cc'; then $(CYGPATH_W) '../src/scripting/script.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/script.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-script.Tpo $(DEPDIR)/libmediatomb_a-script.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/scripting/script.cc' object='libmediatomb_a-script.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-script.obj `if test -f '../src/scripting/script.cc'; then $(CYGPATH_W) '../src/scripting/script.cc'; else $(CYGPATH_W) '$(srcdir)/../src/scripting/script.cc'; fi`
-+
-+libmediatomb_a-server.o: ../src/server.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-server.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-server.Tpo -c -o libmediatomb_a-server.o `test -f '../src/server.cc' || echo '$(srcdir)/'`../src/server.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-server.Tpo $(DEPDIR)/libmediatomb_a-server.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/server.cc' object='libmediatomb_a-server.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-server.o `test -f '../src/server.cc' || echo '$(srcdir)/'`../src/server.cc
-+
-+libmediatomb_a-server.obj: ../src/server.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-server.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-server.Tpo -c -o libmediatomb_a-server.obj `if test -f '../src/server.cc'; then $(CYGPATH_W) '../src/server.cc'; else $(CYGPATH_W) '$(srcdir)/../src/server.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-server.Tpo $(DEPDIR)/libmediatomb_a-server.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/server.cc' object='libmediatomb_a-server.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-server.obj `if test -f '../src/server.cc'; then $(CYGPATH_W) '../src/server.cc'; else $(CYGPATH_W) '$(srcdir)/../src/server.cc'; fi`
-+
-+libmediatomb_a-serve_request_handler.o: ../src/serve_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-serve_request_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-serve_request_handler.Tpo -c -o libmediatomb_a-serve_request_handler.o `test -f '../src/serve_request_handler.cc' || echo '$(srcdir)/'`../src/serve_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-serve_request_handler.Tpo $(DEPDIR)/libmediatomb_a-serve_request_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/serve_request_handler.cc' object='libmediatomb_a-serve_request_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-serve_request_handler.o `test -f '../src/serve_request_handler.cc' || echo '$(srcdir)/'`../src/serve_request_handler.cc
-+
-+libmediatomb_a-serve_request_handler.obj: ../src/serve_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-serve_request_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-serve_request_handler.Tpo -c -o libmediatomb_a-serve_request_handler.obj `if test -f '../src/serve_request_handler.cc'; then $(CYGPATH_W) '../src/serve_request_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/serve_request_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-serve_request_handler.Tpo $(DEPDIR)/libmediatomb_a-serve_request_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/serve_request_handler.cc' object='libmediatomb_a-serve_request_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-serve_request_handler.obj `if test -f '../src/serve_request_handler.cc'; then $(CYGPATH_W) '../src/serve_request_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/serve_request_handler.cc'; fi`
-+
-+libmediatomb_a-session_manager.o: ../src/session_manager.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-session_manager.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-session_manager.Tpo -c -o libmediatomb_a-session_manager.o `test -f '../src/session_manager.cc' || echo '$(srcdir)/'`../src/session_manager.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-session_manager.Tpo $(DEPDIR)/libmediatomb_a-session_manager.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/session_manager.cc' object='libmediatomb_a-session_manager.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-session_manager.o `test -f '../src/session_manager.cc' || echo '$(srcdir)/'`../src/session_manager.cc
-+
-+libmediatomb_a-session_manager.obj: ../src/session_manager.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-session_manager.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-session_manager.Tpo -c -o libmediatomb_a-session_manager.obj `if test -f '../src/session_manager.cc'; then $(CYGPATH_W) '../src/session_manager.cc'; else $(CYGPATH_W) '$(srcdir)/../src/session_manager.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-session_manager.Tpo $(DEPDIR)/libmediatomb_a-session_manager.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/session_manager.cc' object='libmediatomb_a-session_manager.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-session_manager.obj `if test -f '../src/session_manager.cc'; then $(CYGPATH_W) '../src/session_manager.cc'; else $(CYGPATH_W) '$(srcdir)/../src/session_manager.cc'; fi`
-+
-+libmediatomb_a-singleton.o: ../src/singleton.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-singleton.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-singleton.Tpo -c -o libmediatomb_a-singleton.o `test -f '../src/singleton.cc' || echo '$(srcdir)/'`../src/singleton.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-singleton.Tpo $(DEPDIR)/libmediatomb_a-singleton.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/singleton.cc' object='libmediatomb_a-singleton.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-singleton.o `test -f '../src/singleton.cc' || echo '$(srcdir)/'`../src/singleton.cc
-+
-+libmediatomb_a-singleton.obj: ../src/singleton.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-singleton.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-singleton.Tpo -c -o libmediatomb_a-singleton.obj `if test -f '../src/singleton.cc'; then $(CYGPATH_W) '../src/singleton.cc'; else $(CYGPATH_W) '$(srcdir)/../src/singleton.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-singleton.Tpo $(DEPDIR)/libmediatomb_a-singleton.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/singleton.cc' object='libmediatomb_a-singleton.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-singleton.obj `if test -f '../src/singleton.cc'; then $(CYGPATH_W) '../src/singleton.cc'; else $(CYGPATH_W) '$(srcdir)/../src/singleton.cc'; fi`
-+
-+libmediatomb_a-sopcast_content_handler.o: ../src/sopcast_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-sopcast_content_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-sopcast_content_handler.Tpo -c -o libmediatomb_a-sopcast_content_handler.o `test -f '../src/sopcast_content_handler.cc' || echo '$(srcdir)/'`../src/sopcast_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-sopcast_content_handler.Tpo $(DEPDIR)/libmediatomb_a-sopcast_content_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/sopcast_content_handler.cc' object='libmediatomb_a-sopcast_content_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-sopcast_content_handler.o `test -f '../src/sopcast_content_handler.cc' || echo '$(srcdir)/'`../src/sopcast_content_handler.cc
-+
-+libmediatomb_a-sopcast_content_handler.obj: ../src/sopcast_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-sopcast_content_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-sopcast_content_handler.Tpo -c -o libmediatomb_a-sopcast_content_handler.obj `if test -f '../src/sopcast_content_handler.cc'; then $(CYGPATH_W) '../src/sopcast_content_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/sopcast_content_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-sopcast_content_handler.Tpo $(DEPDIR)/libmediatomb_a-sopcast_content_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/sopcast_content_handler.cc' object='libmediatomb_a-sopcast_content_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-sopcast_content_handler.obj `if test -f '../src/sopcast_content_handler.cc'; then $(CYGPATH_W) '../src/sopcast_content_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/sopcast_content_handler.cc'; fi`
-+
-+libmediatomb_a-sopcast_service.o: ../src/sopcast_service.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-sopcast_service.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-sopcast_service.Tpo -c -o libmediatomb_a-sopcast_service.o `test -f '../src/sopcast_service.cc' || echo '$(srcdir)/'`../src/sopcast_service.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-sopcast_service.Tpo $(DEPDIR)/libmediatomb_a-sopcast_service.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/sopcast_service.cc' object='libmediatomb_a-sopcast_service.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-sopcast_service.o `test -f '../src/sopcast_service.cc' || echo '$(srcdir)/'`../src/sopcast_service.cc
-+
-+libmediatomb_a-sopcast_service.obj: ../src/sopcast_service.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-sopcast_service.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-sopcast_service.Tpo -c -o libmediatomb_a-sopcast_service.obj `if test -f '../src/sopcast_service.cc'; then $(CYGPATH_W) '../src/sopcast_service.cc'; else $(CYGPATH_W) '$(srcdir)/../src/sopcast_service.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-sopcast_service.Tpo $(DEPDIR)/libmediatomb_a-sopcast_service.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/sopcast_service.cc' object='libmediatomb_a-sopcast_service.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-sopcast_service.obj `if test -f '../src/sopcast_service.cc'; then $(CYGPATH_W) '../src/sopcast_service.cc'; else $(CYGPATH_W) '$(srcdir)/../src/sopcast_service.cc'; fi`
-+
-+libmediatomb_a-cache_object.o: ../src/storage/cache_object.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-cache_object.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-cache_object.Tpo -c -o libmediatomb_a-cache_object.o `test -f '../src/storage/cache_object.cc' || echo '$(srcdir)/'`../src/storage/cache_object.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-cache_object.Tpo $(DEPDIR)/libmediatomb_a-cache_object.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage/cache_object.cc' object='libmediatomb_a-cache_object.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-cache_object.o `test -f '../src/storage/cache_object.cc' || echo '$(srcdir)/'`../src/storage/cache_object.cc
-+
-+libmediatomb_a-cache_object.obj: ../src/storage/cache_object.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-cache_object.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-cache_object.Tpo -c -o libmediatomb_a-cache_object.obj `if test -f '../src/storage/cache_object.cc'; then $(CYGPATH_W) '../src/storage/cache_object.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage/cache_object.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-cache_object.Tpo $(DEPDIR)/libmediatomb_a-cache_object.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage/cache_object.cc' object='libmediatomb_a-cache_object.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-cache_object.obj `if test -f '../src/storage/cache_object.cc'; then $(CYGPATH_W) '../src/storage/cache_object.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage/cache_object.cc'; fi`
-+
-+libmediatomb_a-storage.o: ../src/storage.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-storage.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-storage.Tpo -c -o libmediatomb_a-storage.o `test -f '../src/storage.cc' || echo '$(srcdir)/'`../src/storage.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-storage.Tpo $(DEPDIR)/libmediatomb_a-storage.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage.cc' object='libmediatomb_a-storage.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-storage.o `test -f '../src/storage.cc' || echo '$(srcdir)/'`../src/storage.cc
-+
-+libmediatomb_a-storage.obj: ../src/storage.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-storage.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-storage.Tpo -c -o libmediatomb_a-storage.obj `if test -f '../src/storage.cc'; then $(CYGPATH_W) '../src/storage.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-storage.Tpo $(DEPDIR)/libmediatomb_a-storage.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage.cc' object='libmediatomb_a-storage.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-storage.obj `if test -f '../src/storage.cc'; then $(CYGPATH_W) '../src/storage.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage.cc'; fi`
-+
-+libmediatomb_a-mysql_storage.o: ../src/storage/mysql/mysql_storage.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-mysql_storage.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-mysql_storage.Tpo -c -o libmediatomb_a-mysql_storage.o `test -f '../src/storage/mysql/mysql_storage.cc' || echo '$(srcdir)/'`../src/storage/mysql/mysql_storage.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-mysql_storage.Tpo $(DEPDIR)/libmediatomb_a-mysql_storage.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage/mysql/mysql_storage.cc' object='libmediatomb_a-mysql_storage.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-mysql_storage.o `test -f '../src/storage/mysql/mysql_storage.cc' || echo '$(srcdir)/'`../src/storage/mysql/mysql_storage.cc
-+
-+libmediatomb_a-mysql_storage.obj: ../src/storage/mysql/mysql_storage.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-mysql_storage.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-mysql_storage.Tpo -c -o libmediatomb_a-mysql_storage.obj `if test -f '../src/storage/mysql/mysql_storage.cc'; then $(CYGPATH_W) '../src/storage/mysql/mysql_storage.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage/mysql/mysql_storage.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-mysql_storage.Tpo $(DEPDIR)/libmediatomb_a-mysql_storage.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage/mysql/mysql_storage.cc' object='libmediatomb_a-mysql_storage.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-mysql_storage.obj `if test -f '../src/storage/mysql/mysql_storage.cc'; then $(CYGPATH_W) '../src/storage/mysql/mysql_storage.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage/mysql/mysql_storage.cc'; fi`
-+
-+libmediatomb_a-sqlite3_storage.o: ../src/storage/sqlite3/sqlite3_storage.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-sqlite3_storage.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-sqlite3_storage.Tpo -c -o libmediatomb_a-sqlite3_storage.o `test -f '../src/storage/sqlite3/sqlite3_storage.cc' || echo '$(srcdir)/'`../src/storage/sqlite3/sqlite3_storage.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-sqlite3_storage.Tpo $(DEPDIR)/libmediatomb_a-sqlite3_storage.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage/sqlite3/sqlite3_storage.cc' object='libmediatomb_a-sqlite3_storage.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-sqlite3_storage.o `test -f '../src/storage/sqlite3/sqlite3_storage.cc' || echo '$(srcdir)/'`../src/storage/sqlite3/sqlite3_storage.cc
-+
-+libmediatomb_a-sqlite3_storage.obj: ../src/storage/sqlite3/sqlite3_storage.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-sqlite3_storage.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-sqlite3_storage.Tpo -c -o libmediatomb_a-sqlite3_storage.obj `if test -f '../src/storage/sqlite3/sqlite3_storage.cc'; then $(CYGPATH_W) '../src/storage/sqlite3/sqlite3_storage.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage/sqlite3/sqlite3_storage.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-sqlite3_storage.Tpo $(DEPDIR)/libmediatomb_a-sqlite3_storage.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage/sqlite3/sqlite3_storage.cc' object='libmediatomb_a-sqlite3_storage.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-sqlite3_storage.obj `if test -f '../src/storage/sqlite3/sqlite3_storage.cc'; then $(CYGPATH_W) '../src/storage/sqlite3/sqlite3_storage.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage/sqlite3/sqlite3_storage.cc'; fi`
-+
-+libmediatomb_a-sql_storage.o: ../src/storage/sql_storage.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-sql_storage.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-sql_storage.Tpo -c -o libmediatomb_a-sql_storage.o `test -f '../src/storage/sql_storage.cc' || echo '$(srcdir)/'`../src/storage/sql_storage.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-sql_storage.Tpo $(DEPDIR)/libmediatomb_a-sql_storage.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage/sql_storage.cc' object='libmediatomb_a-sql_storage.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-sql_storage.o `test -f '../src/storage/sql_storage.cc' || echo '$(srcdir)/'`../src/storage/sql_storage.cc
-+
-+libmediatomb_a-sql_storage.obj: ../src/storage/sql_storage.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-sql_storage.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-sql_storage.Tpo -c -o libmediatomb_a-sql_storage.obj `if test -f '../src/storage/sql_storage.cc'; then $(CYGPATH_W) '../src/storage/sql_storage.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage/sql_storage.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-sql_storage.Tpo $(DEPDIR)/libmediatomb_a-sql_storage.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage/sql_storage.cc' object='libmediatomb_a-sql_storage.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-sql_storage.obj `if test -f '../src/storage/sql_storage.cc'; then $(CYGPATH_W) '../src/storage/sql_storage.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage/sql_storage.cc'; fi`
-+
-+libmediatomb_a-storage_cache.o: ../src/storage/storage_cache.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-storage_cache.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-storage_cache.Tpo -c -o libmediatomb_a-storage_cache.o `test -f '../src/storage/storage_cache.cc' || echo '$(srcdir)/'`../src/storage/storage_cache.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-storage_cache.Tpo $(DEPDIR)/libmediatomb_a-storage_cache.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage/storage_cache.cc' object='libmediatomb_a-storage_cache.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-storage_cache.o `test -f '../src/storage/storage_cache.cc' || echo '$(srcdir)/'`../src/storage/storage_cache.cc
-+
-+libmediatomb_a-storage_cache.obj: ../src/storage/storage_cache.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-storage_cache.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-storage_cache.Tpo -c -o libmediatomb_a-storage_cache.obj `if test -f '../src/storage/storage_cache.cc'; then $(CYGPATH_W) '../src/storage/storage_cache.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage/storage_cache.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-storage_cache.Tpo $(DEPDIR)/libmediatomb_a-storage_cache.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/storage/storage_cache.cc' object='libmediatomb_a-storage_cache.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-storage_cache.obj `if test -f '../src/storage/storage_cache.cc'; then $(CYGPATH_W) '../src/storage/storage_cache.cc'; else $(CYGPATH_W) '$(srcdir)/../src/storage/storage_cache.cc'; fi`
-+
-+libmediatomb_a-string_converter.o: ../src/string_converter.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-string_converter.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-string_converter.Tpo -c -o libmediatomb_a-string_converter.o `test -f '../src/string_converter.cc' || echo '$(srcdir)/'`../src/string_converter.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-string_converter.Tpo $(DEPDIR)/libmediatomb_a-string_converter.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/string_converter.cc' object='libmediatomb_a-string_converter.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-string_converter.o `test -f '../src/string_converter.cc' || echo '$(srcdir)/'`../src/string_converter.cc
-+
-+libmediatomb_a-string_converter.obj: ../src/string_converter.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-string_converter.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-string_converter.Tpo -c -o libmediatomb_a-string_converter.obj `if test -f '../src/string_converter.cc'; then $(CYGPATH_W) '../src/string_converter.cc'; else $(CYGPATH_W) '$(srcdir)/../src/string_converter.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-string_converter.Tpo $(DEPDIR)/libmediatomb_a-string_converter.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/string_converter.cc' object='libmediatomb_a-string_converter.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-string_converter.obj `if test -f '../src/string_converter.cc'; then $(CYGPATH_W) '../src/string_converter.cc'; else $(CYGPATH_W) '$(srcdir)/../src/string_converter.cc'; fi`
-+
-+libmediatomb_a-subscription_request.o: ../src/subscription_request.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-subscription_request.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-subscription_request.Tpo -c -o libmediatomb_a-subscription_request.o `test -f '../src/subscription_request.cc' || echo '$(srcdir)/'`../src/subscription_request.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-subscription_request.Tpo $(DEPDIR)/libmediatomb_a-subscription_request.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/subscription_request.cc' object='libmediatomb_a-subscription_request.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-subscription_request.o `test -f '../src/subscription_request.cc' || echo '$(srcdir)/'`../src/subscription_request.cc
-+
-+libmediatomb_a-subscription_request.obj: ../src/subscription_request.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-subscription_request.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-subscription_request.Tpo -c -o libmediatomb_a-subscription_request.obj `if test -f '../src/subscription_request.cc'; then $(CYGPATH_W) '../src/subscription_request.cc'; else $(CYGPATH_W) '$(srcdir)/../src/subscription_request.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-subscription_request.Tpo $(DEPDIR)/libmediatomb_a-subscription_request.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/subscription_request.cc' object='libmediatomb_a-subscription_request.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-subscription_request.obj `if test -f '../src/subscription_request.cc'; then $(CYGPATH_W) '../src/subscription_request.cc'; else $(CYGPATH_W) '$(srcdir)/../src/subscription_request.cc'; fi`
-+
-+libmediatomb_a-sync.o: ../src/sync.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-sync.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-sync.Tpo -c -o libmediatomb_a-sync.o `test -f '../src/sync.cc' || echo '$(srcdir)/'`../src/sync.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-sync.Tpo $(DEPDIR)/libmediatomb_a-sync.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/sync.cc' object='libmediatomb_a-sync.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-sync.o `test -f '../src/sync.cc' || echo '$(srcdir)/'`../src/sync.cc
-+
-+libmediatomb_a-sync.obj: ../src/sync.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-sync.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-sync.Tpo -c -o libmediatomb_a-sync.obj `if test -f '../src/sync.cc'; then $(CYGPATH_W) '../src/sync.cc'; else $(CYGPATH_W) '$(srcdir)/../src/sync.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-sync.Tpo $(DEPDIR)/libmediatomb_a-sync.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/sync.cc' object='libmediatomb_a-sync.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-sync.obj `if test -f '../src/sync.cc'; then $(CYGPATH_W) '../src/sync.cc'; else $(CYGPATH_W) '$(srcdir)/../src/sync.cc'; fi`
-+
-+libmediatomb_a-thread_executor.o: ../src/thread_executor.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-thread_executor.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-thread_executor.Tpo -c -o libmediatomb_a-thread_executor.o `test -f '../src/thread_executor.cc' || echo '$(srcdir)/'`../src/thread_executor.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-thread_executor.Tpo $(DEPDIR)/libmediatomb_a-thread_executor.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/thread_executor.cc' object='libmediatomb_a-thread_executor.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-thread_executor.o `test -f '../src/thread_executor.cc' || echo '$(srcdir)/'`../src/thread_executor.cc
-+
-+libmediatomb_a-thread_executor.obj: ../src/thread_executor.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-thread_executor.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-thread_executor.Tpo -c -o libmediatomb_a-thread_executor.obj `if test -f '../src/thread_executor.cc'; then $(CYGPATH_W) '../src/thread_executor.cc'; else $(CYGPATH_W) '$(srcdir)/../src/thread_executor.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-thread_executor.Tpo $(DEPDIR)/libmediatomb_a-thread_executor.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/thread_executor.cc' object='libmediatomb_a-thread_executor.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-thread_executor.obj `if test -f '../src/thread_executor.cc'; then $(CYGPATH_W) '../src/thread_executor.cc'; else $(CYGPATH_W) '$(srcdir)/../src/thread_executor.cc'; fi`
-+
-+libmediatomb_a-timer.o: ../src/timer.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-timer.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-timer.Tpo -c -o libmediatomb_a-timer.o `test -f '../src/timer.cc' || echo '$(srcdir)/'`../src/timer.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-timer.Tpo $(DEPDIR)/libmediatomb_a-timer.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/timer.cc' object='libmediatomb_a-timer.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-timer.o `test -f '../src/timer.cc' || echo '$(srcdir)/'`../src/timer.cc
-+
-+libmediatomb_a-timer.obj: ../src/timer.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-timer.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-timer.Tpo -c -o libmediatomb_a-timer.obj `if test -f '../src/timer.cc'; then $(CYGPATH_W) '../src/timer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/timer.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-timer.Tpo $(DEPDIR)/libmediatomb_a-timer.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/timer.cc' object='libmediatomb_a-timer.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-timer.obj `if test -f '../src/timer.cc'; then $(CYGPATH_W) '../src/timer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/timer.cc'; fi`
-+
-+libmediatomb_a-tools.o: ../src/tools.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-tools.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-tools.Tpo -c -o libmediatomb_a-tools.o `test -f '../src/tools.cc' || echo '$(srcdir)/'`../src/tools.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-tools.Tpo $(DEPDIR)/libmediatomb_a-tools.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/tools.cc' object='libmediatomb_a-tools.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-tools.o `test -f '../src/tools.cc' || echo '$(srcdir)/'`../src/tools.cc
-+
-+libmediatomb_a-tools.obj: ../src/tools.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-tools.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-tools.Tpo -c -o libmediatomb_a-tools.obj `if test -f '../src/tools.cc'; then $(CYGPATH_W) '../src/tools.cc'; else $(CYGPATH_W) '$(srcdir)/../src/tools.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-tools.Tpo $(DEPDIR)/libmediatomb_a-tools.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/tools.cc' object='libmediatomb_a-tools.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-tools.obj `if test -f '../src/tools.cc'; then $(CYGPATH_W) '../src/tools.cc'; else $(CYGPATH_W) '$(srcdir)/../src/tools.cc'; fi`
-+
-+libmediatomb_a-transcode_dispatcher.o: ../src/transcoding/transcode_dispatcher.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-transcode_dispatcher.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-transcode_dispatcher.Tpo -c -o libmediatomb_a-transcode_dispatcher.o `test -f '../src/transcoding/transcode_dispatcher.cc' || echo '$(srcdir)/'`../src/transcoding/transcode_dispatcher.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-transcode_dispatcher.Tpo $(DEPDIR)/libmediatomb_a-transcode_dispatcher.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/transcoding/transcode_dispatcher.cc' object='libmediatomb_a-transcode_dispatcher.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-transcode_dispatcher.o `test -f '../src/transcoding/transcode_dispatcher.cc' || echo '$(srcdir)/'`../src/transcoding/transcode_dispatcher.cc
-+
-+libmediatomb_a-transcode_dispatcher.obj: ../src/transcoding/transcode_dispatcher.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-transcode_dispatcher.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-transcode_dispatcher.Tpo -c -o libmediatomb_a-transcode_dispatcher.obj `if test -f '../src/transcoding/transcode_dispatcher.cc'; then $(CYGPATH_W) '../src/transcoding/transcode_dispatcher.cc'; else $(CYGPATH_W) '$(srcdir)/../src/transcoding/transcode_dispatcher.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-transcode_dispatcher.Tpo $(DEPDIR)/libmediatomb_a-transcode_dispatcher.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/transcoding/transcode_dispatcher.cc' object='libmediatomb_a-transcode_dispatcher.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-transcode_dispatcher.obj `if test -f '../src/transcoding/transcode_dispatcher.cc'; then $(CYGPATH_W) '../src/transcoding/transcode_dispatcher.cc'; else $(CYGPATH_W) '$(srcdir)/../src/transcoding/transcode_dispatcher.cc'; fi`
-+
-+libmediatomb_a-transcode_ext_handler.o: ../src/transcoding/transcode_ext_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-transcode_ext_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-transcode_ext_handler.Tpo -c -o libmediatomb_a-transcode_ext_handler.o `test -f '../src/transcoding/transcode_ext_handler.cc' || echo '$(srcdir)/'`../src/transcoding/transcode_ext_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-transcode_ext_handler.Tpo $(DEPDIR)/libmediatomb_a-transcode_ext_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/transcoding/transcode_ext_handler.cc' object='libmediatomb_a-transcode_ext_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-transcode_ext_handler.o `test -f '../src/transcoding/transcode_ext_handler.cc' || echo '$(srcdir)/'`../src/transcoding/transcode_ext_handler.cc
-+
-+libmediatomb_a-transcode_ext_handler.obj: ../src/transcoding/transcode_ext_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-transcode_ext_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-transcode_ext_handler.Tpo -c -o libmediatomb_a-transcode_ext_handler.obj `if test -f '../src/transcoding/transcode_ext_handler.cc'; then $(CYGPATH_W) '../src/transcoding/transcode_ext_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/transcoding/transcode_ext_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-transcode_ext_handler.Tpo $(DEPDIR)/libmediatomb_a-transcode_ext_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/transcoding/transcode_ext_handler.cc' object='libmediatomb_a-transcode_ext_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-transcode_ext_handler.obj `if test -f '../src/transcoding/transcode_ext_handler.cc'; then $(CYGPATH_W) '../src/transcoding/transcode_ext_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/transcoding/transcode_ext_handler.cc'; fi`
-+
-+libmediatomb_a-transcoding.o: ../src/transcoding/transcoding.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-transcoding.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-transcoding.Tpo -c -o libmediatomb_a-transcoding.o `test -f '../src/transcoding/transcoding.cc' || echo '$(srcdir)/'`../src/transcoding/transcoding.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-transcoding.Tpo $(DEPDIR)/libmediatomb_a-transcoding.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/transcoding/transcoding.cc' object='libmediatomb_a-transcoding.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-transcoding.o `test -f '../src/transcoding/transcoding.cc' || echo '$(srcdir)/'`../src/transcoding/transcoding.cc
-+
-+libmediatomb_a-transcoding.obj: ../src/transcoding/transcoding.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-transcoding.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-transcoding.Tpo -c -o libmediatomb_a-transcoding.obj `if test -f '../src/transcoding/transcoding.cc'; then $(CYGPATH_W) '../src/transcoding/transcoding.cc'; else $(CYGPATH_W) '$(srcdir)/../src/transcoding/transcoding.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-transcoding.Tpo $(DEPDIR)/libmediatomb_a-transcoding.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/transcoding/transcoding.cc' object='libmediatomb_a-transcoding.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-transcoding.obj `if test -f '../src/transcoding/transcoding.cc'; then $(CYGPATH_W) '../src/transcoding/transcoding.cc'; else $(CYGPATH_W) '$(srcdir)/../src/transcoding/transcoding.cc'; fi`
-+
-+libmediatomb_a-transcoding_process_executor.o: ../src/transcoding/transcoding_process_executor.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-transcoding_process_executor.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-transcoding_process_executor.Tpo -c -o libmediatomb_a-transcoding_process_executor.o `test -f '../src/transcoding/transcoding_process_executor.cc' || echo '$(srcdir)/'`../src/transcoding/transcoding_process_executor.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-transcoding_process_executor.Tpo $(DEPDIR)/libmediatomb_a-transcoding_process_executor.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/transcoding/transcoding_process_executor.cc' object='libmediatomb_a-transcoding_process_executor.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-transcoding_process_executor.o `test -f '../src/transcoding/transcoding_process_executor.cc' || echo '$(srcdir)/'`../src/transcoding/transcoding_process_executor.cc
-+
-+libmediatomb_a-transcoding_process_executor.obj: ../src/transcoding/transcoding_process_executor.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-transcoding_process_executor.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-transcoding_process_executor.Tpo -c -o libmediatomb_a-transcoding_process_executor.obj `if test -f '../src/transcoding/transcoding_process_executor.cc'; then $(CYGPATH_W) '../src/transcoding/transcoding_process_executor.cc'; else $(CYGPATH_W) '$(srcdir)/../src/transcoding/transcoding_process_executor.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-transcoding_process_executor.Tpo $(DEPDIR)/libmediatomb_a-transcoding_process_executor.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/transcoding/transcoding_process_executor.cc' object='libmediatomb_a-transcoding_process_executor.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-transcoding_process_executor.obj `if test -f '../src/transcoding/transcoding_process_executor.cc'; then $(CYGPATH_W) '../src/transcoding/transcoding_process_executor.cc'; else $(CYGPATH_W) '$(srcdir)/../src/transcoding/transcoding_process_executor.cc'; fi`
-+
-+libmediatomb_a-update_manager.o: ../src/update_manager.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-update_manager.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-update_manager.Tpo -c -o libmediatomb_a-update_manager.o `test -f '../src/update_manager.cc' || echo '$(srcdir)/'`../src/update_manager.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-update_manager.Tpo $(DEPDIR)/libmediatomb_a-update_manager.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/update_manager.cc' object='libmediatomb_a-update_manager.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-update_manager.o `test -f '../src/update_manager.cc' || echo '$(srcdir)/'`../src/update_manager.cc
-+
-+libmediatomb_a-update_manager.obj: ../src/update_manager.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-update_manager.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-update_manager.Tpo -c -o libmediatomb_a-update_manager.obj `if test -f '../src/update_manager.cc'; then $(CYGPATH_W) '../src/update_manager.cc'; else $(CYGPATH_W) '$(srcdir)/../src/update_manager.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-update_manager.Tpo $(DEPDIR)/libmediatomb_a-update_manager.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/update_manager.cc' object='libmediatomb_a-update_manager.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-update_manager.obj `if test -f '../src/update_manager.cc'; then $(CYGPATH_W) '../src/update_manager.cc'; else $(CYGPATH_W) '$(srcdir)/../src/update_manager.cc'; fi`
-+
-+libmediatomb_a-upnp_cds_actions.o: ../src/upnp_cds_actions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cds_actions.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cds_actions.Tpo -c -o libmediatomb_a-upnp_cds_actions.o `test -f '../src/upnp_cds_actions.cc' || echo '$(srcdir)/'`../src/upnp_cds_actions.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cds_actions.Tpo $(DEPDIR)/libmediatomb_a-upnp_cds_actions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cds_actions.cc' object='libmediatomb_a-upnp_cds_actions.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cds_actions.o `test -f '../src/upnp_cds_actions.cc' || echo '$(srcdir)/'`../src/upnp_cds_actions.cc
-+
-+libmediatomb_a-upnp_cds_actions.obj: ../src/upnp_cds_actions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cds_actions.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cds_actions.Tpo -c -o libmediatomb_a-upnp_cds_actions.obj `if test -f '../src/upnp_cds_actions.cc'; then $(CYGPATH_W) '../src/upnp_cds_actions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cds_actions.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cds_actions.Tpo $(DEPDIR)/libmediatomb_a-upnp_cds_actions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cds_actions.cc' object='libmediatomb_a-upnp_cds_actions.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cds_actions.obj `if test -f '../src/upnp_cds_actions.cc'; then $(CYGPATH_W) '../src/upnp_cds_actions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cds_actions.cc'; fi`
-+
-+libmediatomb_a-upnp_cds.o: ../src/upnp_cds.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cds.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cds.Tpo -c -o libmediatomb_a-upnp_cds.o `test -f '../src/upnp_cds.cc' || echo '$(srcdir)/'`../src/upnp_cds.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cds.Tpo $(DEPDIR)/libmediatomb_a-upnp_cds.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cds.cc' object='libmediatomb_a-upnp_cds.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cds.o `test -f '../src/upnp_cds.cc' || echo '$(srcdir)/'`../src/upnp_cds.cc
-+
-+libmediatomb_a-upnp_cds.obj: ../src/upnp_cds.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cds.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cds.Tpo -c -o libmediatomb_a-upnp_cds.obj `if test -f '../src/upnp_cds.cc'; then $(CYGPATH_W) '../src/upnp_cds.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cds.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cds.Tpo $(DEPDIR)/libmediatomb_a-upnp_cds.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cds.cc' object='libmediatomb_a-upnp_cds.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cds.obj `if test -f '../src/upnp_cds.cc'; then $(CYGPATH_W) '../src/upnp_cds.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cds.cc'; fi`
-+
-+libmediatomb_a-upnp_cds_subscriptions.o: ../src/upnp_cds_subscriptions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cds_subscriptions.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cds_subscriptions.Tpo -c -o libmediatomb_a-upnp_cds_subscriptions.o `test -f '../src/upnp_cds_subscriptions.cc' || echo '$(srcdir)/'`../src/upnp_cds_subscriptions.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cds_subscriptions.Tpo $(DEPDIR)/libmediatomb_a-upnp_cds_subscriptions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cds_subscriptions.cc' object='libmediatomb_a-upnp_cds_subscriptions.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cds_subscriptions.o `test -f '../src/upnp_cds_subscriptions.cc' || echo '$(srcdir)/'`../src/upnp_cds_subscriptions.cc
-+
-+libmediatomb_a-upnp_cds_subscriptions.obj: ../src/upnp_cds_subscriptions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cds_subscriptions.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cds_subscriptions.Tpo -c -o libmediatomb_a-upnp_cds_subscriptions.obj `if test -f '../src/upnp_cds_subscriptions.cc'; then $(CYGPATH_W) '../src/upnp_cds_subscriptions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cds_subscriptions.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cds_subscriptions.Tpo $(DEPDIR)/libmediatomb_a-upnp_cds_subscriptions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cds_subscriptions.cc' object='libmediatomb_a-upnp_cds_subscriptions.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cds_subscriptions.obj `if test -f '../src/upnp_cds_subscriptions.cc'; then $(CYGPATH_W) '../src/upnp_cds_subscriptions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cds_subscriptions.cc'; fi`
-+
-+libmediatomb_a-upnp_cm_actions.o: ../src/upnp_cm_actions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cm_actions.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cm_actions.Tpo -c -o libmediatomb_a-upnp_cm_actions.o `test -f '../src/upnp_cm_actions.cc' || echo '$(srcdir)/'`../src/upnp_cm_actions.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cm_actions.Tpo $(DEPDIR)/libmediatomb_a-upnp_cm_actions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cm_actions.cc' object='libmediatomb_a-upnp_cm_actions.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cm_actions.o `test -f '../src/upnp_cm_actions.cc' || echo '$(srcdir)/'`../src/upnp_cm_actions.cc
-+
-+libmediatomb_a-upnp_cm_actions.obj: ../src/upnp_cm_actions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cm_actions.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cm_actions.Tpo -c -o libmediatomb_a-upnp_cm_actions.obj `if test -f '../src/upnp_cm_actions.cc'; then $(CYGPATH_W) '../src/upnp_cm_actions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cm_actions.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cm_actions.Tpo $(DEPDIR)/libmediatomb_a-upnp_cm_actions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cm_actions.cc' object='libmediatomb_a-upnp_cm_actions.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cm_actions.obj `if test -f '../src/upnp_cm_actions.cc'; then $(CYGPATH_W) '../src/upnp_cm_actions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cm_actions.cc'; fi`
-+
-+libmediatomb_a-upnp_cm.o: ../src/upnp_cm.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cm.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cm.Tpo -c -o libmediatomb_a-upnp_cm.o `test -f '../src/upnp_cm.cc' || echo '$(srcdir)/'`../src/upnp_cm.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cm.Tpo $(DEPDIR)/libmediatomb_a-upnp_cm.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cm.cc' object='libmediatomb_a-upnp_cm.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cm.o `test -f '../src/upnp_cm.cc' || echo '$(srcdir)/'`../src/upnp_cm.cc
-+
-+libmediatomb_a-upnp_cm.obj: ../src/upnp_cm.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cm.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cm.Tpo -c -o libmediatomb_a-upnp_cm.obj `if test -f '../src/upnp_cm.cc'; then $(CYGPATH_W) '../src/upnp_cm.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cm.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cm.Tpo $(DEPDIR)/libmediatomb_a-upnp_cm.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cm.cc' object='libmediatomb_a-upnp_cm.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cm.obj `if test -f '../src/upnp_cm.cc'; then $(CYGPATH_W) '../src/upnp_cm.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cm.cc'; fi`
-+
-+libmediatomb_a-upnp_cm_subscriptions.o: ../src/upnp_cm_subscriptions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cm_subscriptions.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cm_subscriptions.Tpo -c -o libmediatomb_a-upnp_cm_subscriptions.o `test -f '../src/upnp_cm_subscriptions.cc' || echo '$(srcdir)/'`../src/upnp_cm_subscriptions.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cm_subscriptions.Tpo $(DEPDIR)/libmediatomb_a-upnp_cm_subscriptions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cm_subscriptions.cc' object='libmediatomb_a-upnp_cm_subscriptions.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cm_subscriptions.o `test -f '../src/upnp_cm_subscriptions.cc' || echo '$(srcdir)/'`../src/upnp_cm_subscriptions.cc
-+
-+libmediatomb_a-upnp_cm_subscriptions.obj: ../src/upnp_cm_subscriptions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_cm_subscriptions.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_cm_subscriptions.Tpo -c -o libmediatomb_a-upnp_cm_subscriptions.obj `if test -f '../src/upnp_cm_subscriptions.cc'; then $(CYGPATH_W) '../src/upnp_cm_subscriptions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cm_subscriptions.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_cm_subscriptions.Tpo $(DEPDIR)/libmediatomb_a-upnp_cm_subscriptions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_cm_subscriptions.cc' object='libmediatomb_a-upnp_cm_subscriptions.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_cm_subscriptions.obj `if test -f '../src/upnp_cm_subscriptions.cc'; then $(CYGPATH_W) '../src/upnp_cm_subscriptions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_cm_subscriptions.cc'; fi`
-+
-+libmediatomb_a-upnp_mrreg_actions.o: ../src/upnp_mrreg_actions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_mrreg_actions.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_mrreg_actions.Tpo -c -o libmediatomb_a-upnp_mrreg_actions.o `test -f '../src/upnp_mrreg_actions.cc' || echo '$(srcdir)/'`../src/upnp_mrreg_actions.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_mrreg_actions.Tpo $(DEPDIR)/libmediatomb_a-upnp_mrreg_actions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_mrreg_actions.cc' object='libmediatomb_a-upnp_mrreg_actions.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_mrreg_actions.o `test -f '../src/upnp_mrreg_actions.cc' || echo '$(srcdir)/'`../src/upnp_mrreg_actions.cc
-+
-+libmediatomb_a-upnp_mrreg_actions.obj: ../src/upnp_mrreg_actions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_mrreg_actions.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_mrreg_actions.Tpo -c -o libmediatomb_a-upnp_mrreg_actions.obj `if test -f '../src/upnp_mrreg_actions.cc'; then $(CYGPATH_W) '../src/upnp_mrreg_actions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_mrreg_actions.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_mrreg_actions.Tpo $(DEPDIR)/libmediatomb_a-upnp_mrreg_actions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_mrreg_actions.cc' object='libmediatomb_a-upnp_mrreg_actions.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_mrreg_actions.obj `if test -f '../src/upnp_mrreg_actions.cc'; then $(CYGPATH_W) '../src/upnp_mrreg_actions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_mrreg_actions.cc'; fi`
-+
-+libmediatomb_a-upnp_mrreg.o: ../src/upnp_mrreg.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_mrreg.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_mrreg.Tpo -c -o libmediatomb_a-upnp_mrreg.o `test -f '../src/upnp_mrreg.cc' || echo '$(srcdir)/'`../src/upnp_mrreg.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_mrreg.Tpo $(DEPDIR)/libmediatomb_a-upnp_mrreg.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_mrreg.cc' object='libmediatomb_a-upnp_mrreg.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_mrreg.o `test -f '../src/upnp_mrreg.cc' || echo '$(srcdir)/'`../src/upnp_mrreg.cc
-+
-+libmediatomb_a-upnp_mrreg.obj: ../src/upnp_mrreg.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_mrreg.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_mrreg.Tpo -c -o libmediatomb_a-upnp_mrreg.obj `if test -f '../src/upnp_mrreg.cc'; then $(CYGPATH_W) '../src/upnp_mrreg.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_mrreg.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_mrreg.Tpo $(DEPDIR)/libmediatomb_a-upnp_mrreg.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_mrreg.cc' object='libmediatomb_a-upnp_mrreg.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_mrreg.obj `if test -f '../src/upnp_mrreg.cc'; then $(CYGPATH_W) '../src/upnp_mrreg.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_mrreg.cc'; fi`
-+
-+libmediatomb_a-upnp_mrreg_subscriptions.o: ../src/upnp_mrreg_subscriptions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_mrreg_subscriptions.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_mrreg_subscriptions.Tpo -c -o libmediatomb_a-upnp_mrreg_subscriptions.o `test -f '../src/upnp_mrreg_subscriptions.cc' || echo '$(srcdir)/'`../src/upnp_mrreg_subscriptions.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_mrreg_subscriptions.Tpo $(DEPDIR)/libmediatomb_a-upnp_mrreg_subscriptions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_mrreg_subscriptions.cc' object='libmediatomb_a-upnp_mrreg_subscriptions.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_mrreg_subscriptions.o `test -f '../src/upnp_mrreg_subscriptions.cc' || echo '$(srcdir)/'`../src/upnp_mrreg_subscriptions.cc
-+
-+libmediatomb_a-upnp_mrreg_subscriptions.obj: ../src/upnp_mrreg_subscriptions.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_mrreg_subscriptions.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_mrreg_subscriptions.Tpo -c -o libmediatomb_a-upnp_mrreg_subscriptions.obj `if test -f '../src/upnp_mrreg_subscriptions.cc'; then $(CYGPATH_W) '../src/upnp_mrreg_subscriptions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_mrreg_subscriptions.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_mrreg_subscriptions.Tpo $(DEPDIR)/libmediatomb_a-upnp_mrreg_subscriptions.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_mrreg_subscriptions.cc' object='libmediatomb_a-upnp_mrreg_subscriptions.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_mrreg_subscriptions.obj `if test -f '../src/upnp_mrreg_subscriptions.cc'; then $(CYGPATH_W) '../src/upnp_mrreg_subscriptions.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_mrreg_subscriptions.cc'; fi`
-+
-+libmediatomb_a-upnp_xml.o: ../src/upnp_xml.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_xml.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_xml.Tpo -c -o libmediatomb_a-upnp_xml.o `test -f '../src/upnp_xml.cc' || echo '$(srcdir)/'`../src/upnp_xml.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_xml.Tpo $(DEPDIR)/libmediatomb_a-upnp_xml.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_xml.cc' object='libmediatomb_a-upnp_xml.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_xml.o `test -f '../src/upnp_xml.cc' || echo '$(srcdir)/'`../src/upnp_xml.cc
-+
-+libmediatomb_a-upnp_xml.obj: ../src/upnp_xml.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-upnp_xml.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-upnp_xml.Tpo -c -o libmediatomb_a-upnp_xml.obj `if test -f '../src/upnp_xml.cc'; then $(CYGPATH_W) '../src/upnp_xml.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_xml.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-upnp_xml.Tpo $(DEPDIR)/libmediatomb_a-upnp_xml.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/upnp_xml.cc' object='libmediatomb_a-upnp_xml.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-upnp_xml.obj `if test -f '../src/upnp_xml.cc'; then $(CYGPATH_W) '../src/upnp_xml.cc'; else $(CYGPATH_W) '$(srcdir)/../src/upnp_xml.cc'; fi`
-+
-+libmediatomb_a-url.o: ../src/url.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-url.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-url.Tpo -c -o libmediatomb_a-url.o `test -f '../src/url.cc' || echo '$(srcdir)/'`../src/url.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-url.Tpo $(DEPDIR)/libmediatomb_a-url.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/url.cc' object='libmediatomb_a-url.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-url.o `test -f '../src/url.cc' || echo '$(srcdir)/'`../src/url.cc
-+
-+libmediatomb_a-url.obj: ../src/url.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-url.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-url.Tpo -c -o libmediatomb_a-url.obj `if test -f '../src/url.cc'; then $(CYGPATH_W) '../src/url.cc'; else $(CYGPATH_W) '$(srcdir)/../src/url.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-url.Tpo $(DEPDIR)/libmediatomb_a-url.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/url.cc' object='libmediatomb_a-url.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-url.obj `if test -f '../src/url.cc'; then $(CYGPATH_W) '../src/url.cc'; else $(CYGPATH_W) '$(srcdir)/../src/url.cc'; fi`
-+
-+libmediatomb_a-url_request_handler.o: ../src/url_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-url_request_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-url_request_handler.Tpo -c -o libmediatomb_a-url_request_handler.o `test -f '../src/url_request_handler.cc' || echo '$(srcdir)/'`../src/url_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-url_request_handler.Tpo $(DEPDIR)/libmediatomb_a-url_request_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/url_request_handler.cc' object='libmediatomb_a-url_request_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-url_request_handler.o `test -f '../src/url_request_handler.cc' || echo '$(srcdir)/'`../src/url_request_handler.cc
-+
-+libmediatomb_a-url_request_handler.obj: ../src/url_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-url_request_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-url_request_handler.Tpo -c -o libmediatomb_a-url_request_handler.obj `if test -f '../src/url_request_handler.cc'; then $(CYGPATH_W) '../src/url_request_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/url_request_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-url_request_handler.Tpo $(DEPDIR)/libmediatomb_a-url_request_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/url_request_handler.cc' object='libmediatomb_a-url_request_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-url_request_handler.obj `if test -f '../src/url_request_handler.cc'; then $(CYGPATH_W) '../src/url_request_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/url_request_handler.cc'; fi`
-+
-+libmediatomb_a-action.o: ../src/web/action.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-action.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-action.Tpo -c -o libmediatomb_a-action.o `test -f '../src/web/action.cc' || echo '$(srcdir)/'`../src/web/action.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-action.Tpo $(DEPDIR)/libmediatomb_a-action.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/action.cc' object='libmediatomb_a-action.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-action.o `test -f '../src/web/action.cc' || echo '$(srcdir)/'`../src/web/action.cc
-+
-+libmediatomb_a-action.obj: ../src/web/action.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-action.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-action.Tpo -c -o libmediatomb_a-action.obj `if test -f '../src/web/action.cc'; then $(CYGPATH_W) '../src/web/action.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/action.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-action.Tpo $(DEPDIR)/libmediatomb_a-action.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/action.cc' object='libmediatomb_a-action.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-action.obj `if test -f '../src/web/action.cc'; then $(CYGPATH_W) '../src/web/action.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/action.cc'; fi`
-+
-+libmediatomb_a-add.o: ../src/web/add.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-add.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-add.Tpo -c -o libmediatomb_a-add.o `test -f '../src/web/add.cc' || echo '$(srcdir)/'`../src/web/add.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-add.Tpo $(DEPDIR)/libmediatomb_a-add.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/add.cc' object='libmediatomb_a-add.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-add.o `test -f '../src/web/add.cc' || echo '$(srcdir)/'`../src/web/add.cc
-+
-+libmediatomb_a-add.obj: ../src/web/add.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-add.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-add.Tpo -c -o libmediatomb_a-add.obj `if test -f '../src/web/add.cc'; then $(CYGPATH_W) '../src/web/add.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/add.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-add.Tpo $(DEPDIR)/libmediatomb_a-add.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/add.cc' object='libmediatomb_a-add.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-add.obj `if test -f '../src/web/add.cc'; then $(CYGPATH_W) '../src/web/add.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/add.cc'; fi`
-+
-+libmediatomb_a-add_object.o: ../src/web/add_object.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-add_object.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-add_object.Tpo -c -o libmediatomb_a-add_object.o `test -f '../src/web/add_object.cc' || echo '$(srcdir)/'`../src/web/add_object.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-add_object.Tpo $(DEPDIR)/libmediatomb_a-add_object.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/add_object.cc' object='libmediatomb_a-add_object.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-add_object.o `test -f '../src/web/add_object.cc' || echo '$(srcdir)/'`../src/web/add_object.cc
-+
-+libmediatomb_a-add_object.obj: ../src/web/add_object.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-add_object.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-add_object.Tpo -c -o libmediatomb_a-add_object.obj `if test -f '../src/web/add_object.cc'; then $(CYGPATH_W) '../src/web/add_object.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/add_object.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-add_object.Tpo $(DEPDIR)/libmediatomb_a-add_object.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/add_object.cc' object='libmediatomb_a-add_object.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-add_object.obj `if test -f '../src/web/add_object.cc'; then $(CYGPATH_W) '../src/web/add_object.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/add_object.cc'; fi`
-+
-+libmediatomb_a-auth.o: ../src/web/auth.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-auth.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-auth.Tpo -c -o libmediatomb_a-auth.o `test -f '../src/web/auth.cc' || echo '$(srcdir)/'`../src/web/auth.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-auth.Tpo $(DEPDIR)/libmediatomb_a-auth.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/auth.cc' object='libmediatomb_a-auth.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-auth.o `test -f '../src/web/auth.cc' || echo '$(srcdir)/'`../src/web/auth.cc
-+
-+libmediatomb_a-auth.obj: ../src/web/auth.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-auth.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-auth.Tpo -c -o libmediatomb_a-auth.obj `if test -f '../src/web/auth.cc'; then $(CYGPATH_W) '../src/web/auth.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/auth.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-auth.Tpo $(DEPDIR)/libmediatomb_a-auth.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/auth.cc' object='libmediatomb_a-auth.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-auth.obj `if test -f '../src/web/auth.cc'; then $(CYGPATH_W) '../src/web/auth.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/auth.cc'; fi`
-+
-+libmediatomb_a-web_callbacks.o: ../src/web_callbacks.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-web_callbacks.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-web_callbacks.Tpo -c -o libmediatomb_a-web_callbacks.o `test -f '../src/web_callbacks.cc' || echo '$(srcdir)/'`../src/web_callbacks.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-web_callbacks.Tpo $(DEPDIR)/libmediatomb_a-web_callbacks.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web_callbacks.cc' object='libmediatomb_a-web_callbacks.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-web_callbacks.o `test -f '../src/web_callbacks.cc' || echo '$(srcdir)/'`../src/web_callbacks.cc
-+
-+libmediatomb_a-web_callbacks.obj: ../src/web_callbacks.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-web_callbacks.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-web_callbacks.Tpo -c -o libmediatomb_a-web_callbacks.obj `if test -f '../src/web_callbacks.cc'; then $(CYGPATH_W) '../src/web_callbacks.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web_callbacks.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-web_callbacks.Tpo $(DEPDIR)/libmediatomb_a-web_callbacks.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web_callbacks.cc' object='libmediatomb_a-web_callbacks.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-web_callbacks.obj `if test -f '../src/web_callbacks.cc'; then $(CYGPATH_W) '../src/web_callbacks.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web_callbacks.cc'; fi`
-+
-+libmediatomb_a-containers.o: ../src/web/containers.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-containers.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-containers.Tpo -c -o libmediatomb_a-containers.o `test -f '../src/web/containers.cc' || echo '$(srcdir)/'`../src/web/containers.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-containers.Tpo $(DEPDIR)/libmediatomb_a-containers.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/containers.cc' object='libmediatomb_a-containers.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-containers.o `test -f '../src/web/containers.cc' || echo '$(srcdir)/'`../src/web/containers.cc
-+
-+libmediatomb_a-containers.obj: ../src/web/containers.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-containers.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-containers.Tpo -c -o libmediatomb_a-containers.obj `if test -f '../src/web/containers.cc'; then $(CYGPATH_W) '../src/web/containers.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/containers.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-containers.Tpo $(DEPDIR)/libmediatomb_a-containers.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/containers.cc' object='libmediatomb_a-containers.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-containers.obj `if test -f '../src/web/containers.cc'; then $(CYGPATH_W) '../src/web/containers.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/containers.cc'; fi`
-+
-+libmediatomb_a-directories.o: ../src/web/directories.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-directories.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-directories.Tpo -c -o libmediatomb_a-directories.o `test -f '../src/web/directories.cc' || echo '$(srcdir)/'`../src/web/directories.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-directories.Tpo $(DEPDIR)/libmediatomb_a-directories.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/directories.cc' object='libmediatomb_a-directories.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-directories.o `test -f '../src/web/directories.cc' || echo '$(srcdir)/'`../src/web/directories.cc
-+
-+libmediatomb_a-directories.obj: ../src/web/directories.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-directories.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-directories.Tpo -c -o libmediatomb_a-directories.obj `if test -f '../src/web/directories.cc'; then $(CYGPATH_W) '../src/web/directories.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/directories.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-directories.Tpo $(DEPDIR)/libmediatomb_a-directories.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/directories.cc' object='libmediatomb_a-directories.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-directories.obj `if test -f '../src/web/directories.cc'; then $(CYGPATH_W) '../src/web/directories.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/directories.cc'; fi`
-+
-+libmediatomb_a-edit_load.o: ../src/web/edit_load.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-edit_load.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-edit_load.Tpo -c -o libmediatomb_a-edit_load.o `test -f '../src/web/edit_load.cc' || echo '$(srcdir)/'`../src/web/edit_load.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-edit_load.Tpo $(DEPDIR)/libmediatomb_a-edit_load.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/edit_load.cc' object='libmediatomb_a-edit_load.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-edit_load.o `test -f '../src/web/edit_load.cc' || echo '$(srcdir)/'`../src/web/edit_load.cc
-+
-+libmediatomb_a-edit_load.obj: ../src/web/edit_load.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-edit_load.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-edit_load.Tpo -c -o libmediatomb_a-edit_load.obj `if test -f '../src/web/edit_load.cc'; then $(CYGPATH_W) '../src/web/edit_load.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/edit_load.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-edit_load.Tpo $(DEPDIR)/libmediatomb_a-edit_load.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/edit_load.cc' object='libmediatomb_a-edit_load.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-edit_load.obj `if test -f '../src/web/edit_load.cc'; then $(CYGPATH_W) '../src/web/edit_load.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/edit_load.cc'; fi`
-+
-+libmediatomb_a-edit_save.o: ../src/web/edit_save.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-edit_save.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-edit_save.Tpo -c -o libmediatomb_a-edit_save.o `test -f '../src/web/edit_save.cc' || echo '$(srcdir)/'`../src/web/edit_save.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-edit_save.Tpo $(DEPDIR)/libmediatomb_a-edit_save.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/edit_save.cc' object='libmediatomb_a-edit_save.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-edit_save.o `test -f '../src/web/edit_save.cc' || echo '$(srcdir)/'`../src/web/edit_save.cc
-+
-+libmediatomb_a-edit_save.obj: ../src/web/edit_save.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-edit_save.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-edit_save.Tpo -c -o libmediatomb_a-edit_save.obj `if test -f '../src/web/edit_save.cc'; then $(CYGPATH_W) '../src/web/edit_save.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/edit_save.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-edit_save.Tpo $(DEPDIR)/libmediatomb_a-edit_save.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/edit_save.cc' object='libmediatomb_a-edit_save.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-edit_save.obj `if test -f '../src/web/edit_save.cc'; then $(CYGPATH_W) '../src/web/edit_save.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/edit_save.cc'; fi`
-+
-+libmediatomb_a-files.o: ../src/web/files.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-files.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-files.Tpo -c -o libmediatomb_a-files.o `test -f '../src/web/files.cc' || echo '$(srcdir)/'`../src/web/files.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-files.Tpo $(DEPDIR)/libmediatomb_a-files.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/files.cc' object='libmediatomb_a-files.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-files.o `test -f '../src/web/files.cc' || echo '$(srcdir)/'`../src/web/files.cc
-+
-+libmediatomb_a-files.obj: ../src/web/files.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-files.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-files.Tpo -c -o libmediatomb_a-files.obj `if test -f '../src/web/files.cc'; then $(CYGPATH_W) '../src/web/files.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/files.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-files.Tpo $(DEPDIR)/libmediatomb_a-files.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/files.cc' object='libmediatomb_a-files.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-files.obj `if test -f '../src/web/files.cc'; then $(CYGPATH_W) '../src/web/files.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/files.cc'; fi`
-+
-+libmediatomb_a-items.o: ../src/web/items.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-items.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-items.Tpo -c -o libmediatomb_a-items.o `test -f '../src/web/items.cc' || echo '$(srcdir)/'`../src/web/items.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-items.Tpo $(DEPDIR)/libmediatomb_a-items.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/items.cc' object='libmediatomb_a-items.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-items.o `test -f '../src/web/items.cc' || echo '$(srcdir)/'`../src/web/items.cc
-+
-+libmediatomb_a-items.obj: ../src/web/items.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-items.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-items.Tpo -c -o libmediatomb_a-items.obj `if test -f '../src/web/items.cc'; then $(CYGPATH_W) '../src/web/items.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/items.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-items.Tpo $(DEPDIR)/libmediatomb_a-items.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/items.cc' object='libmediatomb_a-items.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-items.obj `if test -f '../src/web/items.cc'; then $(CYGPATH_W) '../src/web/items.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/items.cc'; fi`
-+
-+libmediatomb_a-weborama_content_handler.o: ../src/weborama_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-weborama_content_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-weborama_content_handler.Tpo -c -o libmediatomb_a-weborama_content_handler.o `test -f '../src/weborama_content_handler.cc' || echo '$(srcdir)/'`../src/weborama_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-weborama_content_handler.Tpo $(DEPDIR)/libmediatomb_a-weborama_content_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/weborama_content_handler.cc' object='libmediatomb_a-weborama_content_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-weborama_content_handler.o `test -f '../src/weborama_content_handler.cc' || echo '$(srcdir)/'`../src/weborama_content_handler.cc
-+
-+libmediatomb_a-weborama_content_handler.obj: ../src/weborama_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-weborama_content_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-weborama_content_handler.Tpo -c -o libmediatomb_a-weborama_content_handler.obj `if test -f '../src/weborama_content_handler.cc'; then $(CYGPATH_W) '../src/weborama_content_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/weborama_content_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-weborama_content_handler.Tpo $(DEPDIR)/libmediatomb_a-weborama_content_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/weborama_content_handler.cc' object='libmediatomb_a-weborama_content_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-weborama_content_handler.obj `if test -f '../src/weborama_content_handler.cc'; then $(CYGPATH_W) '../src/weborama_content_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/weborama_content_handler.cc'; fi`
-+
-+libmediatomb_a-weborama_service.o: ../src/weborama_service.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-weborama_service.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-weborama_service.Tpo -c -o libmediatomb_a-weborama_service.o `test -f '../src/weborama_service.cc' || echo '$(srcdir)/'`../src/weborama_service.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-weborama_service.Tpo $(DEPDIR)/libmediatomb_a-weborama_service.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/weborama_service.cc' object='libmediatomb_a-weborama_service.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-weborama_service.o `test -f '../src/weborama_service.cc' || echo '$(srcdir)/'`../src/weborama_service.cc
-+
-+libmediatomb_a-weborama_service.obj: ../src/weborama_service.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-weborama_service.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-weborama_service.Tpo -c -o libmediatomb_a-weborama_service.obj `if test -f '../src/weborama_service.cc'; then $(CYGPATH_W) '../src/weborama_service.cc'; else $(CYGPATH_W) '$(srcdir)/../src/weborama_service.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-weborama_service.Tpo $(DEPDIR)/libmediatomb_a-weborama_service.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/weborama_service.cc' object='libmediatomb_a-weborama_service.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-weborama_service.obj `if test -f '../src/weborama_service.cc'; then $(CYGPATH_W) '../src/weborama_service.cc'; else $(CYGPATH_W) '$(srcdir)/../src/weborama_service.cc'; fi`
-+
-+libmediatomb_a-pages.o: ../src/web/pages.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-pages.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-pages.Tpo -c -o libmediatomb_a-pages.o `test -f '../src/web/pages.cc' || echo '$(srcdir)/'`../src/web/pages.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-pages.Tpo $(DEPDIR)/libmediatomb_a-pages.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/pages.cc' object='libmediatomb_a-pages.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-pages.o `test -f '../src/web/pages.cc' || echo '$(srcdir)/'`../src/web/pages.cc
-+
-+libmediatomb_a-pages.obj: ../src/web/pages.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-pages.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-pages.Tpo -c -o libmediatomb_a-pages.obj `if test -f '../src/web/pages.cc'; then $(CYGPATH_W) '../src/web/pages.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/pages.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-pages.Tpo $(DEPDIR)/libmediatomb_a-pages.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/pages.cc' object='libmediatomb_a-pages.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-pages.obj `if test -f '../src/web/pages.cc'; then $(CYGPATH_W) '../src/web/pages.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/pages.cc'; fi`
-+
-+libmediatomb_a-remove.o: ../src/web/remove.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-remove.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-remove.Tpo -c -o libmediatomb_a-remove.o `test -f '../src/web/remove.cc' || echo '$(srcdir)/'`../src/web/remove.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-remove.Tpo $(DEPDIR)/libmediatomb_a-remove.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/remove.cc' object='libmediatomb_a-remove.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-remove.o `test -f '../src/web/remove.cc' || echo '$(srcdir)/'`../src/web/remove.cc
-+
-+libmediatomb_a-remove.obj: ../src/web/remove.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-remove.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-remove.Tpo -c -o libmediatomb_a-remove.obj `if test -f '../src/web/remove.cc'; then $(CYGPATH_W) '../src/web/remove.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/remove.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-remove.Tpo $(DEPDIR)/libmediatomb_a-remove.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/remove.cc' object='libmediatomb_a-remove.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-remove.obj `if test -f '../src/web/remove.cc'; then $(CYGPATH_W) '../src/web/remove.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/remove.cc'; fi`
-+
-+libmediatomb_a-web_request_handler.o: ../src/web_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-web_request_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-web_request_handler.Tpo -c -o libmediatomb_a-web_request_handler.o `test -f '../src/web_request_handler.cc' || echo '$(srcdir)/'`../src/web_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-web_request_handler.Tpo $(DEPDIR)/libmediatomb_a-web_request_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web_request_handler.cc' object='libmediatomb_a-web_request_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-web_request_handler.o `test -f '../src/web_request_handler.cc' || echo '$(srcdir)/'`../src/web_request_handler.cc
-+
-+libmediatomb_a-web_request_handler.obj: ../src/web_request_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-web_request_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-web_request_handler.Tpo -c -o libmediatomb_a-web_request_handler.obj `if test -f '../src/web_request_handler.cc'; then $(CYGPATH_W) '../src/web_request_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web_request_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-web_request_handler.Tpo $(DEPDIR)/libmediatomb_a-web_request_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web_request_handler.cc' object='libmediatomb_a-web_request_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-web_request_handler.obj `if test -f '../src/web_request_handler.cc'; then $(CYGPATH_W) '../src/web_request_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web_request_handler.cc'; fi`
-+
-+libmediatomb_a-tasks.o: ../src/web/tasks.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-tasks.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-tasks.Tpo -c -o libmediatomb_a-tasks.o `test -f '../src/web/tasks.cc' || echo '$(srcdir)/'`../src/web/tasks.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-tasks.Tpo $(DEPDIR)/libmediatomb_a-tasks.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/tasks.cc' object='libmediatomb_a-tasks.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-tasks.o `test -f '../src/web/tasks.cc' || echo '$(srcdir)/'`../src/web/tasks.cc
-+
-+libmediatomb_a-tasks.obj: ../src/web/tasks.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-tasks.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-tasks.Tpo -c -o libmediatomb_a-tasks.obj `if test -f '../src/web/tasks.cc'; then $(CYGPATH_W) '../src/web/tasks.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/tasks.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-tasks.Tpo $(DEPDIR)/libmediatomb_a-tasks.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/tasks.cc' object='libmediatomb_a-tasks.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-tasks.obj `if test -f '../src/web/tasks.cc'; then $(CYGPATH_W) '../src/web/tasks.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/tasks.cc'; fi`
-+
-+libmediatomb_a-web_autoscan.o: ../src/web/web_autoscan.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-web_autoscan.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-web_autoscan.Tpo -c -o libmediatomb_a-web_autoscan.o `test -f '../src/web/web_autoscan.cc' || echo '$(srcdir)/'`../src/web/web_autoscan.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-web_autoscan.Tpo $(DEPDIR)/libmediatomb_a-web_autoscan.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/web_autoscan.cc' object='libmediatomb_a-web_autoscan.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-web_autoscan.o `test -f '../src/web/web_autoscan.cc' || echo '$(srcdir)/'`../src/web/web_autoscan.cc
-+
-+libmediatomb_a-web_autoscan.obj: ../src/web/web_autoscan.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-web_autoscan.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-web_autoscan.Tpo -c -o libmediatomb_a-web_autoscan.obj `if test -f '../src/web/web_autoscan.cc'; then $(CYGPATH_W) '../src/web/web_autoscan.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/web_autoscan.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-web_autoscan.Tpo $(DEPDIR)/libmediatomb_a-web_autoscan.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/web_autoscan.cc' object='libmediatomb_a-web_autoscan.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-web_autoscan.obj `if test -f '../src/web/web_autoscan.cc'; then $(CYGPATH_W) '../src/web/web_autoscan.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/web_autoscan.cc'; fi`
-+
-+libmediatomb_a-web_update.o: ../src/web/web_update.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-web_update.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-web_update.Tpo -c -o libmediatomb_a-web_update.o `test -f '../src/web/web_update.cc' || echo '$(srcdir)/'`../src/web/web_update.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-web_update.Tpo $(DEPDIR)/libmediatomb_a-web_update.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/web_update.cc' object='libmediatomb_a-web_update.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-web_update.o `test -f '../src/web/web_update.cc' || echo '$(srcdir)/'`../src/web/web_update.cc
-+
-+libmediatomb_a-web_update.obj: ../src/web/web_update.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-web_update.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-web_update.Tpo -c -o libmediatomb_a-web_update.obj `if test -f '../src/web/web_update.cc'; then $(CYGPATH_W) '../src/web/web_update.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/web_update.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-web_update.Tpo $(DEPDIR)/libmediatomb_a-web_update.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/web/web_update.cc' object='libmediatomb_a-web_update.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-web_update.obj `if test -f '../src/web/web_update.cc'; then $(CYGPATH_W) '../src/web/web_update.cc'; else $(CYGPATH_W) '$(srcdir)/../src/web/web_update.cc'; fi`
-+
-+libmediatomb_a-xpath.o: ../src/xpath.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-xpath.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-xpath.Tpo -c -o libmediatomb_a-xpath.o `test -f '../src/xpath.cc' || echo '$(srcdir)/'`../src/xpath.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-xpath.Tpo $(DEPDIR)/libmediatomb_a-xpath.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/xpath.cc' object='libmediatomb_a-xpath.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-xpath.o `test -f '../src/xpath.cc' || echo '$(srcdir)/'`../src/xpath.cc
-+
-+libmediatomb_a-xpath.obj: ../src/xpath.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-xpath.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-xpath.Tpo -c -o libmediatomb_a-xpath.obj `if test -f '../src/xpath.cc'; then $(CYGPATH_W) '../src/xpath.cc'; else $(CYGPATH_W) '$(srcdir)/../src/xpath.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-xpath.Tpo $(DEPDIR)/libmediatomb_a-xpath.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/xpath.cc' object='libmediatomb_a-xpath.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-xpath.obj `if test -f '../src/xpath.cc'; then $(CYGPATH_W) '../src/xpath.cc'; else $(CYGPATH_W) '$(srcdir)/../src/xpath.cc'; fi`
-+
-+libmediatomb_a-youtube_content_handler.o: ../src/youtube_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-youtube_content_handler.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-youtube_content_handler.Tpo -c -o libmediatomb_a-youtube_content_handler.o `test -f '../src/youtube_content_handler.cc' || echo '$(srcdir)/'`../src/youtube_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-youtube_content_handler.Tpo $(DEPDIR)/libmediatomb_a-youtube_content_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/youtube_content_handler.cc' object='libmediatomb_a-youtube_content_handler.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-youtube_content_handler.o `test -f '../src/youtube_content_handler.cc' || echo '$(srcdir)/'`../src/youtube_content_handler.cc
-+
-+libmediatomb_a-youtube_content_handler.obj: ../src/youtube_content_handler.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-youtube_content_handler.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-youtube_content_handler.Tpo -c -o libmediatomb_a-youtube_content_handler.obj `if test -f '../src/youtube_content_handler.cc'; then $(CYGPATH_W) '../src/youtube_content_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/youtube_content_handler.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-youtube_content_handler.Tpo $(DEPDIR)/libmediatomb_a-youtube_content_handler.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/youtube_content_handler.cc' object='libmediatomb_a-youtube_content_handler.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-youtube_content_handler.obj `if test -f '../src/youtube_content_handler.cc'; then $(CYGPATH_W) '../src/youtube_content_handler.cc'; else $(CYGPATH_W) '$(srcdir)/../src/youtube_content_handler.cc'; fi`
-+
-+libmediatomb_a-youtube_service.o: ../src/youtube_service.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-youtube_service.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-youtube_service.Tpo -c -o libmediatomb_a-youtube_service.o `test -f '../src/youtube_service.cc' || echo '$(srcdir)/'`../src/youtube_service.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-youtube_service.Tpo $(DEPDIR)/libmediatomb_a-youtube_service.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/youtube_service.cc' object='libmediatomb_a-youtube_service.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-youtube_service.o `test -f '../src/youtube_service.cc' || echo '$(srcdir)/'`../src/youtube_service.cc
-+
-+libmediatomb_a-youtube_service.obj: ../src/youtube_service.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-youtube_service.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-youtube_service.Tpo -c -o libmediatomb_a-youtube_service.obj `if test -f '../src/youtube_service.cc'; then $(CYGPATH_W) '../src/youtube_service.cc'; else $(CYGPATH_W) '$(srcdir)/../src/youtube_service.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-youtube_service.Tpo $(DEPDIR)/libmediatomb_a-youtube_service.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/youtube_service.cc' object='libmediatomb_a-youtube_service.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-youtube_service.obj `if test -f '../src/youtube_service.cc'; then $(CYGPATH_W) '../src/youtube_service.cc'; else $(CYGPATH_W) '$(srcdir)/../src/youtube_service.cc'; fi`
-+
-+libmediatomb_a-youtube_video_url.o: ../src/youtube_video_url.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-youtube_video_url.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-youtube_video_url.Tpo -c -o libmediatomb_a-youtube_video_url.o `test -f '../src/youtube_video_url.cc' || echo '$(srcdir)/'`../src/youtube_video_url.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-youtube_video_url.Tpo $(DEPDIR)/libmediatomb_a-youtube_video_url.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/youtube_video_url.cc' object='libmediatomb_a-youtube_video_url.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-youtube_video_url.o `test -f '../src/youtube_video_url.cc' || echo '$(srcdir)/'`../src/youtube_video_url.cc
-+
-+libmediatomb_a-youtube_video_url.obj: ../src/youtube_video_url.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-youtube_video_url.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-youtube_video_url.Tpo -c -o libmediatomb_a-youtube_video_url.obj `if test -f '../src/youtube_video_url.cc'; then $(CYGPATH_W) '../src/youtube_video_url.cc'; else $(CYGPATH_W) '$(srcdir)/../src/youtube_video_url.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-youtube_video_url.Tpo $(DEPDIR)/libmediatomb_a-youtube_video_url.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/youtube_video_url.cc' object='libmediatomb_a-youtube_video_url.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-youtube_video_url.obj `if test -f '../src/youtube_video_url.cc'; then $(CYGPATH_W) '../src/youtube_video_url.cc'; else $(CYGPATH_W) '$(srcdir)/../src/youtube_video_url.cc'; fi`
-+
-+libmediatomb_a-array.o: ../src/zmmf/array.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-array.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-array.Tpo -c -o libmediatomb_a-array.o `test -f '../src/zmmf/array.cc' || echo '$(srcdir)/'`../src/zmmf/array.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-array.Tpo $(DEPDIR)/libmediatomb_a-array.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmmf/array.cc' object='libmediatomb_a-array.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-array.o `test -f '../src/zmmf/array.cc' || echo '$(srcdir)/'`../src/zmmf/array.cc
-+
-+libmediatomb_a-array.obj: ../src/zmmf/array.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-array.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-array.Tpo -c -o libmediatomb_a-array.obj `if test -f '../src/zmmf/array.cc'; then $(CYGPATH_W) '../src/zmmf/array.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmmf/array.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-array.Tpo $(DEPDIR)/libmediatomb_a-array.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmmf/array.cc' object='libmediatomb_a-array.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-array.obj `if test -f '../src/zmmf/array.cc'; then $(CYGPATH_W) '../src/zmmf/array.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmmf/array.cc'; fi`
-+
-+libmediatomb_a-exception.o: ../src/zmmf/exception.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-exception.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-exception.Tpo -c -o libmediatomb_a-exception.o `test -f '../src/zmmf/exception.cc' || echo '$(srcdir)/'`../src/zmmf/exception.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-exception.Tpo $(DEPDIR)/libmediatomb_a-exception.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmmf/exception.cc' object='libmediatomb_a-exception.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-exception.o `test -f '../src/zmmf/exception.cc' || echo '$(srcdir)/'`../src/zmmf/exception.cc
-+
-+libmediatomb_a-exception.obj: ../src/zmmf/exception.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-exception.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-exception.Tpo -c -o libmediatomb_a-exception.obj `if test -f '../src/zmmf/exception.cc'; then $(CYGPATH_W) '../src/zmmf/exception.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmmf/exception.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-exception.Tpo $(DEPDIR)/libmediatomb_a-exception.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmmf/exception.cc' object='libmediatomb_a-exception.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-exception.obj `if test -f '../src/zmmf/exception.cc'; then $(CYGPATH_W) '../src/zmmf/exception.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmmf/exception.cc'; fi`
-+
-+libmediatomb_a-stringtokenizer.o: ../src/zmmf/stringtokenizer.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-stringtokenizer.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-stringtokenizer.Tpo -c -o libmediatomb_a-stringtokenizer.o `test -f '../src/zmmf/stringtokenizer.cc' || echo '$(srcdir)/'`../src/zmmf/stringtokenizer.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-stringtokenizer.Tpo $(DEPDIR)/libmediatomb_a-stringtokenizer.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmmf/stringtokenizer.cc' object='libmediatomb_a-stringtokenizer.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-stringtokenizer.o `test -f '../src/zmmf/stringtokenizer.cc' || echo '$(srcdir)/'`../src/zmmf/stringtokenizer.cc
-+
-+libmediatomb_a-stringtokenizer.obj: ../src/zmmf/stringtokenizer.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-stringtokenizer.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-stringtokenizer.Tpo -c -o libmediatomb_a-stringtokenizer.obj `if test -f '../src/zmmf/stringtokenizer.cc'; then $(CYGPATH_W) '../src/zmmf/stringtokenizer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmmf/stringtokenizer.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-stringtokenizer.Tpo $(DEPDIR)/libmediatomb_a-stringtokenizer.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmmf/stringtokenizer.cc' object='libmediatomb_a-stringtokenizer.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-stringtokenizer.obj `if test -f '../src/zmmf/stringtokenizer.cc'; then $(CYGPATH_W) '../src/zmmf/stringtokenizer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmmf/stringtokenizer.cc'; fi`
-+
-+libmediatomb_a-nil.o: ../src/zmm/nil.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-nil.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-nil.Tpo -c -o libmediatomb_a-nil.o `test -f '../src/zmm/nil.cc' || echo '$(srcdir)/'`../src/zmm/nil.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-nil.Tpo $(DEPDIR)/libmediatomb_a-nil.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmm/nil.cc' object='libmediatomb_a-nil.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-nil.o `test -f '../src/zmm/nil.cc' || echo '$(srcdir)/'`../src/zmm/nil.cc
-+
-+libmediatomb_a-nil.obj: ../src/zmm/nil.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-nil.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-nil.Tpo -c -o libmediatomb_a-nil.obj `if test -f '../src/zmm/nil.cc'; then $(CYGPATH_W) '../src/zmm/nil.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmm/nil.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-nil.Tpo $(DEPDIR)/libmediatomb_a-nil.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmm/nil.cc' object='libmediatomb_a-nil.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-nil.obj `if test -f '../src/zmm/nil.cc'; then $(CYGPATH_W) '../src/zmm/nil.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmm/nil.cc'; fi`
-+
-+libmediatomb_a-object.o: ../src/zmm/object.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-object.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-object.Tpo -c -o libmediatomb_a-object.o `test -f '../src/zmm/object.cc' || echo '$(srcdir)/'`../src/zmm/object.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-object.Tpo $(DEPDIR)/libmediatomb_a-object.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmm/object.cc' object='libmediatomb_a-object.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-object.o `test -f '../src/zmm/object.cc' || echo '$(srcdir)/'`../src/zmm/object.cc
-+
-+libmediatomb_a-object.obj: ../src/zmm/object.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-object.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-object.Tpo -c -o libmediatomb_a-object.obj `if test -f '../src/zmm/object.cc'; then $(CYGPATH_W) '../src/zmm/object.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmm/object.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-object.Tpo $(DEPDIR)/libmediatomb_a-object.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmm/object.cc' object='libmediatomb_a-object.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-object.obj `if test -f '../src/zmm/object.cc'; then $(CYGPATH_W) '../src/zmm/object.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmm/object.cc'; fi`
-+
-+libmediatomb_a-stringbuffer.o: ../src/zmm/stringbuffer.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-stringbuffer.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-stringbuffer.Tpo -c -o libmediatomb_a-stringbuffer.o `test -f '../src/zmm/stringbuffer.cc' || echo '$(srcdir)/'`../src/zmm/stringbuffer.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-stringbuffer.Tpo $(DEPDIR)/libmediatomb_a-stringbuffer.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmm/stringbuffer.cc' object='libmediatomb_a-stringbuffer.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-stringbuffer.o `test -f '../src/zmm/stringbuffer.cc' || echo '$(srcdir)/'`../src/zmm/stringbuffer.cc
-+
-+libmediatomb_a-stringbuffer.obj: ../src/zmm/stringbuffer.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-stringbuffer.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-stringbuffer.Tpo -c -o libmediatomb_a-stringbuffer.obj `if test -f '../src/zmm/stringbuffer.cc'; then $(CYGPATH_W) '../src/zmm/stringbuffer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmm/stringbuffer.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-stringbuffer.Tpo $(DEPDIR)/libmediatomb_a-stringbuffer.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmm/stringbuffer.cc' object='libmediatomb_a-stringbuffer.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-stringbuffer.obj `if test -f '../src/zmm/stringbuffer.cc'; then $(CYGPATH_W) '../src/zmm/stringbuffer.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmm/stringbuffer.cc'; fi`
-+
-+libmediatomb_a-strings.o: ../src/zmm/strings.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-strings.o -MD -MP -MF $(DEPDIR)/libmediatomb_a-strings.Tpo -c -o libmediatomb_a-strings.o `test -f '../src/zmm/strings.cc' || echo '$(srcdir)/'`../src/zmm/strings.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-strings.Tpo $(DEPDIR)/libmediatomb_a-strings.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmm/strings.cc' object='libmediatomb_a-strings.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-strings.o `test -f '../src/zmm/strings.cc' || echo '$(srcdir)/'`../src/zmm/strings.cc
-+
-+libmediatomb_a-strings.obj: ../src/zmm/strings.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -MT libmediatomb_a-strings.obj -MD -MP -MF $(DEPDIR)/libmediatomb_a-strings.Tpo -c -o libmediatomb_a-strings.obj `if test -f '../src/zmm/strings.cc'; then $(CYGPATH_W) '../src/zmm/strings.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmm/strings.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libmediatomb_a-strings.Tpo $(DEPDIR)/libmediatomb_a-strings.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='../src/zmm/strings.cc' object='libmediatomb_a-strings.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libmediatomb_a_CXXFLAGS) $(CXXFLAGS) -c -o libmediatomb_a-strings.obj `if test -f '../src/zmm/strings.cc'; then $(CYGPATH_W) '../src/zmm/strings.cc'; else $(CYGPATH_W) '$(srcdir)/../src/zmm/strings.cc'; fi`
-+
-+mediatomb-main.o: $(top_srcdir)/src/main.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediatomb_CXXFLAGS) $(CXXFLAGS) -MT mediatomb-main.o -MD -MP -MF $(DEPDIR)/mediatomb-main.Tpo -c -o mediatomb-main.o `test -f '$(top_srcdir)/src/main.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/main.cc
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mediatomb-main.Tpo $(DEPDIR)/mediatomb-main.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/main.cc' object='mediatomb-main.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediatomb_CXXFLAGS) $(CXXFLAGS) -c -o mediatomb-main.o `test -f '$(top_srcdir)/src/main.cc' || echo '$(srcdir)/'`$(top_srcdir)/src/main.cc
-+
-+mediatomb-main.obj: $(top_srcdir)/src/main.cc
-+ at am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediatomb_CXXFLAGS) $(CXXFLAGS) -MT mediatomb-main.obj -MD -MP -MF $(DEPDIR)/mediatomb-main.Tpo -c -o mediatomb-main.obj `if test -f '$(top_srcdir)/src/main.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/main.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/main.cc'; fi`
-+ at am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/mediatomb-main.Tpo $(DEPDIR)/mediatomb-main.Po
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(top_srcdir)/src/main.cc' object='mediatomb-main.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mediatomb_CXXFLAGS) $(CXXFLAGS) -c -o mediatomb-main.obj `if test -f '$(top_srcdir)/src/main.cc'; then $(CYGPATH_W) '$(top_srcdir)/src/main.cc'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/main.cc'; fi`
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	set x; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	shift; \
-+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  if test $$# -gt 0; then \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      "$$@" $$unique; \
-+	  else \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      $$unique; \
-+	  fi; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	test -z "$(CTAGS_ARGS)$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && $(am__cd) $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) "$$here"
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(LIBRARIES) $(PROGRAMS)
-+installdirs:
-+	for dir in "$(DESTDIR)$(bindir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
-+	mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am: install-binPROGRAMS
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-binPROGRAMS
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-+	clean-generic clean-noinstLIBRARIES ctags distclean \
-+	distclean-compile distclean-generic distclean-tags distdir dvi \
-+	dvi-am html html-am info info-am install install-am \
-+	install-binPROGRAMS 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 \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
-+	tags uninstall uninstall-am uninstall-binPROGRAMS
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- /dev/null
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POW_LIB = @POW_LIB@
+diff --git a/config/Makefile.in b/config/Makefile.in
+index d223218..8c107b9 100644
+--- a/config/Makefile.in
 +++ b/config/Makefile.in
-@@ -0,0 +1,547 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = config
-+DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/autoconfig.h \
-+	$(top_builddir)/tombupnp/upnp/inc/upnpconfig.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+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'
-+am__installdirs = "$(DESTDIR)$(pkgdatadir)"
-+DATA = $(dist_pkgdata_DATA)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMTAR = @AMTAR@
-+ATOMIC_OPTION_ENABLED = @ATOMIC_OPTION_ENABLED@
-+ATOMIC_OPTION_REQUESTED = @ATOMIC_OPTION_REQUESTED@
-+ATOMIC_X86_SINGLE_OPTION_ENABLED = @ATOMIC_X86_SINGLE_OPTION_ENABLED@
-+ATOMIC_X86_SINGLE_OPTION_REQUESTED = @ATOMIC_X86_SINGLE_OPTION_REQUESTED@
-+ATRAILERS_OPTION_ENABLED = @ATRAILERS_OPTION_ENABLED@
-+ATRAILERS_OPTION_REQUESTED = @ATRAILERS_OPTION_REQUESTED@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@
-+AVFORMAT_LDFLAGS = @AVFORMAT_LDFLAGS@
-+AVFORMAT_LIBS = @AVFORMAT_LIBS@
-+AVFORMAT_STATUS = @AVFORMAT_STATUS@
-+AVUTIL_LDFLAGS = @AVUTIL_LDFLAGS@
-+AVUTIL_LIBS = @AVUTIL_LIBS@
-+AVUTIL_STATUS = @AVUTIL_STATUS@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
-+DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-+DEBUG_LOG_OPTION_ENABLED = @DEBUG_LOG_OPTION_ENABLED@
-+DEBUG_LOG_OPTION_REQUESTED = @DEBUG_LOG_OPTION_REQUESTED@
-+DEBUG_MALLOC0_OPTION_ENABLED = @DEBUG_MALLOC0_OPTION_ENABLED@
-+DEBUG_MALLOC0_OPTION_REQUESTED = @DEBUG_MALLOC0_OPTION_REQUESTED@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+EXPAT_CFLAGS = @EXPAT_CFLAGS@
-+EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
-+EXPAT_LIBS = @EXPAT_LIBS@
-+EXPAT_STATUS = @EXPAT_STATUS@
-+EXTERNAL_TRANSCODING_OPTION_ENABLED = @EXTERNAL_TRANSCODING_OPTION_ENABLED@
-+EXTERNAL_TRANSCODING_OPTION_REQUESTED = @EXTERNAL_TRANSCODING_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_CFLAGS = @FFMPEGTHUMBNAILER_CFLAGS@
-+FFMPEGTHUMBNAILER_LDFLAGS = @FFMPEGTHUMBNAILER_LDFLAGS@
-+FFMPEGTHUMBNAILER_LIBS = @FFMPEGTHUMBNAILER_LIBS@
-+FFMPEGTHUMBNAILER_OPTION_ENABLED = @FFMPEGTHUMBNAILER_OPTION_ENABLED@
-+FFMPEGTHUMBNAILER_OPTION_REQUESTED = @FFMPEGTHUMBNAILER_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_STATUS = @FFMPEGTHUMBNAILER_STATUS@
-+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@
-+FFMPEG_LIBS = @FFMPEG_LIBS@
-+FFMPEG_OPTION_ENABLED = @FFMPEG_OPTION_ENABLED@
-+FFMPEG_OPTION_REQUESTED = @FFMPEG_OPTION_REQUESTED@
-+FSEEKO_CHECK_OPTION_ENABLED = @FSEEKO_CHECK_OPTION_ENABLED@
-+FSEEKO_CHECK_OPTION_REQUESTED = @FSEEKO_CHECK_OPTION_REQUESTED@
-+GREP = @GREP@
-+ICONV_CXXFLAGS = @ICONV_CXXFLAGS@
-+ICONV_LIBS = @ICONV_LIBS@
-+ICONV_LIB_OPTION_ENABLED = @ICONV_LIB_OPTION_ENABLED@
-+ICONV_LIB_OPTION_REQUESTED = @ICONV_LIB_OPTION_REQUESTED@
-+ID3LIB_CFLAGS = @ID3LIB_CFLAGS@
-+ID3LIB_LDFLAGS = @ID3LIB_LDFLAGS@
-+ID3LIB_LIBS = @ID3LIB_LIBS@
-+ID3LIB_OPTION_ENABLED = @ID3LIB_OPTION_ENABLED@
-+ID3LIB_OPTION_REQUESTED = @ID3LIB_OPTION_REQUESTED@
-+ID3LIB_STATUS = @ID3LIB_STATUS@
-+ID3LIB_VERSION = @ID3LIB_VERSION@
-+INOTIFY_CFLAGS = @INOTIFY_CFLAGS@
-+INOTIFY_OPTION_ENABLED = @INOTIFY_OPTION_ENABLED@
-+INOTIFY_OPTION_REQUESTED = @INOTIFY_OPTION_REQUESTED@
-+INOTIFY_STATUS = @INOTIFY_STATUS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JS_CXXFLAGS = @JS_CXXFLAGS@
-+JS_LIBS = @JS_LIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBDVDNAV_CFLAGS = @LIBDVDNAV_CFLAGS@
-+LIBDVDNAV_LIBS = @LIBDVDNAV_LIBS@
-+LIBDVDNAV_OPTION_ENABLED = @LIBDVDNAV_OPTION_ENABLED@
-+LIBDVDNAV_OPTION_REQUESTED = @LIBDVDNAV_OPTION_REQUESTED@
-+LIBDVDNAV_STATUS = @LIBDVDNAV_STATUS@
-+LIBDVDNAV_VERSION = @LIBDVDNAV_VERSION@
-+LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-+LIBEXIF_LDFLAGS = @LIBEXIF_LDFLAGS@
-+LIBEXIF_LIBS = @LIBEXIF_LIBS@
-+LIBEXIF_OPTION_ENABLED = @LIBEXIF_OPTION_ENABLED@
-+LIBEXIF_OPTION_REQUESTED = @LIBEXIF_OPTION_REQUESTED@
-+LIBEXIF_STATUS = @LIBEXIF_STATUS@
-+LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@
-+LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@
-+LIBEXTRACTOR_OPTION_ENABLED = @LIBEXTRACTOR_OPTION_ENABLED@
-+LIBEXTRACTOR_OPTION_REQUESTED = @LIBEXTRACTOR_OPTION_REQUESTED@
-+LIBEXTRACTOR_STATUS = @LIBEXTRACTOR_STATUS@
-+LIBEXTRACTOR_VERSION = @LIBEXTRACTOR_VERSION@
-+LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@
-+LIBMAGIC_LDFLAGS = @LIBMAGIC_LDFLAGS@
-+LIBMAGIC_LIBS = @LIBMAGIC_LIBS@
-+LIBMAGIC_OPTION_ENABLED = @LIBMAGIC_OPTION_ENABLED@
-+LIBMAGIC_OPTION_REQUESTED = @LIBMAGIC_OPTION_REQUESTED@
-+LIBMAGIC_STATUS = @LIBMAGIC_STATUS@
-+LIBMAGIC_VERSION = @LIBMAGIC_VERSION@
-+LIBMP4V2_CFLAGS = @LIBMP4V2_CFLAGS@
-+LIBMP4V2_LDFLAGS = @LIBMP4V2_LDFLAGS@
-+LIBMP4V2_LIBS = @LIBMP4V2_LIBS@
-+LIBMP4V2_OPTION_ENABLED = @LIBMP4V2_OPTION_ENABLED@
-+LIBMP4V2_OPTION_REQUESTED = @LIBMP4V2_OPTION_REQUESTED@
-+LIBMP4V2_STATUS = @LIBMP4V2_STATUS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LOG_OPTION_ENABLED = @LOG_OPTION_ENABLED@
-+LOG_OPTION_REQUESTED = @LOG_OPTION_REQUESTED@
-+LTLIBOBJS = @LTLIBOBJS@
-+LWRES_LIBS = @LWRES_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+MRREG_SERVICE_OPTION_ENABLED = @MRREG_SERVICE_OPTION_ENABLED@
-+MRREG_SERVICE_OPTION_REQUESTED = @MRREG_SERVICE_OPTION_REQUESTED@
-+MT_SEARCHPATH = @MT_SEARCHPATH@
-+MT_SEARCHPATH_HEADERS = @MT_SEARCHPATH_HEADERS@
-+MT_SEARCHPATH_LIBS = @MT_SEARCHPATH_LIBS@
-+MT_SEARCHPATH_PROGS = @MT_SEARCHPATH_PROGS@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+MYSQL_OPTION_ENABLED = @MYSQL_OPTION_ENABLED@
-+MYSQL_OPTION_REQUESTED = @MYSQL_OPTION_REQUESTED@
-+MYSQL_STATUS = @MYSQL_STATUS@
-+MYSQL_VERSION = @MYSQL_VERSION@
-+NSL_LIBS = @NSL_LIBS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+@@ -217,6 +217,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@
-+POW_LIB = @POW_LIB@
-+PROTOCOLINFO_EXTENSION_OPTION_ENABLED = @PROTOCOLINFO_EXTENSION_OPTION_ENABLED@
-+PROTOCOLINFO_EXTENSION_OPTION_REQUESTED = @PROTOCOLINFO_EXTENSION_OPTION_REQUESTED@
-+PTHREAD_CC = @PTHREAD_CC@
-+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-+PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
-+PTHREAD_LIBS = @PTHREAD_LIBS@
-+PTHREAD_LIB_OPTION_ENABLED = @PTHREAD_LIB_OPTION_ENABLED@
-+PTHREAD_LIB_OPTION_REQUESTED = @PTHREAD_LIB_OPTION_REQUESTED@
-+PTHREAD_STATUS = @PTHREAD_STATUS@
-+RANLIB = @RANLIB@
-+RT_LDFLAGS = @RT_LDFLAGS@
-+RT_LIBS = @RT_LIBS@
-+RT_STATUS = @RT_STATUS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SOPCAST_OPTION_ENABLED = @SOPCAST_OPTION_ENABLED@
-+SOPCAST_OPTION_REQUESTED = @SOPCAST_OPTION_REQUESTED@
-+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
-+SQLITE3_LDFLAGS = @SQLITE3_LDFLAGS@
-+SQLITE3_LIBS = @SQLITE3_LIBS@
-+SQLITE3_OPTION_ENABLED = @SQLITE3_OPTION_ENABLED@
-+SQLITE3_OPTION_REQUESTED = @SQLITE3_OPTION_REQUESTED@
-+SQLITE3_STATUS = @SQLITE3_STATUS@
-+SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED = @SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED@
-+SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED = @SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED@
-+STATIC_OPTION_ENABLED = @STATIC_OPTION_ENABLED@
-+STATIC_OPTION_REQUESTED = @STATIC_OPTION_REQUESTED@
-+STRIP = @STRIP@
-+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
-+TAGLIB_LIBS = @TAGLIB_LIBS@
-+TAGLIB_OPTION_ENABLED = @TAGLIB_OPTION_ENABLED@
-+TAGLIB_OPTION_REQUESTED = @TAGLIB_OPTION_REQUESTED@
-+TAGLIB_STATUS = @TAGLIB_STATUS@
-+TAGLIB_VERSION = @TAGLIB_VERSION@
-+TOMBDEBUG_OPTION_ENABLED = @TOMBDEBUG_OPTION_ENABLED@
-+TOMBDEBUG_OPTION_REQUESTED = @TOMBDEBUG_OPTION_REQUESTED@
-+UPNPDEBUG_OPTION_ENABLED = @UPNPDEBUG_OPTION_ENABLED@
-+UPNPDEBUG_OPTION_REQUESTED = @UPNPDEBUG_OPTION_REQUESTED@
-+VERSION = @VERSION@
-+WEBORAMA_OPTION_ENABLED = @WEBORAMA_OPTION_ENABLED@
-+WEBORAMA_OPTION_REQUESTED = @WEBORAMA_OPTION_REQUESTED@
-+YOUTUBE_OPTION_ENABLED = @YOUTUBE_OPTION_ENABLED@
-+YOUTUBE_OPTION_REQUESTED = @YOUTUBE_OPTION_REQUESTED@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+ZLIB_OPTION_ENABLED = @ZLIB_OPTION_ENABLED@
-+ZLIB_OPTION_REQUESTED = @ZLIB_OPTION_REQUESTED@
-+ZLIB_STATUS = @ZLIB_STATUS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+acx_pthread_config = @acx_pthread_config@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+curlconfig = @curlconfig@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+mt_libdvdnav_config = @mt_libdvdnav_config@
-+mt_mysql_config = @mt_mysql_config@
-+mt_taglib_config = @mt_taglib_config@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+_DIST_FILES_CONFIG = \
-+    mappings.xml \
-+    sqlite3.sql \
-+    mysql.sql
-+
-+EXTRA_DIST = mediatomb-conf-fedora \
-+		   mediatomb-conf-optware \
-+		   mediatomb-default-optware \
-+    	config.xsd
-+
-+dist_pkgdata_DATA = $(_DIST_FILES_CONFIG)
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu config/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu config/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+install-dist_pkgdataDATA: $(dist_pkgdata_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(pkgdatadir)" || $(MKDIR_P) "$(DESTDIR)$(pkgdatadir)"
-+	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
-+	done
-+
-+uninstall-dist_pkgdataDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(DATA)
-+installdirs:
-+	for dir in "$(DESTDIR)$(pkgdatadir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-dist_pkgdataDATA
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-dist_pkgdataDATA
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am \
-+	install-dist_pkgdataDATA 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 maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-+	pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-dist_pkgdataDATA
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- /dev/null
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POW_LIB = @POW_LIB@
+diff --git a/configure b/configure
+index f51d803..459bf70 100755
+--- a/configure
 +++ b/configure
-@@ -0,0 +1,21815 @@
-+#! /bin/sh
-+# Guess values for system-dependent variables and create Makefiles.
-+# Generated by GNU Autoconf 2.65 for MediaTomb 0.12.0.
-+#
-+# Report bugs to <jin at mediatomb.cc>.
-+#
+@@ -1,20 +1,24 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.63 for MediaTomb 0.12.1.
++# Generated by GNU Autoconf 2.67 for MediaTomb 0.12.1.
+ #
+ # Report bugs to <jin at mediatomb.cc>.
+ #
 +#
-+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
-+# Inc.
+ # 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, 2010 Free Software
++# Foundation, Inc.
 +#
 +#
-+# This configure script is free software; the Free Software Foundation
-+# gives unlimited permission to copy, distribute and modify it.
+ # 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
+ 
+ # 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
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
+   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}" && (emulate sh) >/dev/null 2>&1; then
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in
+-  *posix*) set -o posix ;;
 +  case `(set -o) 2>/dev/null` in #(
 +  *posix*) :
 +    set -o posix ;; #(
 +  *) :
 +     ;;
-+esac
-+fi
-+
-+
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+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
+ 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" \
@@ -7406,71 +153,62 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  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
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-+  else
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
+   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\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
+       *"$as_nl"*)
+ 	expr "X$arg" : "X\\(.*\\)$as_nl";
+ 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+@@ -80,13 +82,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
+   }
+ 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=.
+   *[\\/]* ) 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
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ 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
-+
+ 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
@@ -7478,21 +216,56 @@ Patch that applies changes after `autoreconf -fi` is done.
 +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='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-+
-+# CDPATH.
+ 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 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=:
@@ -7500,22 +273,66 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  # is contrary to our usage.  Disable this feature.
 +  alias -g '\${1+\"\$@\"}'='\"\$@\"'
 +  setopt NO_GLOB_SUBST
-+else
+ else
+-  as_have_required=no
 +  case \`(set -o) 2>/dev/null\` in #(
 +  *posix*) :
 +    set -o posix ;; #(
 +  *) :
 +     ;;
 +esac
-+fi
+ 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
+ 
+ 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.; }
@@ -7533,22 +350,37 @@ Patch that applies changes after `autoreconf -fi` is done.
 +test \$(( 1 + 1 )) = 2 || exit 1"
 +  if (eval "$as_required") 2>/dev/null; then :
 +  as_have_required=yes
-+else
+ else
+-  exitcode=1
+-  echo positional parameters were not saved.
 +  as_have_required=no
-+fi
+ fi
 +  if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
-+
-+else
+ 
+-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=.
+ 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
+ 	 /*)
+ 	   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"; } &&
@@ -7558,17 +390,127 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  break 2
 +fi
 +fi
-+	   done;;
-+       esac
+ 	   done;;
+        esac
 +  as_found=false
-+done
+ 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
-+
-+
+ 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
@@ -7576,10 +518,17 @@ Patch that applies changes after `autoreconf -fi` is done.
 +	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
-+
+ 	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."
@@ -7594,15 +543,18 @@ Patch that applies changes after `autoreconf -fi` is done.
 +$0: have one."
 +  fi
 +  exit 1
-+fi
-+fi
-+fi
+ 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. ##
 +## --------------------- ##
@@ -7614,7 +566,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  { eval $1=; unset $1;}
 +}
 +as_unset=as_fn_unset
-+
+ 
 +# as_fn_set_status STATUS
 +# -----------------------
 +# Set $? to STATUS, without forking.
@@ -7622,7 +574,22 @@ Patch that applies changes after `autoreconf -fi` is done.
 +{
 +  return $1
 +} # as_fn_set_status
-+
+ 
+-(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_fn_exit STATUS
 +# -----------------
 +# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
@@ -7638,7 +605,10 @@ Patch that applies changes after `autoreconf -fi` is done.
 +# Create "$as_dir" as a directory, including parents if necessary.
 +as_fn_mkdir_p ()
 +{
-+
+ 
+-exitcode=0
+-if as_func_success; then
+-  :
 +  case $as_dir in #(
 +  -*) as_dir=./$as_dir;;
 +  esac
@@ -7676,7 +646,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +      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"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 +
 +
 +} # as_fn_mkdir_p
@@ -7691,7 +661,10 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  {
 +    eval $1+=\$2
 +  }'
-+else
+ else
+-  exitcode=1
+-  echo as_func_success failed.
+-fi
 +  as_fn_append ()
 +  {
 +    eval $1=\$$1\$2
@@ -7714,43 +687,66 @@ Patch that applies changes after `autoreconf -fi` is done.
 +    as_val=`expr "$@" || test $? -eq 1`
 +  }
 +fi # as_fn_arith
-+
-+
-+# as_fn_error ERROR [LINENO LOG_FD]
-+# ---------------------------------
+ 
+-if as_func_failure; then
+-  exitcode=1
+-  echo as_func_failure succeeded.
+-fi
+ 
+-if as_func_ret_success; then
+-  :
++# as_fn_error STATUS 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.
++# 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
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 +  fi
-+  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&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
+ else
+-  exitcode=1
+-  echo as_func_ret_success failed.
 +  as_expr=false
-+fi
-+
+ 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
-+
+ 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
+ else
+-  exitcode=1
+-  echo positional parameters were not saved.
 +  as_dirname=false
-+fi
-+
+ 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\(//\)$' \| \
@@ -7769,1373 +765,321 @@ Patch that applies changes after `autoreconf -fi` is done.
 +	    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/=
-+  ' <$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" ||
+   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
-+  # original and so on.  Autoconf is especially sensitive to this).
-+  . "./$as_me.lineno"
-+  # Exit status is that of the last command.
-+  exit
-+}
-+
-+ECHO_C= ECHO_N= ECHO_T=
+ 
+   # 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*)
+ -n*)
+-  case `echo 'x\c'` in
 +  case `echo 'xy\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+   *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
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
-+fi
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-+    as_ln_s='cp -p'
-+  fi
-+else
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
-+if mkdir -p . 2>/dev/null; then
+   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$$.file conf$$.file
+ 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
-+fi
-+
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+	test -d "$1/.";
-+      else
+ 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;
+ 	-*)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
-+  '
-+fi
-+as_executable_p=$as_test_x
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
+ 	???[sx]*):;;*)false;;esac;fi
+     '\'' sh
+   '
+@@ -572,11 +529,11 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+-
+-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,
-+# so uname gets run too.
-+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-+
-+#
-+# Initializations.
-+#
-+ac_default_prefix=/usr/local
-+ac_clean_files=
-+ac_config_libobj_dir=.
-+LIBOBJS=
-+cross_compiling=no
-+subdirs=
-+MFLAGS=
-+MAKEFLAGS=
-+
-+# Identity of this package.
-+PACKAGE_NAME='MediaTomb'
-+PACKAGE_TARNAME='mediatomb'
-+PACKAGE_VERSION='0.12.0'
-+PACKAGE_STRING='MediaTomb 0.12.0'
-+PACKAGE_BUGREPORT='jin at mediatomb.cc'
+ 
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+@@ -591,7 +548,6 @@ cross_compiling=no
+ subdirs=
+ MFLAGS=
+ MAKEFLAGS=
+-SHELL=${CONFIG_SHELL-/bin/sh}
+ 
+ # Identity of this package.
+ PACKAGE_NAME='MediaTomb'
+@@ -599,6 +555,7 @@ PACKAGE_TARNAME='mediatomb'
+ PACKAGE_VERSION='0.12.1'
+ PACKAGE_STRING='MediaTomb 0.12.1'
+ PACKAGE_BUGREPORT='jin at mediatomb.cc'
 +PACKAGE_URL=''
-+
-+ac_unique_file="src/common.h"
-+# Factoring default headers for most tests.
-+ac_includes_default="\
-+#include <stdio.h>
-+#ifdef HAVE_SYS_TYPES_H
-+# include <sys/types.h>
-+#endif
-+#ifdef HAVE_SYS_STAT_H
-+# include <sys/stat.h>
-+#endif
-+#ifdef STDC_HEADERS
-+# include <stdlib.h>
-+# include <stddef.h>
-+#else
-+# ifdef HAVE_STDLIB_H
-+#  include <stdlib.h>
-+# endif
-+#endif
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-+#  include <memory.h>
-+# endif
-+# include <string.h>
-+#endif
-+#ifdef HAVE_STRINGS_H
-+# include <strings.h>
-+#endif
-+#ifdef HAVE_INTTYPES_H
-+# include <inttypes.h>
-+#endif
-+#ifdef HAVE_STDINT_H
-+# include <stdint.h>
-+#endif
-+#ifdef HAVE_UNISTD_H
-+# include <unistd.h>
-+#endif"
-+
-+ac_subst_vars='am__EXEEXT_FALSE
-+am__EXEEXT_TRUE
-+LTLIBOBJS
-+DEBUG_LOG_OPTION_REQUESTED
-+DEBUG_LOG_OPTION_ENABLED
-+LOG_OPTION_REQUESTED
-+LOG_OPTION_ENABLED
-+UPNPDEBUG_OPTION_REQUESTED
-+UPNPDEBUG_OPTION_ENABLED
-+TOMBDEBUG_OPTION_REQUESTED
-+TOMBDEBUG_OPTION_ENABLED
-+LIBDVDNAV_STATUS
-+LIBDVDNAV_VERSION
-+LIBDVDNAV_LIBS
-+LIBDVDNAV_CFLAGS
-+mt_libdvdnav_config
-+LIBDVDNAV_OPTION_REQUESTED
-+LIBDVDNAV_OPTION_ENABLED
-+INOTIFY_STATUS
-+INOTIFY_CFLAGS
-+INOTIFY_OPTION_REQUESTED
-+INOTIFY_OPTION_ENABLED
-+LIBMP4V2_STATUS
-+LIBMP4V2_CFLAGS
-+LIBMP4V2_LDFLAGS
-+LIBMP4V2_LIBS
-+LIBMP4V2_OPTION_REQUESTED
-+LIBMP4V2_OPTION_ENABLED
-+EXPAT_STATUS
-+EXPAT_LDFLAGS
-+EXPAT_LIBS
-+EXPAT_CFLAGS
-+LIBEXIF_STATUS
-+LIBEXIF_CFLAGS
-+LIBEXIF_LDFLAGS
-+LIBEXIF_LIBS
-+LIBEXIF_OPTION_REQUESTED
-+LIBEXIF_OPTION_ENABLED
-+LIBEXTRACTOR_STATUS
-+LIBEXTRACTOR_VERSION
-+LIBEXTRACTOR_LIBS
-+LIBEXTRACTOR_CFLAGS
-+FFMPEGTHUMBNAILER_STATUS
-+FFMPEGTHUMBNAILER_CFLAGS
-+FFMPEGTHUMBNAILER_LDFLAGS
-+FFMPEGTHUMBNAILER_LIBS
-+FFMPEGTHUMBNAILER_OPTION_REQUESTED
-+FFMPEGTHUMBNAILER_OPTION_ENABLED
-+FFMPEG_LIBS
-+FFMPEG_LDFLAGS
-+FFMPEG_CFLAGS
-+AVUTIL_STATUS
-+AVUTIL_LDFLAGS
-+AVUTIL_LIBS
-+AVFORMAT_LDFLAGS
-+AVFORMAT_LIBS
-+AVFORMAT_STATUS
-+AVFORMAT_CFLAGS
-+FFMPEG_OPTION_REQUESTED
-+FFMPEG_OPTION_ENABLED
-+LIBEXTRACTOR_OPTION_REQUESTED
-+LIBEXTRACTOR_OPTION_ENABLED
-+CURL_LIBS
-+CURL_CFLAGS
-+curlconfig
-+ID3LIB_LDFLAGS
-+ID3LIB_STATUS
-+ID3LIB_VERSION
-+ID3LIB_LIBS
-+ID3LIB_CFLAGS
-+TAGLIB_STATUS
-+TAGLIB_VERSION
-+TAGLIB_LIBS
-+TAGLIB_CFLAGS
-+mt_taglib_config
-+TAGLIB_OPTION_REQUESTED
-+TAGLIB_OPTION_ENABLED
-+ID3LIB_OPTION_REQUESTED
-+ID3LIB_OPTION_ENABLED
-+LIBMAGIC_LDFLAGS
-+LIBMAGIC_STATUS
-+LIBMAGIC_VERSION
-+LIBMAGIC_LIBS
-+LIBMAGIC_CFLAGS
-+LIBMAGIC_OPTION_REQUESTED
-+LIBMAGIC_OPTION_ENABLED
-+JS_LIBS
-+JS_CXXFLAGS
-+MYSQL_STATUS
-+MYSQL_VERSION
-+MYSQL_LIBS
-+MYSQL_CFLAGS
-+mt_mysql_config
-+MYSQL_OPTION_REQUESTED
-+MYSQL_OPTION_ENABLED
-+SQLITE3_STATUS
-+SQLITE3_CFLAGS
-+SQLITE3_LDFLAGS
-+SQLITE3_LIBS
-+SQLITE3_OPTION_REQUESTED
-+SQLITE3_OPTION_ENABLED
-+ZLIB_STATUS
-+ZLIB_CFLAGS
-+ZLIB_LDFLAGS
-+ZLIB_LIBS
-+ZLIB_OPTION_REQUESTED
-+ZLIB_OPTION_ENABLED
-+RT_STATUS
-+RT_LDFLAGS
-+RT_LIBS
-+PTHREAD_CFLAGS
-+PTHREAD_CC
-+acx_pthread_config
-+PTHREAD_STATUS
-+PTHREAD_LDFLAGS
-+PTHREAD_LIBS
-+NSL_LIBS
-+LWRES_LIBS
-+CXXCPP
-+POW_LIB
-+LIBOBJS
-+ALLOCA
-+ICONV_LIBS
-+ICONV_CXXFLAGS
-+EGREP
-+GREP
-+CPP
-+RANLIB
-+am__fastdepCC_FALSE
-+am__fastdepCC_TRUE
-+CCDEPMODE
-+ac_ct_CC
-+CFLAGS
-+CC
-+am__fastdepCXX_FALSE
-+am__fastdepCXX_TRUE
-+CXXDEPMODE
-+AMDEPBACKSLASH
-+AMDEP_FALSE
-+AMDEP_TRUE
-+am__quote
-+am__include
-+DEPDIR
-+OBJEXT
-+EXEEXT
-+ac_ct_CXX
-+CPPFLAGS
-+LDFLAGS
-+CXXFLAGS
-+CXX
-+FSEEKO_CHECK_OPTION_REQUESTED
-+FSEEKO_CHECK_OPTION_ENABLED
-+PROTOCOLINFO_EXTENSION_OPTION_REQUESTED
-+PROTOCOLINFO_EXTENSION_OPTION_ENABLED
-+SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED
-+SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED
-+ATRAILERS_OPTION_REQUESTED
-+ATRAILERS_OPTION_ENABLED
-+WEBORAMA_OPTION_REQUESTED
-+WEBORAMA_OPTION_ENABLED
-+YOUTUBE_OPTION_REQUESTED
-+YOUTUBE_OPTION_ENABLED
-+SOPCAST_OPTION_REQUESTED
-+SOPCAST_OPTION_ENABLED
-+EXTERNAL_TRANSCODING_OPTION_REQUESTED
-+EXTERNAL_TRANSCODING_OPTION_ENABLED
-+MRREG_SERVICE_OPTION_REQUESTED
-+MRREG_SERVICE_OPTION_ENABLED
-+ATOMIC_OPTION_REQUESTED
-+ATOMIC_OPTION_ENABLED
-+ATOMIC_X86_SINGLE_OPTION_REQUESTED
-+ATOMIC_X86_SINGLE_OPTION_ENABLED
-+ICONV_LIB_OPTION_REQUESTED
-+ICONV_LIB_OPTION_ENABLED
-+PTHREAD_LIB_OPTION_REQUESTED
-+PTHREAD_LIB_OPTION_ENABLED
-+DEBUG_MALLOC0_OPTION_REQUESTED
-+DEBUG_MALLOC0_OPTION_ENABLED
-+DB_AUTOCREATE_OPTION_REQUESTED
-+DB_AUTOCREATE_OPTION_ENABLED
-+STATIC_OPTION_REQUESTED
-+STATIC_OPTION_ENABLED
-+MT_SEARCHPATH_PROGS
-+MT_SEARCHPATH_LIBS
-+MT_SEARCHPATH_HEADERS
-+MT_SEARCHPATH
-+host_os
-+host_vendor
-+host_cpu
-+host
-+build_os
-+build_vendor
-+build_cpu
-+build
-+am__untar
-+am__tar
-+AMTAR
-+am__leading_dot
-+SET_MAKE
-+AWK
-+mkdir_p
-+MKDIR_P
-+INSTALL_STRIP_PROGRAM
-+STRIP
-+install_sh
-+MAKEINFO
-+AUTOHEADER
-+AUTOMAKE
-+AUTOCONF
-+ACLOCAL
-+VERSION
-+PACKAGE
-+CYGPATH_W
-+am__isrc
-+INSTALL_DATA
-+INSTALL_SCRIPT
-+INSTALL_PROGRAM
-+target_alias
-+host_alias
-+build_alias
-+LIBS
-+ECHO_T
-+ECHO_N
-+ECHO_C
-+DEFS
-+mandir
-+localedir
-+libdir
-+psdir
-+pdfdir
-+dvidir
-+htmldir
-+infodir
-+docdir
-+oldincludedir
-+includedir
-+localstatedir
-+sharedstatedir
-+sysconfdir
-+datadir
-+datarootdir
-+libexecdir
-+sbindir
-+bindir
-+program_transform_name
-+prefix
-+exec_prefix
+ 
+ ac_unique_file="src/common.h"
+ # Factoring default headers for most tests.
+@@ -877,6 +834,7 @@ bindir
+ program_transform_name
+ prefix
+ exec_prefix
 +PACKAGE_URL
-+PACKAGE_BUGREPORT
-+PACKAGE_STRING
-+PACKAGE_VERSION
-+PACKAGE_TARNAME
-+PACKAGE_NAME
-+PATH_SEPARATOR
-+SHELL'
-+ac_subst_files=''
-+ac_user_opts='
-+enable_option_checking
-+with_search
-+with_js_h
-+with_js_libs
-+with_iconv_h
-+with_iconv_libs
-+enable_static
-+enable_db_autocreate
-+enable_debug_malloc0
-+enable_pthread_lib
-+enable_iconv_lib
-+enable_atomic_x86_single
-+enable_atomic_pthread
-+enable_atomic
-+enable_sighup
-+enable_mrreg_service
-+enable_external_transcoding
-+enable_sopcast
-+enable_youtube
-+enable_weborama
-+enable_atrailers
-+enable_sqlite_backup_defaults
-+enable_protocolinfo_extension
-+enable_curl
-+with_curl_cfg
-+enable_fseeko_check
-+enable_dependency_tracking
-+enable_largefile
-+enable_rpl_malloc
-+with_pthread_libs
-+with_rt_libs
-+enable_zlib
-+with_zlib_h
-+with_zlib_libs
-+enable_sqlite3
-+with_sqlite3_h
-+with_sqlite3_libs
-+enable_mysql
-+with_mysql_cfg
-+enable_libjs
-+enable_libmagic
-+with_libmagic_h
-+with_libmagic_libs
-+enable_id3lib
-+enable_taglib
-+with_taglib_cfg
-+with_id3lib_h
-+with_id3lib_libs
-+enable_libextractor
-+enable_ffmpeg
-+with_avformat_h
-+with_avformat_libs
-+with_avutil_libs
-+enable_ffmpegthumbnailer
-+with_ffmpegthumbnailer_h
-+with_ffmpegthumbnailer_libs
-+with_libextractor_h
-+with_libextractor_libs
-+enable_libexif
-+with_libexif_h
-+with_libexif_libs
-+with_expat_h
-+with_expat_libs
-+enable_libmp4v2
-+with_libmp4v2_h
-+with_libmp4v2_libs
-+enable_inotify
-+with_inotify_h
-+enable_libdvdnav
-+with_libdvdnav_cfg
-+enable_tombdebug
-+enable_upnpdebug
-+enable_log
-+enable_debug_log
-+'
-+      ac_precious_vars='build_alias
-+host_alias
-+target_alias
-+CXX
-+CXXFLAGS
-+LDFLAGS
-+LIBS
-+CPPFLAGS
-+CCC
-+CC
-+CFLAGS
-+CPP
-+CXXCPP'
-+
-+
-+# Initialize some variables set by options.
-+ac_init_help=
-+ac_init_version=false
-+ac_unrecognized_opts=
-+ac_unrecognized_sep=
-+# The variables have the same names as the options, with
-+# dashes changed to underlines.
-+cache_file=/dev/null
-+exec_prefix=NONE
-+no_create=
-+no_recursion=
-+prefix=NONE
-+program_prefix=NONE
-+program_suffix=NONE
-+program_transform_name=s,x,x,
-+silent=
-+site=
-+srcdir=
-+verbose=
-+x_includes=NONE
-+x_libraries=NONE
-+
-+# Installation directory options.
-+# These are left unexpanded so users can "make install exec_prefix=/foo"
-+# and all the variables that are supposed to be based on exec_prefix
-+# by default will actually change.
-+# Use braces instead of parens because sh, perl, etc. also accept them.
-+# (The list follows the same order as the GNU Coding Standards.)
-+bindir='${exec_prefix}/bin'
-+sbindir='${exec_prefix}/sbin'
-+libexecdir='${exec_prefix}/libexec'
-+datarootdir='${prefix}/share'
-+datadir='${datarootdir}'
-+sysconfdir='${prefix}/etc'
-+sharedstatedir='${prefix}/com'
-+localstatedir='${prefix}/var'
-+includedir='${prefix}/include'
-+oldincludedir='/usr/include'
-+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-+infodir='${datarootdir}/info'
-+htmldir='${docdir}'
-+dvidir='${docdir}'
-+pdfdir='${docdir}'
-+psdir='${docdir}'
-+libdir='${exec_prefix}/lib'
-+localedir='${datarootdir}/locale'
-+mandir='${datarootdir}/man'
-+
-+ac_prev=
-+ac_dashdash=
-+for ac_option
-+do
-+  # If the previous option needs an argument, assign it.
-+  if test -n "$ac_prev"; then
-+    eval $ac_prev=\$ac_option
-+    ac_prev=
-+    continue
-+  fi
-+
-+  case $ac_option in
-+  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
-+  *)	ac_optarg=yes ;;
-+  esac
-+
-+  # Accept the important Cygnus configure options, so we can diagnose typos.
-+
-+  case $ac_dashdash$ac_option in
-+  --)
-+    ac_dashdash=yes ;;
-+
-+  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-+    ac_prev=bindir ;;
-+  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-+    bindir=$ac_optarg ;;
-+
-+  -build | --build | --buil | --bui | --bu)
-+    ac_prev=build_alias ;;
-+  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-+    build_alias=$ac_optarg ;;
-+
-+  -cache-file | --cache-file | --cache-fil | --cache-fi \
-+  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-+    ac_prev=cache_file ;;
-+  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-+  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-+    cache_file=$ac_optarg ;;
-+
-+  --config-cache | -C)
-+    cache_file=config.cache ;;
-+
-+  -datadir | --datadir | --datadi | --datad)
-+    ac_prev=datadir ;;
-+  -datadir=* | --datadir=* | --datadi=* | --datad=*)
-+    datadir=$ac_optarg ;;
-+
-+  -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \
-+  | --dataroo | --dataro | --datar)
-+    ac_prev=datarootdir ;;
-+  -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \
-+  | --dataroot=* | --dataroo=* | --dataro=* | --datar=*)
-+    datarootdir=$ac_optarg ;;
-+
-+  -disable-* | --disable-*)
-+    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_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
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=no ;;
-+
-+  -docdir | --docdir | --docdi | --doc | --do)
-+    ac_prev=docdir ;;
-+  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-+    docdir=$ac_optarg ;;
-+
-+  -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
-+    ac_prev=dvidir ;;
-+  -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
-+    dvidir=$ac_optarg ;;
-+
-+  -enable-* | --enable-*)
-+    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_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
-+      *"
-+"enable_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval enable_$ac_useropt=\$ac_optarg ;;
-+
-+  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-+  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-+  | --exec | --exe | --ex)
-+    ac_prev=exec_prefix ;;
-+  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-+  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-+  | --exec=* | --exe=* | --ex=*)
-+    exec_prefix=$ac_optarg ;;
-+
-+  -gas | --gas | --ga | --g)
-+    # Obsolete; use --with-gas.
-+    with_gas=yes ;;
-+
-+  -help | --help | --hel | --he | -h)
-+    ac_init_help=long ;;
-+  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-+    ac_init_help=recursive ;;
-+  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-+    ac_init_help=short ;;
-+
-+  -host | --host | --hos | --ho)
-+    ac_prev=host_alias ;;
-+  -host=* | --host=* | --hos=* | --ho=*)
-+    host_alias=$ac_optarg ;;
-+
-+  -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht)
-+    ac_prev=htmldir ;;
-+  -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \
-+  | --ht=*)
-+    htmldir=$ac_optarg ;;
-+
-+  -includedir | --includedir | --includedi | --included | --include \
-+  | --includ | --inclu | --incl | --inc)
-+    ac_prev=includedir ;;
-+  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-+  | --includ=* | --inclu=* | --incl=* | --inc=*)
-+    includedir=$ac_optarg ;;
-+
-+  -infodir | --infodir | --infodi | --infod | --info | --inf)
-+    ac_prev=infodir ;;
-+  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-+    infodir=$ac_optarg ;;
-+
-+  -libdir | --libdir | --libdi | --libd)
-+    ac_prev=libdir ;;
-+  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-+    libdir=$ac_optarg ;;
-+
-+  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-+  | --libexe | --libex | --libe)
-+    ac_prev=libexecdir ;;
-+  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-+  | --libexe=* | --libex=* | --libe=*)
-+    libexecdir=$ac_optarg ;;
-+
-+  -localedir | --localedir | --localedi | --localed | --locale)
-+    ac_prev=localedir ;;
-+  -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*)
-+    localedir=$ac_optarg ;;
-+
-+  -localstatedir | --localstatedir | --localstatedi | --localstated \
-+  | --localstate | --localstat | --localsta | --localst | --locals)
-+    ac_prev=localstatedir ;;
-+  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-+  | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*)
-+    localstatedir=$ac_optarg ;;
-+
-+  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-+    ac_prev=mandir ;;
-+  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-+    mandir=$ac_optarg ;;
-+
-+  -nfp | --nfp | --nf)
-+    # Obsolete; use --without-fp.
-+    with_fp=no ;;
-+
-+  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-+  | --no-cr | --no-c | -n)
-+    no_create=yes ;;
-+
-+  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-+  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-+    no_recursion=yes ;;
-+
-+  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-+  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-+  | --oldin | --oldi | --old | --ol | --o)
-+    ac_prev=oldincludedir ;;
-+  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-+  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-+  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-+    oldincludedir=$ac_optarg ;;
-+
-+  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-+    ac_prev=prefix ;;
-+  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-+    prefix=$ac_optarg ;;
-+
-+  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-+  | --program-pre | --program-pr | --program-p)
-+    ac_prev=program_prefix ;;
-+  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-+  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-+    program_prefix=$ac_optarg ;;
-+
-+  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-+  | --program-suf | --program-su | --program-s)
-+    ac_prev=program_suffix ;;
-+  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-+  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-+    program_suffix=$ac_optarg ;;
-+
-+  -program-transform-name | --program-transform-name \
-+  | --program-transform-nam | --program-transform-na \
-+  | --program-transform-n | --program-transform- \
-+  | --program-transform | --program-transfor \
-+  | --program-transfo | --program-transf \
-+  | --program-trans | --program-tran \
-+  | --progr-tra | --program-tr | --program-t)
-+    ac_prev=program_transform_name ;;
-+  -program-transform-name=* | --program-transform-name=* \
-+  | --program-transform-nam=* | --program-transform-na=* \
-+  | --program-transform-n=* | --program-transform-=* \
-+  | --program-transform=* | --program-transfor=* \
-+  | --program-transfo=* | --program-transf=* \
-+  | --program-trans=* | --program-tran=* \
-+  | --progr-tra=* | --program-tr=* | --program-t=*)
-+    program_transform_name=$ac_optarg ;;
-+
-+  -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd)
-+    ac_prev=pdfdir ;;
-+  -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*)
-+    pdfdir=$ac_optarg ;;
-+
-+  -psdir | --psdir | --psdi | --psd | --ps)
-+    ac_prev=psdir ;;
-+  -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)
-+    psdir=$ac_optarg ;;
-+
-+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+  | -silent | --silent | --silen | --sile | --sil)
-+    silent=yes ;;
-+
-+  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-+    ac_prev=sbindir ;;
-+  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-+  | --sbi=* | --sb=*)
-+    sbindir=$ac_optarg ;;
-+
-+  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-+  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-+  | --sharedst | --shareds | --shared | --share | --shar \
-+  | --sha | --sh)
-+    ac_prev=sharedstatedir ;;
-+  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-+  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-+  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-+  | --sha=* | --sh=*)
-+    sharedstatedir=$ac_optarg ;;
-+
-+  -site | --site | --sit)
-+    ac_prev=site ;;
-+  -site=* | --site=* | --sit=*)
-+    site=$ac_optarg ;;
-+
-+  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-+    ac_prev=srcdir ;;
-+  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-+    srcdir=$ac_optarg ;;
-+
-+  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-+  | --syscon | --sysco | --sysc | --sys | --sy)
-+    ac_prev=sysconfdir ;;
-+  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-+  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-+    sysconfdir=$ac_optarg ;;
-+
-+  -target | --target | --targe | --targ | --tar | --ta | --t)
-+    ac_prev=target_alias ;;
-+  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-+    target_alias=$ac_optarg ;;
-+
-+  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-+    verbose=yes ;;
-+
-+  -version | --version | --versio | --versi | --vers | -V)
-+    ac_init_version=: ;;
-+
-+  -with-* | --with-*)
-+    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_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
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=\$ac_optarg ;;
-+
-+  -without-* | --without-*)
-+    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_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
-+      *"
-+"with_$ac_useropt"
-+"*) ;;
-+      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
-+	 ac_unrecognized_sep=', ';;
-+    esac
-+    eval with_$ac_useropt=no ;;
-+
-+  --x)
-+    # Obsolete; use --with-x.
-+    with_x=yes ;;
-+
-+  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-+  | --x-incl | --x-inc | --x-in | --x-i)
-+    ac_prev=x_includes ;;
-+  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-+  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-+    x_includes=$ac_optarg ;;
-+
-+  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-+  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-+    ac_prev=x_libraries ;;
-+  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-+  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-+    x_libraries=$ac_optarg ;;
-+
-+  -*) 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.
+ PACKAGE_BUGREPORT
+ PACKAGE_STRING
+ PACKAGE_VERSION
+@@ -1034,8 +992,9 @@ do
+   fi
+ 
+   case $ac_option in
+-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+-  *)	ac_optarg=yes ;;
++  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *=)   ac_optarg= ;;
++  *)    ac_optarg=yes ;;
+   esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -1080,8 +1039,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
+@@ -1107,8 +1065,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
+@@ -1312,8 +1269,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
+@@ -1329,8 +1285,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
+@@ -1360,17 +1315,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'" ;;
++      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
 +    esac
-+    eval $ac_envvar=\$ac_optarg
-+    export $ac_envvar ;;
-+
-+  *)
-+    # FIXME: should be removed in autoconf 3.0.
-+    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-+    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-+      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-+    ;;
-+
-+  esac
-+done
-+
-+if test -n "$ac_prev"; then
-+  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-+  as_fn_error "missing argument to $ac_option"
-+fi
-+
-+if test -n "$ac_unrecognized_opts"; then
-+  case $enable_option_checking in
-+    no) ;;
-+    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
-+    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
-+  esac
-+fi
-+
-+# Check all directory arguments for consistency.
-+for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
-+		datadir sysconfdir sharedstatedir localstatedir includedir \
-+		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-+		libdir localedir mandir
-+do
-+  eval ac_val=\$$ac_var
-+  # Remove trailing slashes.
-+  case $ac_val in
-+    */ )
-+      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
-+      eval $ac_var=\$ac_val;;
-+  esac
-+  # Be sure to have absolute directory names.
-+  case $ac_val in
-+    [\\/$]* | ?:[\\/]* )  continue;;
-+    NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
-+  esac
-+  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'
-+# used to hold the argument of --host etc.
-+# FIXME: To remove some day.
-+build=$build_alias
-+host=$host_alias
-+target=$target_alias
-+
-+# FIXME: To remove some day.
-+if test "x$host_alias" != x; then
-+  if test "x$build_alias" = x; then
-+    cross_compiling=maybe
-+    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-+    If a cross compiler is detected then cross compile mode will be used." >&2
-+  elif test "x$build_alias" != "x$host_alias"; then
-+    cross_compiling=yes
-+  fi
-+fi
-+
-+ac_tool_prefix=
-+test -n "$host_alias" && ac_tool_prefix=$host_alias-
-+
-+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_fn_error "working directory cannot be determined"
-+test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
-+  as_fn_error "pwd does not report name of working directory"
-+
-+
-+# Find the source files, if location was not specified.
-+if test -z "$srcdir"; then
-+  ac_srcdir_defaulted=yes
-+  # Try the directory containing this script, then the parent directory.
-+  ac_confdir=`$as_dirname -- "$as_myself" ||
-+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$as_myself" : 'X\(//\)[^/]' \| \
-+	 X"$as_myself" : 'X\(//\)$' \| \
-+	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$as_myself" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+  srcdir=$ac_confdir
-+  if test ! -r "$srcdir/$ac_unique_file"; then
-+    srcdir=..
-+  fi
-+else
-+  ac_srcdir_defaulted=no
-+fi
-+if test ! -r "$srcdir/$ac_unique_file"; then
-+  test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
-+  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_fn_error "$ac_msg"
-+	pwd)`
-+# When building in place, set srcdir=.
-+if test "$ac_abs_confdir" = "$ac_pwd"; then
-+  srcdir=.
-+fi
-+# Remove unnecessary trailing slashes from srcdir.
-+# Double slashes in file names in object file debugging info
-+# mess up M-x gdb in Emacs.
-+case $srcdir in
-+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;;
-+esac
-+for ac_var in $ac_precious_vars; do
-+  eval ac_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_env_${ac_var}_value=\$${ac_var}
-+  eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
-+  eval ac_cv_env_${ac_var}_value=\$${ac_var}
-+done
-+
-+#
-+# Report the --help message.
-+#
-+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 MediaTomb 0.12.0 to adapt to many kinds of systems.
-+
-+Usage: $0 [OPTION]... [VAR=VALUE]...
-+
-+To assign environment variables (e.g., CC, CFLAGS...), specify them as
-+VAR=VALUE.  See below for descriptions of some of the useful variables.
-+
-+Defaults for the options are specified in brackets.
-+
-+Configuration:
-+  -h, --help              display this help and exit
-+      --help=short        display options specific to this package
-+      --help=recursive    display the short help of all the included packages
-+  -V, --version           display version information and exit
-+  -q, --quiet, --silent   do not print \`checking...' messages
-+      --cache-file=FILE   cache test results in FILE [disabled]
-+  -C, --config-cache      alias for \`--cache-file=config.cache'
-+  -n, --no-create         do not create output files
-+      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-+
-+Installation directories:
-+  --prefix=PREFIX         install architecture-independent files in PREFIX
-+                          [$ac_default_prefix]
-+  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-+                          [PREFIX]
-+
-+By default, \`make install' will install all the files in
-+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-+for instance \`--prefix=\$HOME'.
-+
-+For better control, use the options below.
-+
-+Fine tuning of the installation directories:
-+  --bindir=DIR            user executables [EPREFIX/bin]
-+  --sbindir=DIR           system admin executables [EPREFIX/sbin]
-+  --libexecdir=DIR        program executables [EPREFIX/libexec]
-+  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
-+  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
-+  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
-+  --libdir=DIR            object code libraries [EPREFIX/lib]
-+  --includedir=DIR        C header files [PREFIX/include]
-+  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
-+  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
-+  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
-+  --infodir=DIR           info documentation [DATAROOTDIR/info]
-+  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
-+  --mandir=DIR            man documentation [DATAROOTDIR/man]
-+  --docdir=DIR            documentation root [DATAROOTDIR/doc/mediatomb]
-+  --htmldir=DIR           html documentation [DOCDIR]
-+  --dvidir=DIR            dvi documentation [DOCDIR]
-+  --pdfdir=DIR            pdf documentation [DOCDIR]
-+  --psdir=DIR             ps documentation [DOCDIR]
-+_ACEOF
-+
-+  cat <<\_ACEOF
-+
-+Program names:
-+  --program-prefix=PREFIX            prepend PREFIX to installed program names
-+  --program-suffix=SUFFIX            append SUFFIX to installed program names
-+  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-+
-+System types:
-+  --build=BUILD     configure for building on BUILD [guessed]
-+  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-+_ACEOF
-+fi
-+
-+if test -n "$ac_init_help"; then
-+  case $ac_init_help in
-+     short | recursive ) echo "Configuration of MediaTomb 0.12.0:";;
-+   esac
-+  cat <<\_ACEOF
-+
-+Optional Features:
-+  --disable-option-checking  ignore unrecognized --enable/--with options
-+  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-+  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-+  --enable-static         build a static version of MediaTomb
-+  --disable-db-autocreate automatic creation of the database
-+  --enable-debug-malloc0  only for debugging purposes: abort when we try to
-+                          call malloc or realloc with a value of zero
-+  --enable-pthread-lib    if this option is set we will try to link with
-+                          -lpthread, else the flag for pthread will be
-+                          autodetected
-+  --enable-iconv-lib      if this option is set we will try to link with
-+                          -liconv, else we will first try to use iconv built
-+                          into glibc and only then search for libiconv
-+  --enable-atomic-x86-single
-+                          use x86 singleprocessor code for atomic arithmetic
-+                          operations, this will increase performance but you
-+                          must not use the compiled binary on an SMP system.
-+                          Doing so might result in crashes and unexpected
-+                          behaviour
-+
-+  --enable-atomic-pthread use pthreads for atomic arithmetic operations, this
-+                          will deliver the worst performance but is the only
-+                          portable option (default: automatic, depending on
-+                          architecture
-+
-+  --disable-atomic        NEVER disable this! This is only for devel/debugging
-+                          - disables all atomic arithmetics code
-+
-+  --enable-sighup         enable SIGHUP handling, by default this is only
-+                          enabled for x86 platforms, consult the README for
-+                          more information (default: auto)
-+
-+  --enable-mrreg-service  Enable the X_MS_MediaReceiverRegistrar UPnP service.
-+                          This is for future XBox 360 support, other renderers
-+                          will probably not need it
-+  --disable-external-transcoding
-+                          external transcoding support
-+  --enable-sopcast        SopCast service support
-+  --disable-youtube       YouTube service support
-+  --enable-weborama       Weborama service support
-+  --disable-atrailers     Apple Trailers service support
-+  --enable-sqlite-backup-defaults
-+                          enable sqlite database backup settings in config.xml
-+                          by default
-+  --disable-protocolinfo-extension
-+                          This is required for Playstation 3 support, it adds
-+                          certain tags to the protocolInfo attribute
-+
-+  --enable-curl           Enable curl support (required for YouTube support,
-+                          provides additional functionality for the external
-+                          transcoding feature (default: auto)
-+
-+  --disable-fseeko-check  This is a workaround for a bug on some Debian
-+                          distros, use this if configure fails complaining
-+                          about off_t
-+  --disable-dependency-tracking  speeds up one-time build
-+  --enable-dependency-tracking   do not reject slow dependency extractors
-+  --disable-largefile     omit support for large files
-+  --disable-rpl-malloc    disable redefinition of malloc to rpl_malloc and
-+                          realloc to rpl_realloc. Use this if you are sure
-+                          that you are compiling for the GNU C library
-+                          (default: enabled)
-+  --disable-zlib          zlib support required for automated database
-+                          creation
-+  --disable-sqlite3       sqlite3 database supprot
-+  --disable-mysql         mysql database support
-+  --enable-libjs          compile with spidermonkey support (default: yes)
-+  --disable-libmagic      filemagic for automatic mimetype recognition
-+  --enable-id3lib         id3 metadata extraction with the help of id3lib
-+  --disable-taglib        id3 metadata extraction with the help of taglib
-+  --enable-libextractor   metadata extraction with the help of libextractor
-+  --disable-ffmpeg        metadata extraction with the help of ffmpeg
-+  --disable-ffmpegthumbnailer
-+                          compile with ffmpegthumbnailer support for video
-+                          thumbnail generation
-+  --disable-libexif       compile with libexif for exif thumbnail and metadata
-+                          extraction
-+  --disable-libmp4v2      libmp4v2 support for mp4 metadata extraction
-+  --disable-inotify       inotify support for imporved autoscan
-+  --disable-libdvdnav     compile with libdvdnav support for extended DVD
-+                          image parsing
-+  --enable-tombdebug      enable debug code for MediaTomb
-+  --enable-upnpdebug      enable debug output for TombUPnP/libupnp
-+  --disable-log           disable all console output
-+  --disable-debug-log     compile without debug messages
-+
-+Optional Packages:
-+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-+  --with-search=DIR       Additionally search for packages in DIR
-+  --with-js-h=DIR         search for js (spidermonkey) headers in DIR
-+  --with-js-libs=DIR      search for js (spidermonkey) libraries in DIR
-+  --with-iconv-h=DIR      search for iconv headers in DIR
-+  --with-iconv-libs=DIR   search for iconv libraries in DIR
-+
-+  --with-curl-cfg=curl-config
-+                          absolute path/name of curl-config
-+
-+  --with-pthread-libs=DIR search for pthread libraries in DIR
-+  --with-rt-libs=DIR      search for rt libraries in DIR
-+  --with-zlib-h=DIR       search for zlib headers in DIR
-+  --with-zlib-libs=DIR    search for zlib libraries in DIR
-+  --with-sqlite3-h=DIR    search for sqlite3 headers in DIR
-+  --with-sqlite3-libs=DIR search for sqlite3 libraries in DIR
-+  --with-mysql-cfg=mysql_config
-+                          absolute path/name of mysql_config
-+  --with-libmagic-h=DIR   search for libmagic headers in DIR
-+  --with-libmagic-libs=DIR
-+                          search for libmagic libraries in DIR
-+  --with-taglib-cfg=taglib-config
-+                          absolute path/name of taglib-config
-+  --with-id3lib-h=DIR     search for id3lib headers in DIR
-+  --with-id3lib-libs=DIR  search for id3lib libraries in DIR
-+  --with-avformat-h=DIR   search for avformat headers in DIR
-+  --with-avformat-libs=DIR
-+                          search for avformat libraries in DIR
-+  --with-avutil-libs=DIR  search for avutil libraries in DIR
-+  --with-ffmpegthumbnailer-h=DIR
-+                          search for ffmpegthumbnailer headers in DIR
-+  --with-ffmpegthumbnailer-libs=DIR
-+                          search for ffmpegthumbnailer libraries in DIR
-+  --with-libextractor-h=DIR
-+                          search for libextractor headers in DIR
-+  --with-libextractor-libs=DIR
-+                          search for libextractor libraries in DIR
-+  --with-libexif-h=DIR    search for libexif headers in DIR
-+  --with-libexif-libs=DIR search for libexif libraries in DIR
-+  --with-expat-h=DIR      search for expat headers in DIR
-+  --with-expat-libs=DIR   search for expat libraries in DIR
-+  --with-libmp4v2-h=DIR   search for libmp4v2 headers in DIR
-+  --with-libmp4v2-libs=DIR
-+                          search for libmp4v2 libraries in DIR
-+  --with-inotify-h=DIR    search for inotify headers in DIR
-+  --with-libdvdnav-cfg=dvdnav-config
-+                          absolute path/name of dvdnav-config
-+
-+Some influential environment variables:
-+  CXX         C++ compiler command
-+  CXXFLAGS    C++ compiler flags
-+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-+              nonstandard directory <lib dir>
-+  LIBS        libraries to pass to the linker, e.g. -l<library>
+     eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+ 
+@@ -1387,15 +1342,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
+@@ -1418,8 +1371,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'
+@@ -1433,8 +1385,8 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used." >&2
++    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used" >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -1449,11 +1401,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.
+@@ -1492,13 +1442,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
+@@ -1538,7 +1486,7 @@ Configuration:
+       --help=short        display options specific to this package
+       --help=recursive    display the short help of all the included packages
+   -V, --version           display version information and exit
+-  -q, --quiet, --silent   do not print \`checking...' messages
++  -q, --quiet, --silent   do not print \`checking ...' messages
+       --cache-file=FILE   cache test results in FILE [disabled]
+   -C, --config-cache      alias for \`--cache-file=config.cache'
+   -n, --no-create         do not create output files
+@@ -1739,7 +1687,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>
-+  CC          C compiler command
-+  CFLAGS      C compiler flags
-+  CPP         C preprocessor
-+  CXXCPP      C++ preprocessor
-+
-+Use these variables to override the choices made by `configure' or to help
-+it to find libraries and programs with nonstandard names/locations.
-+
-+Report bugs to <jin at mediatomb.cc>.
-+_ACEOF
-+ac_status=$?
-+fi
-+
-+if test "$ac_init_help" = "recursive"; then
-+  # If there are subdirs, report their specific --help.
-+  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-+    test -d "$ac_dir" ||
-+      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
-+      continue
-+    ac_builddir=.
-+
-+case "$ac_dir" in
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+    cd "$ac_dir" || { ac_status=$?; continue; }
-+    # Check for guested configure.
-+    if test -f "$ac_srcdir/configure.gnu"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure.gnu" --help=recursive
-+    elif test -f "$ac_srcdir/configure"; then
-+      echo &&
-+      $SHELL "$ac_srcdir/configure" --help=recursive
-+    else
-+      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-+    fi || ac_status=$?
-+    cd "$ac_pwd" || { ac_status=$?; break; }
-+  done
-+fi
-+
-+test -n "$ac_init_help" && exit $ac_status
-+if $ac_init_version; then
-+  cat <<\_ACEOF
-+MediaTomb configure 0.12.0
-+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
+               you have headers in a nonstandard directory <include dir>
+   CC          C compiler command
+   CFLAGS      C compiler flags
+@@ -1813,21 +1761,1102 @@ test -n "$ac_init_help" && exit $ac_status
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ MediaTomb configure 0.12.1
+-generated by GNU Autoconf 2.63
++generated by GNU Autoconf 2.67
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 2010 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. ##
@@ -9238,7 +1182,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +    mv -f conftest.er1 conftest.err
 +  fi
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } >/dev/null && {
++  test $ac_status = 0; } > conftest.i && {
 +	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then :
@@ -9351,7 +1295,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  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 :
++if eval "test \"\${$3+set}\"" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  eval "$3=no"
@@ -9405,7 +1349,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  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 :
++if eval "test \"\${$3+set}\"" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9435,10 +1379,10 @@ Patch that applies changes after `autoreconf -fi` is done.
 +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 :
++  if eval "test \"\${$3+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 :
++if eval "test \"\${$3+set}\"" = set; then :
 +  $as_echo_n "(cached) " >&6
 +fi
 +eval ac_res=\$$3
@@ -9474,7 +1418,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +else
 +  ac_header_preproc=no
 +fi
-+rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 +$as_echo "$ac_header_preproc" >&6; }
 +
@@ -9497,17 +1441,15 @@ Patch that applies changes after `autoreconf -fi` is done.
 +$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
-+## ------------------------------- ##
++( $as_echo "## ------------------------------- ##
 +## Report this to jin at mediatomb.cc ##
-+## ------------------------------- ##
-+_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 :
++if eval "test \"\${$3+set}\"" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  eval "$3=\$ac_header_compiler"
@@ -9528,7 +1470,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  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 :
++if eval "test \"\${$3+set}\"" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9774,7 +1716,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
 +$as_echo_n "checking for int$2_t... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  eval "$3=no"
@@ -9825,8 +1767,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+       eval as_val=\$$3
-+   if test "x$as_val" = x""no; then :
++       if eval test \"x\$"$3"\" = x"no"; then :
 +
 +else
 +  break
@@ -9849,7 +1790,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
 +$as_echo_n "checking for uint$2_t... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  eval "$3=no"
@@ -9879,8 +1820,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +esac
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+       eval as_val=\$$3
-+   if test "x$as_val" = x""no; then :
++       if eval test \"x\$"$3"\" = x"no"; then :
 +
 +else
 +  break
@@ -9894,15 +1834,18 @@ Patch that applies changes after `autoreconf -fi` is done.
 +
 +} # ac_fn_c_find_uintX_t
 +
-+# ac_fn_c_check_decl LINENO SYMBOL VAR
-+# ------------------------------------
-+# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
++# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES
++# ---------------------------------------------
++# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
++# accordingly.
 +ac_fn_c_check_decl ()
 +{
 +  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-+$as_echo_n "checking whether $2 is declared... " >&6; }
-+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  as_decl_name=`echo $2|sed 's/ *(.*//'`
++  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
++  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
++$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
++if eval "test \"\${$3+set}\"" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9911,8 +1854,12 @@ Patch that applies changes after `autoreconf -fi` is done.
 +int
 +main ()
 +{
-+#ifndef $2
-+  (void) $2;
++#ifndef $as_decl_name
++#ifdef __cplusplus
++  (void) $as_decl_use;
++#else
++  (void) $as_decl_name;
++#endif
 +#endif
 +
 +  ;
@@ -9987,7 +1934,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  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 :
++if eval "test \"\${$3+set}\"" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10067,7 +2014,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +    mv -f conftest.er1 conftest.err
 +  fi
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-+  test $ac_status = 0; } >/dev/null && {
++  test $ac_status = 0; } > conftest.i && {
 +	 test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 +	 test ! -s conftest.err
 +       }; then :
@@ -10091,10 +2038,10 @@ Patch that applies changes after `autoreconf -fi` is done.
 +ac_fn_cxx_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 :
++  if eval "test \"\${$3+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 :
++if eval "test \"\${$3+set}\"" = set; then :
 +  $as_echo_n "(cached) " >&6
 +fi
 +eval ac_res=\$$3
@@ -10130,7 +2077,7 @@ Patch that applies changes after `autoreconf -fi` is done.
 +else
 +  ac_header_preproc=no
 +fi
-+rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
 +$as_echo "$ac_header_preproc" >&6; }
 +
@@ -10153,17 +2100,15 @@ Patch that applies changes after `autoreconf -fi` is done.
 +$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
-+## ------------------------------- ##
++( $as_echo "## ------------------------------- ##
 +## Report this to jin at mediatomb.cc ##
-+## ------------------------------- ##
-+_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 :
++if eval "test \"\${$3+set}\"" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  eval "$3=\$ac_header_compiler"
@@ -10217,1850 +2162,1373 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  as_fn_set_status $ac_retval
 +
 +} # ac_fn_cxx_try_run
-+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 MediaTomb $as_me 0.12.0, which was
-+generated by GNU Autoconf 2.65.  Invocation command line was
-+
-+  $ $0 $@
-+
-+_ACEOF
-+exec 5>>config.log
-+{
-+cat <<_ASUNAME
-+## --------- ##
-+## Platform. ##
-+## --------- ##
-+
-+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-+
-+/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-+/usr/bin/hostinfo      = `(/usr/bin/hostinfo) 2>/dev/null      || echo unknown`
-+/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-+/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-+
-+_ASUNAME
-+
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+ 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 MediaTomb $as_me 0.12.1, which was
+-generated by GNU Autoconf 2.63.  Invocation command line was
++generated by GNU Autoconf 2.67.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -1863,8 +2892,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
-+
-+cat >&5 <<_ACEOF
-+
-+
-+## ----------- ##
-+## Core tests. ##
-+## ----------- ##
-+
-+_ACEOF
-+
-+
-+# Keep a trace of the command line.
-+# Strip out --no-create and --no-recursion so they do not pile up.
-+# Strip out --silent because we don't want to record it for future runs.
-+# Also quote any args containing shell meta-characters.
-+# Make two passes to allow for proper duplicate-argument suppression.
-+ac_configure_args=
-+ac_configure_args0=
-+ac_configure_args1=
-+ac_must_keep_next=false
-+for ac_pass in 1 2
-+do
-+  for ac_arg
-+  do
-+    case $ac_arg in
-+    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-+    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-+    | -silent | --silent | --silen | --sile | --sil)
-+      continue ;;
-+    *\'*)
-+      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
-+    case $ac_pass in
+ IFS=$as_save_IFS
+ 
+ } >&5
+@@ -1901,9 +2930,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)
+     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
-+	case $ac_arg in
-+	  *=* | --config-cache | -C | -disable-* | --disable-* \
-+	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-+	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-+	  | -with-* | --with-* | -without-* | --without-* | --x)
-+	    case "$ac_configure_args0 " in
-+	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-+	    esac
-+	    ;;
-+	  -* ) ac_must_keep_next=true ;;
-+	esac
-+      fi
+       if test $ac_must_keep_next = true; then
+ 	ac_must_keep_next=false # Got value, back to normal.
+       else
+@@ -1919,13 +2948,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
+       ;;
+     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
-+# would cause problems or look ugly.
-+# WARNING: Use '\'' to represent an apostrophe within the trap.
-+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
-+trap 'exit_status=$?
-+  # Save into config.log some information that might help in debugging.
-+  {
-+    echo
-+
-+    cat <<\_ASBOX
-+## ---------------- ##
-+## Cache variables. ##
-+## ---------------- ##
-+_ASBOX
-+    echo
-+    # The following way of writing the cache mishandles newlines in values,
-+(
-+  for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
+ 
+ # When interrupted or exit'd, cleanup temporary files, and complete
+ # config.log.  We remove comments because anyway the quotes in there
+@@ -1937,11 +2966,9 @@ trap 'exit_status=$?
+   {
+     echo
+ 
+-    cat <<\_ASBOX
+-## ---------------- ##
++    $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -1950,13 +2977,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_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
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
-+      sed -n \
-+	"s/'\''/'\''\\\\'\'''\''/g;
-+	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p"
-+      ;; #(
-+    *)
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+)
-+    echo
-+
-+    cat <<\_ASBOX
-+## ----------------- ##
-+## Output variables. ##
-+## ----------------- ##
-+_ASBOX
-+    echo
-+    for ac_var in $ac_subst_vars
-+    do
-+      eval ac_val=\$$ac_var
-+      case $ac_val in
-+      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+      esac
-+      $as_echo "$ac_var='\''$ac_val'\''"
-+    done | sort
-+    echo
-+
-+    if test -n "$ac_subst_files"; then
-+      cat <<\_ASBOX
-+## ------------------- ##
-+## File substitutions. ##
-+## ------------------- ##
-+_ASBOX
-+      echo
-+      for ac_var in $ac_subst_files
-+      do
-+	eval ac_val=\$$ac_var
-+	case $ac_val in
-+	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
-+	esac
-+	$as_echo "$ac_var='\''$ac_val'\''"
-+      done | sort
-+      echo
-+    fi
-+
-+    if test -s confdefs.h; then
-+      cat <<\_ASBOX
-+## ----------- ##
-+## confdefs.h. ##
-+## ----------- ##
-+_ASBOX
-+      echo
-+      cat confdefs.h
-+      echo
-+    fi
-+    test "$ac_signal" != 0 &&
-+      $as_echo "$as_me: caught signal $ac_signal"
-+    $as_echo "$as_me: exit $exit_status"
-+  } >&5
-+  rm -f core *.core core.conftest.* &&
-+    rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
-+    exit $exit_status
-+' 0
-+for ac_signal in 1 2 13 15; do
+       esac ;;
+     esac
+   done
+@@ -1975,11 +3002,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ )
+     echo
+ 
+-    cat <<\_ASBOX
+-## ----------------- ##
++    $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
+     echo
+     for ac_var in $ac_subst_vars
+     do
+@@ -1992,11 +3017,9 @@ _ASBOX
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+-      cat <<\_ASBOX
+-## ------------------- ##
++      $as_echo "## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##
+-_ASBOX
++## ------------------- ##"
+       echo
+       for ac_var in $ac_subst_files
+       do
+@@ -2010,11 +3033,9 @@ _ASBOX
+     fi
+ 
+     if test -s confdefs.h; then
+-      cat <<\_ASBOX
+-## ----------- ##
++      $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
+       echo
+       cat confdefs.h
+       echo
+@@ -2028,46 +3049,53 @@ _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
-+
+ 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
-+
+ # 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.
-+ac_site_file1=NONE
-+ac_site_file2=NONE
-+if test -n "$CONFIG_SITE"; then
-+  ac_site_file1=$CONFIG_SITE
-+elif test "x$prefix" != xNONE; then
-+  ac_site_file1=$prefix/share/config.site
-+  ac_site_file2=$prefix/etc/config.site
-+else
-+  ac_site_file1=$ac_default_prefix/share/config.site
-+  ac_site_file2=$ac_default_prefix/etc/config.site
-+fi
-+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
-+do
-+  test "x$ac_site_file" = xNONE && continue
+ 
+ # Let the site file select an alternate cache file if it wants to.
+ # Prefer an explicitly selected file to automatically selected ones.
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+-  ac_site_file1=$CONFIG_SITE
++  # We do not want a PATH search for config.site.
++  case $CONFIG_SITE in #((
++    -*)  ac_site_file1=./$CONFIG_SITE;;
++    */*) ac_site_file1=$CONFIG_SITE;;
++    *)   ac_site_file1=./$CONFIG_SITE;;
++  esac
+ elif test "x$prefix" != xNONE; then
+   ac_site_file1=$prefix/share/config.site
+   ac_site_file2=$prefix/etc/config.site
+@@ -2078,19 +3106,23 @@ 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"
-+  fi
-+done
-+
-+if test -r "$cache_file"; then
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+-    . "$ac_site_file"
++    . "$ac_site_file" \
++      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5 ; }
+   fi
+ 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";;
-+      *)                      . "./$cache_file";;
-+    esac
-+  fi
-+else
+ $as_echo "$as_me: loading cache $cache_file" >&6;}
+     case $cache_file in
+       [\\/]* | ?:[\\/]* ) . "$cache_file";;
+@@ -2098,7 +3130,7 @@ $as_echo "$as_me: loading cache $cache_file" >&6;}
+     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
-+
-+# Check that the precious variables saved in the cache have kept the same
-+# value.
-+ac_cache_corrupted=false
-+for ac_var in $ac_precious_vars; do
-+  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-+  eval ac_new_set=\$ac_env_${ac_var}_set
-+  eval ac_old_val=\$ac_cv_env_${ac_var}_value
-+  eval ac_new_val=\$ac_env_${ac_var}_value
-+  case $ac_old_set,$ac_new_set in
-+    set,)
+ $as_echo "$as_me: creating cache $cache_file" >&6;}
+   >$cache_file
+ fi
+@@ -2113,11 +3145,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: 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=: ;;
-+    ,);;
-+    *)
-+      if test "x$ac_old_val" != "x$ac_new_val"; then
-+	# differences in whitespace do not lead to failure.
-+	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: error: \`$ac_var' was not set in the previous run" >&2;}
+       ac_cache_corrupted=: ;;
+     ,);;
+@@ -2127,17 +3159,17 @@ $as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ 	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: 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: 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:   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
-+  # Pass precious variables to config.status.
-+  if test "$ac_new_set" = set; then
-+    case $ac_new_val in
-+    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    *) ac_arg=$ac_var=$ac_new_val ;;
-+    esac
-+    case " $ac_configure_args " in
-+      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
+ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+       fi;;
+   esac
+@@ -2149,43 +3181,20 @@ $as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
+     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
+     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: 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_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
-+fi
+ $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'
-+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
-+
-+
-+ac_config_headers="$ac_config_headers autoconfig.h tombupnp/upnp/inc/upnpconfig.h"
-+
-+ac_aux_dir=
-+for ac_dir in configure_aux "$srcdir"/configure_aux; do
-+  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_fn_error "cannot find install-sh, install.sh, or shtool in configure_aux \"$srcdir\"/configure_aux" "$LINENO" 5
-+fi
-+
-+# These three variables are undocumented and unsupported,
-+# and are intended to be withdrawn in a future Autoconf release.
-+# They can cause serious problems if a builder's source tree is in a directory
-+# whose full name contains unusual characters.
-+ac_config_guess="$SHELL $ac_aux_dir/config.guess"  # Please don't use this var.
-+ac_config_sub="$SHELL $ac_aux_dir/config.sub"  # Please don't use this var.
-+ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
-+
-+
-+
-+am__api_version='1.11'
-+
-+# Find a good install program.  We prefer a C program (faster),
-+# so one script is as good as another.  But avoid the broken or
-+# incompatible versions:
-+# SysV /etc/install, /usr/sbin/install
-+# SunOS /usr/etc/install
-+# IRIX /sbin/install
-+# AIX /bin/install
-+# AmigaOS /C/install, which installs bootblocks on floppy discs
-+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-+# OS/2's system install, which has a completely different semantic
-+# ./install, which can be erroneously created by make from ./install.sh.
-+# Reject install programs that cannot install multiple files.
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -2213,9 +3222,7 @@ for ac_dir in configure_aux "$srcdir"/configure_aux; do
+   fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in configure_aux \"$srcdir\"/configure_aux" >&5
+-$as_echo "$as_me: error: cannot find install-sh or install.sh in configure_aux \"$srcdir\"/configure_aux" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "cannot find install-sh, install.sh, or shtool in configure_aux \"$srcdir\"/configure_aux" "$LINENO" 5
+ fi
+ 
+ # These three variables are undocumented and unsupported,
+@@ -2244,10 +3251,10 @@ am__api_version='1.11'
+ # 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
+ $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
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2255,11 +3262,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/* | \
+   /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.
-+    # Don't use installbsd from OSF since it installs stuff as root
-+    # by default.
-+    for ac_prog in ginstall scoinst install; do
-+      for ac_exec_ext in '' $ac_executable_extensions; do
-+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-+	  if test $ac_prog = install &&
-+	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # AIX install.  It has an incompatible calling convention.
-+	    :
-+	  elif test $ac_prog = install &&
-+	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-+	    # program-specific install script used by HP pwplus--don't use.
-+	    :
-+	  else
-+	    rm -rf conftest.one conftest.two conftest.dir
-+	    echo one > conftest.one
-+	    echo two > conftest.two
-+	    mkdir conftest.dir
-+	    if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
-+	      test -s conftest.one && test -s conftest.two &&
-+	      test -s conftest.dir/conftest.one &&
-+	      test -s conftest.dir/conftest.two
-+	    then
-+	      ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-+	      break 3
-+	    fi
-+	  fi
-+	fi
-+      done
-+    done
-+    ;;
-+esac
-+
+   /usr/ucb/* ) ;;
+   *)
+     # OSF1 and SCO ODT 3.0 have their own names for install.
+@@ -2296,7 +3303,7 @@ case $as_dir/ in
+     ;;
+ esac
+ 
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+rm -rf conftest.one conftest.two conftest.dir
-+
-+fi
-+  if test "${ac_cv_path_install+set}" = set; then
-+    INSTALL=$ac_cv_path_install
-+  else
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # value for INSTALL 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.
-+    INSTALL=$ac_install_sh
-+  fi
-+fi
+ IFS=$as_save_IFS
+ 
+ rm -rf conftest.one conftest.two conftest.dir
+@@ -2312,7 +3319,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}.
-+# It thinks the first close brace ends the variable substitution.
-+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-+
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
-+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-+
+ $as_echo "$INSTALL" >&6; }
+ 
+ # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
+@@ -2323,7 +3330,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
+ 
+ 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
-+echo timestamp > conftest.file
-+# Reject unsafe characters in $srcdir or the absolute working directory
-+# name.  Accept space and tab only in the latter.
-+am_lf='
-+'
-+case `pwd` in
-+  *[\\\"\#\$\&\'\`$am_lf]*)
-+    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
-+esac
-+case $srcdir in
-+  *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-+    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-+esac
-+
-+# Do `set' in a subshell so we don't clobber the current shell's
-+# arguments.  Must try -L first in case configure is actually a
-+# symlink; some systems play weird games with the mod time of symlinks
-+# (eg FreeBSD returns the mod time of the symlink's containing
-+# directory).
-+if (
-+   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
-+   if test "$*" = "X"; then
-+      # -L didn't work.
-+      set X `ls -t "$srcdir/configure" conftest.file`
-+   fi
-+   rm -f conftest.file
-+   if test "$*" != "X $srcdir/configure conftest.file" \
-+      && test "$*" != "X conftest.file $srcdir/configure"; then
-+
-+      # If neither matched, then we have a broken ls.  This can happen
-+      # if, for instance, CONFIG_SHELL is bash and it inherits a
-+      # broken ls alias from the environment.  This has actually
-+      # happened.  Such a system could not be considered "sane".
-+      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
+ $as_echo_n "checking whether build environment is sane... " >&6; }
+ # Just in case
+ sleep 1
+@@ -2334,15 +3341,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
+@@ -2364,11 +3367,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
-+   )
-+then
-+   # Ok.
-+   :
-+else
-+   as_fn_error "newly created file is older than distributed files!
+    fi
+ 
+    test "$2" = conftest.file
+@@ -2377,13 +3377,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
+ 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"
-+# Use a double $ so make ignores it.
-+test "$program_suffix" != NONE &&
-+  program_transform_name="s&\$&$program_suffix&;$program_transform_name"
-+# Double any \ or $.
-+# By default was `s,x,x', remove it if useless.
-+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
-+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
-+
-+# expand $ac_aux_dir to an absolute path
-+am_aux_dir=`cd $ac_aux_dir && pwd`
-+
-+if test x"${MISSING+set}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
-+  *)
-+    MISSING="\${SHELL} $am_aux_dir/missing" ;;
-+  esac
-+fi
-+# Use eval to expand $SHELL
-+if eval "$MISSING --run true"; then
-+  am_missing_run="$MISSING --run "
-+else
-+  am_missing_run=
+ $as_echo "yes" >&6; }
+ test "$program_prefix" != NONE &&
+   program_transform_name="s&^&$program_prefix&;$program_transform_name"
+@@ -2411,7 +3408,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
-+
-+if test x"${install_sh}" != xset; then
-+  case $am_aux_dir in
-+  *\ * | *\	*)
-+    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
-+  *)
-+    install_sh="\${SHELL} $am_aux_dir/install-sh"
-+  esac
-+fi
-+
-+# Installed binaries are usually stripped using `strip' when the user
-+# run `make install-strip'.  However `strip' might not be the right
-+# tool to use in cross-compilation environments, therefore Automake
-+# will honor the `STRIP' environment variable to overrule this program.
-+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: WARNING: \`missing' script is too old or missing" >&2;}
+ fi
+ 
+@@ -2432,9 +3429,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; }
+ $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
-+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$STRIP"; then
+@@ -2445,24 +3442,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"
+   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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+STRIP=$ac_cv_prog_STRIP
-+if test -n "$STRIP"; then
+ 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 "$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
-+
-+
-+fi
-+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 "no" >&6; }
+ fi
+ 
+@@ -2472,9 +3469,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; }
+ $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
-+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_STRIP"; then
+@@ -2485,24 +3482,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"
+   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
+     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
+ 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 "$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
-+
-+  if test "x$ac_ct_STRIP" = x; then
-+    STRIP=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -2511,7 +3508,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
-+    STRIP=$ac_ct_STRIP
-+  fi
-+else
-+  STRIP="$ac_cv_prog_STRIP"
-+fi
-+
-+fi
-+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
-+
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -2524,10 +3521,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
+ $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
-+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+@@ -2535,7 +3532,7 @@ for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+ 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 #(
-+	     'mkdir (GNU coreutils) '* | \
-+	     'mkdir (coreutils) '* | \
-+	     'mkdir (fileutils) '4.1*)
-+	       ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
-+	       break 3;;
-+	   esac
-+	 done
-+       done
+ 	 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 #(
+@@ -2547,11 +3544,12 @@ do
+ 	   esac
+ 	 done
+        done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+
+ 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
-+    # As a last resort, use the slow shell script.  Don't cache a
-+    # 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.
-+    MKDIR_P="$ac_install_sh -d"
-+  fi
-+fi
+   if test "${ac_cv_path_mkdir+set}" = set; then
+     MKDIR_P="$ac_cv_path_mkdir -p"
+   else
+@@ -2559,11 +3557,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"
-+case $mkdir_p in
-+  [\\/$]* | ?:[\\/]*) ;;
-+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
-+esac
-+
-+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 "$MKDIR_P" >&6; }
+ 
+ mkdir_p="$MKDIR_P"
+@@ -2576,9 +3573,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; }
+ $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
-+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$AWK"; then
+@@ -2589,24 +3586,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"
+   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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+AWK=$ac_cv_prog_AWK
-+if test -n "$AWK"; then
+ 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 "$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
-+
-+
-+  test -n "$AWK" && break
-+done
-+
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -2614,11 +3611,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 :
-+  $as_echo_n "(cached) " >&6
-+else
-+  cat >conftest.make <<\_ACEOF
-+SHELL = /bin/sh
-+all:
-+	@echo '@@@%%%=$(MAKE)=@@@%%%'
-+_ACEOF
-+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-+case `${MAKE-make} -f conftest.make 2>/dev/null` in
-+  *@@@%%%=?*=@@@%%%*)
-+    eval ac_cv_prog_make_${ac_make}_set=yes;;
-+  *)
-+    eval ac_cv_prog_make_${ac_make}_set=no;;
-+esac
-+rm -f conftest.make
-+fi
-+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ $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 eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+@@ -2626,7 +3623,7 @@ SHELL = /bin/sh
+ all:
+ 	@echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+   *@@@%%%=?*=@@@%%%*)
+     eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -2636,11 +3633,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 "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
-+
-+rm -rf .tst 2>/dev/null
-+mkdir .tst 2>/dev/null
-+if test -d .tst; then
-+  am__leading_dot=.
-+else
-+  am__leading_dot=_
-+fi
-+rmdir .tst 2>/dev/null
-+
-+if test "`cd $srcdir && pwd`" != "`pwd`"; then
-+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-+  # is not polluted with repeated "-I."
-+  am__isrc=' -I$(srcdir)'
-+  # test to see if srcdir already configured
-+  if test -f $srcdir/config.status; then
-+    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
-+  fi
-+fi
-+
-+# test whether we have cygpath
-+if test -z "$CYGPATH_W"; then
-+  if (cygpath --version) >/dev/null 2>/dev/null; then
-+    CYGPATH_W='cygpath -w'
-+  else
-+    CYGPATH_W=echo
-+  fi
-+fi
-+
-+
-+# Define the identity of the package.
-+ PACKAGE='mediatomb'
-+ VERSION='0.12.0'
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE "$PACKAGE"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define VERSION "$VERSION"
-+_ACEOF
-+
-+# Some tools Automake needs.
-+
-+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-+
-+
-+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-+
-+
-+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-+
-+
-+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-+
-+
-+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-+
-+# We need awk for the "check" target.  The system "awk" is bad on
-+# some platforms.
-+# Always define AMTAR for backward compatibility.
-+
-+AMTAR=${AMTAR-"${am_missing_run}tar"}
-+
-+am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+
-+
-+
-+
-+
-+
-+if test "x${prefix}" = "xNONE"; then
-+    prefix="${ac_default_prefix}"
-+fi
-+
-+SEARCH_DIR="/usr/local"
-+
-+DARWIN_OS=0
-+CYGWIN_OS=0
-+FREEBSD_OS=0
-+OPENBSD_OS=0
-+
-+LIBS_SAVE="$LIBS"
-+
-+# Make sure we can run config.sub.
-+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
-+  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-+
+ $as_echo "no" >&6; }
+   SET_MAKE="MAKE=${MAKE-make}"
+ fi
+@@ -2660,9 +3657,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
+   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
+ 
+@@ -2734,35 +3729,27 @@ LIBS_SAVE="$LIBS"
+ 
+ # 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; }
+ $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_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_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-+
-+fi
+   $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_fn_error "invalid value of canonical build" "$LINENO" 5;;
-+esac
-+build=$ac_cv_build
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_build
-+shift
-+build_cpu=$1
-+build_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+build_os=$*
-+IFS=$ac_save_IFS
-+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-+
-+
+ $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='-'
+@@ -2778,28 +3765,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; }
+ $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_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
-+fi
-+
-+fi
+   $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_fn_error "invalid value of canonical host" "$LINENO" 5;;
-+esac
-+host=$ac_cv_host
-+ac_save_IFS=$IFS; IFS='-'
-+set x $ac_cv_host
-+shift
-+host_cpu=$1
-+host_vendor=$2
-+shift; shift
-+# Remember, the first character of IFS is used to create $*,
-+# except with old shells:
-+host_os=$*
-+IFS=$ac_save_IFS
-+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
-+
-+
-+
-+case $host in
-+    *-*-darwin*)
-+        DARWIN_OS=1
-+        SEARCH_DIR="/opt/local"
-+        ;;
-+    *-*-solaris*)
-+
+ $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='-'
+@@ -2823,9 +3806,7 @@ case $host in
+         ;;
+     *-*-solaris*)
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define SOLARIS 1
+-_ACEOF
 +$as_echo "#define SOLARIS 1" >>confdefs.h
-+
-+        ;;
-+    *-*-cygwin*)
-+        CYGWIN_OS=1
-+        ;;
-+    *-*-freebsd*)
-+        FREEBSD_OS=1
-+        ;;
-+    *-*-openbsd*)
-+        OPENBSD_OS=1
-+        ;;
-+esac
-+
-+
-+
-+
-+    MT_SEARCHPATH="/usr/local"
-+    case $host in
-+        *-*-darwin*)
-+            MT_SEARCHPATH="/opt/local"
-+        ;;
-+    esac
-+
-+
-+# Check whether --with-search was given.
+ 
+         ;;
+     *-*-cygwin*)
+@@ -2851,10 +3832,10 @@ esac
+ 
+ 
+ # Check whether --with-search was given.
+-if test "${with_search+set}" = set; then
 +if test "${with_search+set}" = set; then :
-+  withval=$with_search;
-+            MT_SEARCHPATH=$withval
+   withval=$with_search;
+             MT_SEARCHPATH=$withval
+-            { $as_echo "$as_me:$LINENO: Will also search for packages in ${MT_SEARCHPATH}" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will also search for packages in ${MT_SEARCHPATH}" >&5
-+$as_echo "$as_me: Will also search for packages in ${MT_SEARCHPATH}" >&6;}
-+
-+
-+fi
-+
-+
-+    MT_SEARCHPATH_HEADERS="${MT_SEARCHPATH}/include"
-+    MT_SEARCHPATH_LIBS="${MT_SEARCHPATH}/lib"
-+    MT_SEARCHPATH_PROGS="${MT_SEARCHPATH}/bin"
-+
-+
-+
-+
-+
-+
-+
-+#AC_ARG_WITH(search,
-+#        AC_HELP_STRING([--with-search=DIR], [Additionally search for packages in DIR]),
-+#        [
-+#            SEARCH_DIR=$withval
-+#            AC_MSG_NOTICE([Will also search for packages in $SEARCH_DIR])
-+#        ]
-+#)
-+
-+SEARCH_DIR_HEADERS="$SEARCH_DIR/include"
-+SEARCH_DIR_LIBS="$SEARCH_DIR/lib"
-+SEARCH_DIR_PROGS="$SEARCH_DIR/bin"
-+
-+# per package header and library search paths
-+
-+
-+# Check whether --with-js-h was given.
+ $as_echo "$as_me: Will also search for packages in ${MT_SEARCHPATH}" >&6;}
+ 
+ 
+@@ -2887,7 +3868,7 @@ SEARCH_DIR_PROGS="$SEARCH_DIR/bin"
+ 
+ 
+ # Check whether --with-js-h was given.
+-if test "${with_js_h+set}" = set; then
 +if test "${with_js_h+set}" = set; then :
-+  withval=$with_js_h;
-+            JS_SEARCH_HEADERS="$withval"
-+
-+
-+fi
-+
-+
-+
-+# Check whether --with-js-libs was given.
+   withval=$with_js_h;
+             JS_SEARCH_HEADERS="$withval"
+ 
+@@ -2897,7 +3878,7 @@ fi
+ 
+ 
+ # Check whether --with-js-libs was given.
+-if test "${with_js_libs+set}" = set; then
 +if test "${with_js_libs+set}" = set; then :
-+  withval=$with_js_libs;
-+            JS_SEARCH_LIBS="$withval"
-+
-+
-+fi
-+
-+
-+
-+# Check whether --with-iconv-h was given.
+   withval=$with_js_libs;
+             JS_SEARCH_LIBS="$withval"
+ 
+@@ -2907,10 +3888,10 @@ fi
+ 
+ 
+ # Check whether --with-iconv-h was given.
+-if test "${with_iconv_h+set}" = set; then
 +if test "${with_iconv_h+set}" = set; then :
-+  withval=$with_iconv_h;
-+            ICONV_SEARCH_HEADERS="$withval"
+   withval=$with_iconv_h;
+             ICONV_SEARCH_HEADERS="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for iconv headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for iconv headers in $withval" >&5
-+$as_echo "$as_me: Will search for iconv headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+
-+# Check whether --with-iconv-libs was given.
+ $as_echo "$as_me: Will search for iconv headers in $withval" >&6;}
+ 
+ 
+@@ -2919,10 +3900,10 @@ fi
+ 
+ 
+ # Check whether --with-iconv-libs was given.
+-if test "${with_iconv_libs+set}" = set; then
 +if test "${with_iconv_libs+set}" = set; then :
-+  withval=$with_iconv_libs;
-+            ICONV_SEARCH_LIBS="$withval"
+   withval=$with_iconv_libs;
+             ICONV_SEARCH_LIBS="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for iconv libraries in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for iconv libraries in $withval" >&5
-+$as_echo "$as_me: Will search for iconv libraries in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+
-+
-+    mt_static_option_enabled=
-+    mt_static_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_static_option_enabled=yes
-+    else
-+        mt_static_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-static was given.
+ $as_echo "$as_me: Will search for iconv libraries in $withval" >&6;}
+ 
+ 
+@@ -2940,7 +3921,7 @@ fi
+     fi
+ 
+     # Check whether --enable-static was given.
+-if test "${enable_static+set}" = set; then
 +if test "${enable_static+set}" = set; then :
-+  enableval=$enable_static;
-+            mt_static_option_enabled=$enableval
-+            mt_static_option_requested=yes
-+
-+
-+fi
-+
-+
-+    STATIC_OPTION_ENABLED=${mt_static_option_enabled}
-+    STATIC_OPTION_REQUESTED=${mt_static_option_requested}
-+
-+
-+
-+
+   enableval=$enable_static;
+             mt_static_option_enabled=$enableval
+             mt_static_option_requested=yes
+@@ -2955,18 +3936,17 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_static_option_enabled}" = xyes; then
 +    if test "x${mt_static_option_enabled}" = xyes; then :
-+
-+            CFLAGS="$CFLAGS -static"
-+            CXXFLAGS="$CXXFLAGS -static"
+ 
+             CFLAGS="$CFLAGS -static"
+             CXXFLAGS="$CXXFLAGS -static"
+-            { $as_echo "$as_me:$LINENO: Building a static executable." >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Building a static executable." >&5
-+$as_echo "$as_me: Building a static executable." >&6;}
-+
-+fi
-+
-+
-+
-+    mt_db_autocreate_option_enabled=
-+    mt_db_autocreate_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_db_autocreate_option_enabled=yes
-+    else
-+        mt_db_autocreate_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-db-autocreate was given.
+ $as_echo "$as_me: Building a static executable." >&6;}
+ 
+ fi
+ 
+ 
+ 
+-
+     mt_db_autocreate_option_enabled=
+     mt_db_autocreate_option_requested=no
+     if test "xdisable" = xdisable; then
+@@ -2976,7 +3956,7 @@ fi
+     fi
+ 
+     # Check whether --enable-db-autocreate was given.
+-if test "${enable_db_autocreate+set}" = set; then
 +if test "${enable_db_autocreate+set}" = set; then :
-+  enableval=$enable_db_autocreate;
-+            mt_db_autocreate_option_enabled=$enableval
-+            mt_db_autocreate_option_requested=yes
-+
-+
-+fi
-+
-+
-+    DB_AUTOCREATE_OPTION_ENABLED=${mt_db_autocreate_option_enabled}
-+    DB_AUTOCREATE_OPTION_REQUESTED=${mt_db_autocreate_option_requested}
-+
-+
-+
-+
+   enableval=$enable_db_autocreate;
+             mt_db_autocreate_option_enabled=$enableval
+             mt_db_autocreate_option_requested=yes
+@@ -2991,7 +3971,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_db_autocreate_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+
-+
-+    mt_debug_malloc0_option_enabled=
-+    mt_debug_malloc0_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_debug_malloc0_option_enabled=yes
-+    else
-+        mt_debug_malloc0_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-debug-malloc0 was given.
+ 
+ 
+ 
+@@ -3004,7 +3986,7 @@ fi
+     fi
+ 
+     # Check whether --enable-debug-malloc0 was given.
+-if test "${enable_debug_malloc0+set}" = set; then
 +if test "${enable_debug_malloc0+set}" = set; then :
-+  enableval=$enable_debug_malloc0;
-+            mt_debug_malloc0_option_enabled=$enableval
-+            mt_debug_malloc0_option_requested=yes
-+
-+
-+fi
-+
-+
-+    DEBUG_MALLOC0_OPTION_ENABLED=${mt_debug_malloc0_option_enabled}
-+    DEBUG_MALLOC0_OPTION_REQUESTED=${mt_debug_malloc0_option_requested}
-+
-+
-+
-+
+   enableval=$enable_debug_malloc0;
+             mt_debug_malloc0_option_enabled=$enableval
+             mt_debug_malloc0_option_requested=yes
+@@ -3019,12 +4001,10 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_debug_malloc0_option_enabled}" = xyes; then
 +    if test "x${mt_debug_malloc0_option_enabled}" = xyes; then :
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define DEBUG_MALLOC_0 1
+-_ACEOF
 +$as_echo "#define DEBUG_MALLOC_0 1" >>confdefs.h
-+
-+
-+fi
-+
-+
-+
-+
-+    mt_pthread_lib_option_enabled=
-+    mt_pthread_lib_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_pthread_lib_option_enabled=yes
-+    else
-+        mt_pthread_lib_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-pthread-lib was given.
+ 
+ 
+ fi
+@@ -3032,7 +4012,6 @@ fi
+ 
+ 
+ 
+-
+     mt_pthread_lib_option_enabled=
+     mt_pthread_lib_option_requested=no
+     if test "xenable" = xdisable; then
+@@ -3042,7 +4021,7 @@ fi
+     fi
+ 
+     # Check whether --enable-pthread-lib was given.
+-if test "${enable_pthread_lib+set}" = set; then
 +if test "${enable_pthread_lib+set}" = set; then :
-+  enableval=$enable_pthread_lib;
-+            mt_pthread_lib_option_enabled=$enableval
-+            mt_pthread_lib_option_requested=yes
-+
-+
-+fi
-+
-+
-+    PTHREAD_LIB_OPTION_ENABLED=${mt_pthread_lib_option_enabled}
-+    PTHREAD_LIB_OPTION_REQUESTED=${mt_pthread_lib_option_requested}
-+
-+
-+
-+
+   enableval=$enable_pthread_lib;
+             mt_pthread_lib_option_enabled=$enableval
+             mt_pthread_lib_option_requested=yes
+@@ -3057,7 +4036,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_pthread_lib_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+
-+
-+    mt_iconv_lib_option_enabled=
-+    mt_iconv_lib_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_iconv_lib_option_enabled=yes
-+    else
-+        mt_iconv_lib_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-iconv-lib was given.
+ 
+ 
+ 
+@@ -3070,7 +4051,7 @@ fi
+     fi
+ 
+     # Check whether --enable-iconv-lib was given.
+-if test "${enable_iconv_lib+set}" = set; then
 +if test "${enable_iconv_lib+set}" = set; then :
-+  enableval=$enable_iconv_lib;
-+            mt_iconv_lib_option_enabled=$enableval
-+            mt_iconv_lib_option_requested=yes
-+
-+
-+fi
-+
-+
-+    ICONV_LIB_OPTION_ENABLED=${mt_iconv_lib_option_enabled}
-+    ICONV_LIB_OPTION_REQUESTED=${mt_iconv_lib_option_requested}
-+
-+
-+
-+
+   enableval=$enable_iconv_lib;
+             mt_iconv_lib_option_enabled=$enableval
+             mt_iconv_lib_option_requested=yes
+@@ -3085,7 +4066,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_iconv_lib_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+
-+ATOMIC_X86_SMP=0
-+ATOMIC_X86_SMP_REQ=0
-+X86=0
-+case $host_cpu in
-+    *86)
-+        ATOMIC_X86_SMP=1
-+        X86=1
-+    ;;
-+    *86*64)
-+        ATOMIC_X86_SMP=1
-+        X86=1
-+    ;;
-+esac
-+
-+ATOMIC_X86=0
-+
-+
-+
-+    mt_atomic_x86_single_option_enabled=
-+    mt_atomic_x86_single_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_atomic_x86_single_option_enabled=yes
-+    else
-+        mt_atomic_x86_single_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-atomic-x86-single was given.
+ 
+ 
+ ATOMIC_X86_SMP=0
+@@ -3115,7 +4098,7 @@ ATOMIC_X86=0
+     fi
+ 
+     # Check whether --enable-atomic-x86-single was given.
+-if test "${enable_atomic_x86_single+set}" = set; then
 +if test "${enable_atomic_x86_single+set}" = set; then :
-+  enableval=$enable_atomic_x86_single;
-+            mt_atomic_x86_single_option_enabled=$enableval
-+            mt_atomic_x86_single_option_requested=yes
-+
-+
-+fi
-+
-+
-+    ATOMIC_X86_SINGLE_OPTION_ENABLED=${mt_atomic_x86_single_option_enabled}
-+    ATOMIC_X86_SINGLE_OPTION_REQUESTED=${mt_atomic_x86_single_option_requested}
-+
-+
-+
-+
+   enableval=$enable_atomic_x86_single;
+             mt_atomic_x86_single_option_enabled=$enableval
+             mt_atomic_x86_single_option_requested=yes
+@@ -3130,28 +4113,23 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_atomic_x86_single_option_enabled}" = xyes; then
 +    if test "x${mt_atomic_x86_single_option_enabled}" = xyes; then :
-+
-+              if test "$X86" -eq 1; then
-+                    ATOMIC_X86=1
-+                    ATOMIC_X86_SMP=0
-+              else
-+                    as_fn_error "Tried to activate x86 specific option for a non x86 host!" "$LINENO" 5
-+              fi
-+
-+fi
-+
-+# Check whether --enable-atomic-pthread was given.
+ 
+               if test "$X86" -eq 1; then
+                     ATOMIC_X86=1
+                     ATOMIC_X86_SMP=0
+               else
+-                    { { $as_echo "$as_me:$LINENO: error: Tried to activate x86 specific option for a non x86 host!" >&5
+-$as_echo "$as_me: error: Tried to activate x86 specific option for a non x86 host!" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "Tried to activate x86 specific option for a non x86 host!" "$LINENO" 5
+               fi
+ 
+ fi
+ 
+-
+ # Check whether --enable-atomic-pthread was given.
+-if test "${enable_atomic_pthread+set}" = set; then
 +if test "${enable_atomic_pthread+set}" = set; then :
-+  enableval=$enable_atomic_pthread;
-+                if test "x$enableval" = xyes; then
-+                    if test "$ATOMIC_X86" -eq 1; then
-+                        as_fn_error "You can not use atomic-x86-single and atomic-pthread code at the same time!" "$LINENO" 5
-+                    else
-+                        ATOMIC_X86=0
-+                        ATOMIC_X86_SMP=0
-+                    fi
-+                fi
-+
-+
-+fi
-+
-+
-+
-+
-+    mt_atomic_option_enabled=
-+    mt_atomic_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_atomic_option_enabled=yes
-+    else
-+        mt_atomic_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-atomic was given.
+   enableval=$enable_atomic_pthread;
+                 if test "x$enableval" = xyes; then
+                     if test "$ATOMIC_X86" -eq 1; then
+-                        { { $as_echo "$as_me:$LINENO: error: You can not use atomic-x86-single and atomic-pthread code at the same time!" >&5
+-$as_echo "$as_me: error: You can not use atomic-x86-single and atomic-pthread code at the same time!" >&2;}
+-   { (exit 1); exit 1; }; }
++                        as_fn_error $? "You can not use atomic-x86-single and atomic-pthread code at the same time!" "$LINENO" 5
+                     else
+                         ATOMIC_X86=0
+                         ATOMIC_X86_SMP=0
+@@ -3173,7 +4151,7 @@ fi
+     fi
+ 
+     # Check whether --enable-atomic was given.
+-if test "${enable_atomic+set}" = set; then
 +if test "${enable_atomic+set}" = set; then :
-+  enableval=$enable_atomic;
-+            mt_atomic_option_enabled=$enableval
-+            mt_atomic_option_requested=yes
-+
-+
-+fi
-+
-+
-+    ATOMIC_OPTION_ENABLED=${mt_atomic_option_enabled}
-+    ATOMIC_OPTION_REQUESTED=${mt_atomic_option_requested}
-+
-+
-+
-+
+   enableval=$enable_atomic;
+             mt_atomic_option_enabled=$enableval
+             mt_atomic_option_requested=yes
+@@ -3188,49 +4166,38 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_atomic_option_enabled}" = xyes; then
+-  :
 +    if test "x${mt_atomic_option_enabled}" = xyes; then :
 +
-+else
-+
-+              ATOMIC_X86=0
-+              ATOMIC_X86_SMP=0
+ else
+ 
+               ATOMIC_X86=0
+               ATOMIC_X86_SMP=0
+-              { $as_echo "$as_me:$LINENO: WARNING: You disabled the use of atomic arithmetics! You have been warned!" >&5
 +              { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You disabled the use of atomic arithmetics! You have been warned!" >&5
-+$as_echo "$as_me: WARNING: You disabled the use of atomic arithmetics! You have been warned!" >&2;}
-+
+ $as_echo "$as_me: WARNING: You disabled the use of atomic arithmetics! You have been warned!" >&2;}
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ATOMIC_TORTURE 1
+-_ACEOF
 +$as_echo "#define ATOMIC_TORTURE 1" >>confdefs.h
-+
-+
-+fi
-+
-+if ((test $ATOMIC_X86_SMP -eq 1) && (test $ATOMIC_X86 -eq 1)); then
-+    as_fn_error "Cannot use atomic-x86-smp and atomic-x86 options at the same time!" "$LINENO" 5
-+fi
-+
-+if (((test $ATOMIC_X86_SMP -eq 1) || (test $ATOMIC_X86 -eq 1)) &&
-+     (test "$X86" -eq 0)); then
-+    as_fn_error "Cannot use x86 specific code on a non a $host_cpu system!" "$LINENO" 5
-+fi
-+
-+if test $ATOMIC_X86_SMP -eq 1; then
-+
+ 
+ 
+ fi
+ 
+-
+ if ((test $ATOMIC_X86_SMP -eq 1) && (test $ATOMIC_X86 -eq 1)); then
+-    { { $as_echo "$as_me:$LINENO: error: Cannot use atomic-x86-smp and atomic-x86 options at the same time!" >&5
+-$as_echo "$as_me: error: Cannot use atomic-x86-smp and atomic-x86 options at the same time!" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "Cannot use atomic-x86-smp and atomic-x86 options at the same time!" "$LINENO" 5
+ fi
+ 
+ if (((test $ATOMIC_X86_SMP -eq 1) || (test $ATOMIC_X86 -eq 1)) &&
+      (test "$X86" -eq 0)); then
+-    { { $as_echo "$as_me:$LINENO: error: Cannot use x86 specific code on a non a $host_cpu system!" >&5
+-$as_echo "$as_me: error: Cannot use x86 specific code on a non a $host_cpu system!" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "Cannot use x86 specific code on a non a $host_cpu system!" "$LINENO" 5
+ fi
+ 
+ if test $ATOMIC_X86_SMP -eq 1; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ATOMIC_X86_SMP 1
+-_ACEOF
 +$as_echo "#define ATOMIC_X86_SMP 1" >>confdefs.h
-+
-+elif test $ATOMIC_X86 -eq 1; then
-+
+ 
+ elif test $ATOMIC_X86 -eq 1; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ATOMIC_X86 1
+-_ACEOF
 +$as_echo "#define ATOMIC_X86 1" >>confdefs.h
-+
+ 
+-    { $as_echo "$as_me:$LINENO: WARNING: You specified to use atomic arithmetics code for x86 single processor systems! The resulting binary must not be used on SMP machines!" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You specified to use atomic arithmetics code for x86 single processor systems! The resulting binary must not be used on SMP machines!" >&5
-+$as_echo "$as_me: WARNING: You specified to use atomic arithmetics code for x86 single processor systems! The resulting binary must not be used on SMP machines!" >&2;}
-+fi
-+
-+
-+SIGHUP=0
-+if test $X86 -eq 1; then
-+    SIGHUP=1
-+fi
-+
-+# Check whether --enable-sighup was given.
+ $as_echo "$as_me: WARNING: You specified to use atomic arithmetics code for x86 single processor systems! The resulting binary must not be used on SMP machines!" >&2;}
+ fi
+ 
+@@ -3241,7 +4208,7 @@ if test $X86 -eq 1; then
+ fi
+ 
+ # Check whether --enable-sighup was given.
+-if test "${enable_sighup+set}" = set; then
 +if test "${enable_sighup+set}" = set; then :
-+  enableval=$enable_sighup;
-+                if test "x$enableval" = xno; then
-+                    SIGHUP=0
-+                else
-+                    SIGHUP=1
-+                fi
-+
-+
-+fi
-+
-+
-+if test $SIGHUP -eq 1; then
-+
+   enableval=$enable_sighup;
+                 if test "x$enableval" = xno; then
+                     SIGHUP=0
+@@ -3255,9 +4222,7 @@ fi
+ 
+ if test $SIGHUP -eq 1; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_SIGHUP 1
+-_ACEOF
 +$as_echo "#define ENABLE_SIGHUP 1" >>confdefs.h
-+
-+fi
-+
-+
-+
-+    mt_mrreg_service_option_enabled=
-+    mt_mrreg_service_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_mrreg_service_option_enabled=yes
-+    else
-+        mt_mrreg_service_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-mrreg-service was given.
+ 
+ fi
+ 
+@@ -3272,7 +4237,7 @@ fi
+     fi
+ 
+     # Check whether --enable-mrreg-service was given.
+-if test "${enable_mrreg_service+set}" = set; then
 +if test "${enable_mrreg_service+set}" = set; then :
-+  enableval=$enable_mrreg_service;
-+            mt_mrreg_service_option_enabled=$enableval
-+            mt_mrreg_service_option_requested=yes
-+
-+
-+fi
-+
-+
-+    MRREG_SERVICE_OPTION_ENABLED=${mt_mrreg_service_option_enabled}
-+    MRREG_SERVICE_OPTION_REQUESTED=${mt_mrreg_service_option_requested}
-+
-+
-+
-+
+   enableval=$enable_mrreg_service;
+             mt_mrreg_service_option_enabled=$enableval
+             mt_mrreg_service_option_requested=yes
+@@ -3287,19 +4252,16 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_mrreg_service_option_enabled}" = xyes; then
 +    if test "x${mt_mrreg_service_option_enabled}" = xyes; then :
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ENABLE_MRREG 1
+-_ACEOF
 +$as_echo "#define ENABLE_MRREG 1" >>confdefs.h
-+
-+
-+fi
-+
-+
-+
-+    mt_external_transcoding_option_enabled=
-+    mt_external_transcoding_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_external_transcoding_option_enabled=yes
-+    else
-+        mt_external_transcoding_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-external-transcoding was given.
+ 
+ 
+ fi
+ 
+ 
+ 
+-
+     mt_external_transcoding_option_enabled=
+     mt_external_transcoding_option_requested=no
+     if test "xdisable" = xdisable; then
+@@ -3309,7 +4271,7 @@ fi
+     fi
+ 
+     # Check whether --enable-external-transcoding was given.
+-if test "${enable_external_transcoding+set}" = set; then
 +if test "${enable_external_transcoding+set}" = set; then :
-+  enableval=$enable_external_transcoding;
-+            mt_external_transcoding_option_enabled=$enableval
-+            mt_external_transcoding_option_requested=yes
-+
-+
-+fi
-+
-+
-+    EXTERNAL_TRANSCODING_OPTION_ENABLED=${mt_external_transcoding_option_enabled}
-+    EXTERNAL_TRANSCODING_OPTION_REQUESTED=${mt_external_transcoding_option_requested}
-+
-+
-+
-+
+   enableval=$enable_external_transcoding;
+             mt_external_transcoding_option_enabled=$enableval
+             mt_external_transcoding_option_requested=yes
+@@ -3324,15 +4286,14 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_external_transcoding_option_enabled}" = xyes; then
+-  :
 +    if test "x${mt_external_transcoding_option_enabled}" = xyes; then :
 +
-+else
-+  EXTERNAL_TRANSCODING_OPTION_ENABLED=disabled
-+fi
-+
-+
-+
-+    mt_sopcast_option_enabled=
-+    mt_sopcast_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_sopcast_option_enabled=yes
-+    else
-+        mt_sopcast_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-sopcast was given.
-+if test "${enable_sopcast+set}" = set; then :
-+  enableval=$enable_sopcast;
-+            mt_sopcast_option_enabled=$enableval
-+            mt_sopcast_option_requested=yes
-+
-+
-+fi
-+
-+
-+    SOPCAST_OPTION_ENABLED=${mt_sopcast_option_enabled}
-+    SOPCAST_OPTION_REQUESTED=${mt_sopcast_option_requested}
-+
-+
-+
-+
-+    if test "x${mt_sopcast_option_enabled}" = xyes; then :
-+
-+
-+$as_echo "#define SOPCAST 1" >>confdefs.h
-+
-+
-+else
-+  SOPCAST_OPTION_ENABLED=disabled
-+fi
-+
-+
-+
-+
-+    mt_youtube_option_enabled=
-+    mt_youtube_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_youtube_option_enabled=yes
-+    else
-+        mt_youtube_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-youtube was given.
+ else
+   EXTERNAL_TRANSCODING_OPTION_ENABLED=disabled
+ fi
+ 
+ 
+ 
+-
+     mt_youtube_option_enabled=
+     mt_youtube_option_requested=no
+     if test "xdisable" = xdisable; then
+@@ -3342,7 +4303,7 @@ fi
+     fi
+ 
+     # Check whether --enable-youtube was given.
+-if test "${enable_youtube+set}" = set; then
 +if test "${enable_youtube+set}" = set; then :
-+  enableval=$enable_youtube;
-+            mt_youtube_option_enabled=$enableval
-+            mt_youtube_option_requested=yes
-+
-+
-+fi
-+
-+
-+    YOUTUBE_OPTION_ENABLED=${mt_youtube_option_enabled}
-+    YOUTUBE_OPTION_REQUESTED=${mt_youtube_option_requested}
-+
-+
-+
-+
+   enableval=$enable_youtube;
+             mt_youtube_option_enabled=$enableval
+             mt_youtube_option_requested=yes
+@@ -3357,13 +4318,12 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_youtube_option_enabled}" = xyes; then
+-  :
 +    if test "x${mt_youtube_option_enabled}" = xyes; then :
 +
-+else
-+  YOUTUBE_OPTION_ENABLED=disabled
-+fi
-+
-+
-+
-+    mt_weborama_option_enabled=
-+    mt_weborama_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_weborama_option_enabled=yes
-+    else
-+        mt_weborama_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-weborama was given.
-+if test "${enable_weborama+set}" = set; then :
-+  enableval=$enable_weborama;
-+            mt_weborama_option_enabled=$enableval
-+            mt_weborama_option_requested=yes
-+
-+
-+fi
-+
-+
-+    WEBORAMA_OPTION_ENABLED=${mt_weborama_option_enabled}
-+    WEBORAMA_OPTION_REQUESTED=${mt_weborama_option_requested}
-+
-+
-+
-+
-+    if test "x${mt_weborama_option_enabled}" = xyes; then :
-+
-+else
-+  WEBORAMA_OPTION_ENABLED=disabled
-+fi
-+
-+
-+
-+    mt_atrailers_option_enabled=
-+    mt_atrailers_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_atrailers_option_enabled=yes
-+    else
-+        mt_atrailers_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-atrailers was given.
-+if test "${enable_atrailers+set}" = set; then :
-+  enableval=$enable_atrailers;
-+            mt_atrailers_option_enabled=$enableval
-+            mt_atrailers_option_requested=yes
-+
-+
-+fi
-+
-+
-+    ATRAILERS_OPTION_ENABLED=${mt_atrailers_option_enabled}
-+    ATRAILERS_OPTION_REQUESTED=${mt_atrailers_option_requested}
-+
-+
-+
-+
-+    if test "x${mt_atrailers_option_enabled}" = xyes; then :
-+
-+else
-+  ATRAILERS_OPTION_ENABLED=disabled
-+fi
-+
-+
-+
-+    mt_sqlite_backup_defaults_option_enabled=
-+    mt_sqlite_backup_defaults_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_sqlite_backup_defaults_option_enabled=yes
-+    else
-+        mt_sqlite_backup_defaults_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-sqlite-backup-defaults was given.
+ else
+   YOUTUBE_OPTION_ENABLED=disabled
+ fi
+ 
+-
+ #MT_OPTION([weborama], [disable],
+ #          [Weborama service support],
+ #          [],[WEBORAMA_OPTION_ENABLED=disabled])
+@@ -3379,7 +4339,7 @@ fi
+     fi
+ 
+     # Check whether --enable-sqlite-backup-defaults was given.
+-if test "${enable_sqlite_backup_defaults+set}" = set; then
 +if test "${enable_sqlite_backup_defaults+set}" = set; then :
-+  enableval=$enable_sqlite_backup_defaults;
-+            mt_sqlite_backup_defaults_option_enabled=$enableval
-+            mt_sqlite_backup_defaults_option_requested=yes
-+
-+
-+fi
-+
-+
-+    SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED=${mt_sqlite_backup_defaults_option_enabled}
-+    SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED=${mt_sqlite_backup_defaults_option_requested}
-+
-+
-+
-+
+   enableval=$enable_sqlite_backup_defaults;
+             mt_sqlite_backup_defaults_option_enabled=$enableval
+             mt_sqlite_backup_defaults_option_requested=yes
+@@ -3394,7 +4354,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_sqlite_backup_defaults_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+
-+
-+    mt_protocolinfo_extension_option_enabled=
-+    mt_protocolinfo_extension_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_protocolinfo_extension_option_enabled=yes
-+    else
-+        mt_protocolinfo_extension_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-protocolinfo-extension was given.
+ 
+ 
+ 
+@@ -3407,7 +4369,7 @@ fi
+     fi
+ 
+     # Check whether --enable-protocolinfo-extension was given.
+-if test "${enable_protocolinfo_extension+set}" = set; then
 +if test "${enable_protocolinfo_extension+set}" = set; then :
-+  enableval=$enable_protocolinfo_extension;
-+            mt_protocolinfo_extension_option_enabled=$enableval
-+            mt_protocolinfo_extension_option_requested=yes
-+
-+
-+fi
-+
-+
-+    PROTOCOLINFO_EXTENSION_OPTION_ENABLED=${mt_protocolinfo_extension_option_enabled}
-+    PROTOCOLINFO_EXTENSION_OPTION_REQUESTED=${mt_protocolinfo_extension_option_requested}
-+
-+
-+
-+
+   enableval=$enable_protocolinfo_extension;
+             mt_protocolinfo_extension_option_enabled=$enableval
+             mt_protocolinfo_extension_option_requested=yes
+@@ -3422,21 +4384,18 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_protocolinfo_extension_option_enabled}" = xyes; then
 +    if test "x${mt_protocolinfo_extension_option_enabled}" = xyes; then :
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define EXTEND_PROTOCOLINFO 1
+-_ACEOF
 +$as_echo "#define EXTEND_PROTOCOLINFO 1" >>confdefs.h
-+
-+
-+fi
-+
-+USE_CURL=1
-+CURL_REQUESTED=0
-+# Check whether --enable-curl was given.
+ 
+ 
+ fi
+ 
+-
+ USE_CURL=1
+ CURL_REQUESTED=0
+ # Check whether --enable-curl was given.
+-if test "${enable_curl+set}" = set; then
 +if test "${enable_curl+set}" = set; then :
-+  enableval=$enable_curl;
-+                if test "x$enableval" = xno; then
-+                    USE_CURL=0
-+                    CURL_REQUESTED=1
-+                else
-+                    CURL_REQUESTED=1
-+                    USE_CURL=1
-+                fi
-+
-+
-+fi
-+
-+
-+
-+# Check whether --with-curl-cfg was given.
+   enableval=$enable_curl;
+                 if test "x$enableval" = xno; then
+                     USE_CURL=0
+@@ -3452,10 +4411,10 @@ fi
+ 
+ 
+ # Check whether --with-curl-cfg was given.
+-if test "${with_curl_cfg+set}" = set; then
 +if test "${with_curl_cfg+set}" = set; then :
-+  withval=$with_curl_cfg;
-+                CURL_SEARCH_CONFIG="$withval"
+   withval=$with_curl_cfg;
+                 CURL_SEARCH_CONFIG="$withval"
+-                { $as_echo "$as_me:$LINENO: Will search for curl-config in $withval" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for curl-config in $withval" >&5
-+$as_echo "$as_me: Will search for curl-config in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+
-+
-+    mt_fseeko_check_option_enabled=
-+    mt_fseeko_check_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_fseeko_check_option_enabled=yes
-+    else
-+        mt_fseeko_check_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-fseeko-check was given.
+ $as_echo "$as_me: Will search for curl-config in $withval" >&6;}
+ 
+ 
+@@ -3473,7 +4432,7 @@ fi
+     fi
+ 
+     # Check whether --enable-fseeko-check was given.
+-if test "${enable_fseeko_check+set}" = set; then
 +if test "${enable_fseeko_check+set}" = set; then :
-+  enableval=$enable_fseeko_check;
-+            mt_fseeko_check_option_enabled=$enableval
-+            mt_fseeko_check_option_requested=yes
-+
-+
-+fi
-+
-+
-+    FSEEKO_CHECK_OPTION_ENABLED=${mt_fseeko_check_option_enabled}
-+    FSEEKO_CHECK_OPTION_REQUESTED=${mt_fseeko_check_option_requested}
-+
-+
-+
-+
+   enableval=$enable_fseeko_check;
+             mt_fseeko_check_option_enabled=$enableval
+             mt_fseeko_check_option_requested=yes
+@@ -3488,7 +4447,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_fseeko_check_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+###############################################################################
-+# The following block is derived from the configure.ac script from the
-+# libupnp-1.3.1 package
-+# (C) Copyright 2005-2006 Remi Turboult <r3mi at users.sourceforge.net>
-+upnpmaj=0
-+upnpmin=4
-+upnppatch=1
-+
-+cat >>confdefs.h <<_ACEOF
-+#define UPNP_VERSION_STRING "$PACKAGE_VERSION"
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define UPNP_VERSION_MAJOR $upnpmaj
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define UPNP_VERSION_MINOR $upnpmin
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define UPNP_VERSION_PATCH $upnppatch
-+_ACEOF
-+
-+###############################################################################
-+
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+if test -z "$CXX"; then
-+  if test -n "$CCC"; then
-+    CXX=$CCC
-+  else
-+    if test -n "$ac_tool_prefix"; then
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+  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
+ 
+ ###############################################################################
+ # The following block is derived from the configure.ac script from the
+@@ -3533,9 +4494,9 @@ if test -z "$CXX"; 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; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_CXX+set}" = set; then
 +if test "${ac_cv_prog_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$CXX"; then
-+  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CXX"; then
+@@ -3546,24 +4507,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_CXX="$ac_tool_prefix$ac_prog"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
+-    $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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CXX=$ac_cv_prog_CXX
-+if test -n "$CXX"; then
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ CXX=$ac_cv_prog_CXX
+ if test -n "$CXX"; then
+-  { $as_echo "$as_me:$LINENO: result: $CXX" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-+$as_echo "$CXX" >&6; }
-+else
+ $as_echo "$CXX" >&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 -n "$CXX" && break
-+  done
-+fi
-+if test -z "$CXX"; then
-+  ac_ct_CXX=$CXX
-+  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-+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 "no" >&6; }
+ fi
+ 
+@@ -3577,9 +4538,9 @@ if test -z "$CXX"; 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; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$ac_ct_CXX"; then
-+  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CXX"; then
+@@ -3590,24 +4551,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_CXX="$ac_prog"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_ac_ct_CXX="$ac_prog"
+-    $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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-+if test -n "$ac_ct_CXX"; then
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
+ if test -n "$ac_ct_CXX"; then
+-  { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-+$as_echo "$ac_ct_CXX" >&6; }
-+else
+ $as_echo "$ac_ct_CXX" >&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 -n "$ac_ct_CXX" && break
-+done
-+
-+  if test "x$ac_ct_CXX" = x; then
-+    CXX="g++"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -3620,7 +4581,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
-+    CXX=$ac_ct_CXX
-+  fi
-+fi
-+
-+  fi
-+fi
-+# Provide some information about the compiler.
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -3631,48 +4592,31 @@ fi
+   fi
+ fi
+ # 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
+ set X $ac_compile
+ ac_compiler=$2
+-{ (ac_try="$ac_compiler --version >&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
+ 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
 +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=$?
+   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"
+-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); }
 +  if test -s conftest.err; then
 +    sed '10a\
 +... rest of stderr output deleted ...
@@ -12071,148 +3539,190 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  $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
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
-+# 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.
+ /* end confdefs.h.  */
+ 
+ int
+@@ -3688,8 +4632,8 @@ ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
+ # 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:
-+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
-+
-+ac_rmfiles=
-+for ac_file in $ac_files
-+do
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+    * ) ac_rmfiles="$ac_rmfiles $ac_file";;
-+  esac
-+done
-+rm -f $ac_rmfiles
-+
+ ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+ 
+ # The possible output files:
+@@ -3705,17 +4649,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
+ 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=$?
+   (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,
-+# so that the user can short-circuit this test for compilers unknown to
-+# Autoconf.
-+for ac_file in $ac_files ''
-+do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
-+	;;
-+    [ab].out )
-+	# We found the default executable, but exeext='' is most
-+	# certainly right.
-+	break;;
-+    *.* )
+   # 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,
+@@ -3732,7 +4676,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
-+	# We set ac_cv_exeext here because the later test for it is not
-+	# safe: cross compilers may not add the suffix if given an `-o'
-+	# argument, so we may need to know it at that point already.
-+	# Even if this section looks crufty: it has the advantage of
-+	# actually working.
-+	break;;
-+    * )
-+	break;;
-+  esac
-+done
-+test "$ac_cv_exeext" = no && ac_cv_exeext=
-+
-+else
-+  ac_file=''
-+fi
+ 	then :; else
+ 	   ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
+ 	fi
+@@ -3751,84 +4695,41 @@ test "$ac_cv_exeext" = no && ac_cv_exeext=
+ 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
-+
+ 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_fn_set_status 77
-+as_fn_error "C++ compiler cannot create executables
-+See \`config.log' for more details." "$LINENO" 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_error 77 "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
+ 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
-+
-+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
-+ac_clean_files=$ac_clean_files_save
+ 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; }
+ $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
+ 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=$?
+   (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
-+# `rm'.
-+for ac_file in conftest.exe conftest conftest.*; do
-+  test -f "$ac_file" || continue
-+  case $ac_file in
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
-+    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-+	  break;;
-+    * ) break;;
-+  esac
-+done
-+else
+   # 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
+@@ -3843,32 +4744,83 @@ for ac_file in conftest.exe conftest conftest.*; do
+   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_fn_error "cannot compute suffix of executables: cannot compile and link
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
+ $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 "$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>
@@ -12261,9 +3771,9 @@ Patch that applies changes after `autoreconf -fi` is done.
 +    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.
++as_fn_error $? "cannot run C++ compiled programs.
 +If you meant to cross compile, use \`--host'.
-+See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
 +    fi
 +  fi
 +fi
@@ -12273,683 +3783,650 @@ Patch that applies changes after `autoreconf -fi` is done.
 +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; }
+ $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
+   $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
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.o conftest.obj
+ /* end confdefs.h.  */
+ 
+ int
+@@ -3880,17 +4832,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
+ 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=$?
+   (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
-+    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
-+    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-+       break;;
-+  esac
-+done
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
+   for ac_file in conftest.o conftest.obj conftest.*; do
+   test -f "$ac_file" || continue;
+   case $ac_file in
+@@ -3903,31 +4855,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_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: 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 "$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; }
+ $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
+-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -3941,37 +4885,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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_compiler_gnu=yes
-+else
+   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_cxx_compiler_gnu=$ac_compiler_gnu
-+
-+fi
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-+if test $ac_compiler_gnu = yes; then
-+  GXX=yes
-+else
-+  GXX=
-+fi
-+ac_test_CXXFLAGS=${CXXFLAGS+set}
-+ac_save_CXXFLAGS=$CXXFLAGS
+ $as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+   GXX=yes
+@@ -3980,20 +4903,16 @@ else
+ fi
+ ac_test_CXXFLAGS=${CXXFLAGS+set}
+ ac_save_CXXFLAGS=$CXXFLAGS
+-{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
+ $as_echo_n "checking whether $CXX accepts -g... " >&6; }
+-if test "${ac_cv_prog_cxx_g+set}" = set; then
 +if test "${ac_cv_prog_cxx_g+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-+   ac_cxx_werror_flag=yes
-+   ac_cv_prog_cxx_g=no
-+   CXXFLAGS="-g"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+    ac_cxx_werror_flag=yes
+    ac_cv_prog_cxx_g=no
+    CXXFLAGS="-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
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4004,35 +4923,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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_g=yes
-+else
+   ac_cv_prog_cxx_g=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	CXXFLAGS=""
+-      cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +  CXXFLAGS=""
 +      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4043,36 +4938,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_cxx_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_cxx_try_compile "$LINENO"; then :
-+
+ 
+-	ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 +else
 +  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-+	 CXXFLAGS="-g"
+ 	 CXXFLAGS="-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
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4083,42 +4954,17 @@ 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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+  ac_cv_prog_cxx_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_cxx_werror_flag=$ac_save_cxx_werror_flag
-+fi
+   ac_cv_prog_cxx_g=yes
+-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
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-+$as_echo "$ac_cv_prog_cxx_g" >&6; }
-+if test "$ac_test_CXXFLAGS" = set; then
-+  CXXFLAGS=$ac_save_CXXFLAGS
-+elif test $ac_cv_prog_cxx_g = yes; then
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-g -O2"
-+  else
-+    CXXFLAGS="-g"
-+  fi
-+else
-+  if test "$GXX" = yes; then
-+    CXXFLAGS="-O2"
-+  else
-+    CXXFLAGS=
-+  fi
-+fi
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+DEPDIR="${am__leading_dot}deps"
-+
-+ac_config_commands="$ac_config_commands depfiles"
-+
-+
-+am_make=${MAKE-make}
-+cat > confinc << 'END'
-+am__doit:
-+	@echo this is the am__doit target
-+.PHONY: am__doit
-+END
-+# If we don't find an include directive, just comment out the code.
+ $as_echo "$ac_cv_prog_cxx_g" >&6; }
+ if test "$ac_test_CXXFLAGS" = set; then
+   CXXFLAGS=$ac_save_CXXFLAGS
+@@ -4152,7 +4998,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=
-+_am_result=none
-+# First try GNU make style include.
-+echo "include confinc" > confmf
-+# Ignore all kinds of additional output from `make'.
-+case `$am_make -s -f confmf 2> /dev/null` in #(
-+*the\ am__doit\ target*)
-+  am__include=include
-+  am__quote=
-+  _am_result=GNU
-+  ;;
-+esac
-+# Now try BSD make style include.
-+if test "$am__include" = "#"; then
-+   echo '.include "confinc"' > confmf
-+   case `$am_make -s -f confmf 2> /dev/null` in #(
-+   *the\ am__doit\ target*)
-+     am__include=.include
-+     am__quote="\""
-+     _am_result=BSD
-+     ;;
-+   esac
-+fi
-+
-+
+ $as_echo_n "checking for style of include used by $am_make... " >&6; }
+ am__include="#"
+ am__quote=
+@@ -4180,12 +5026,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.
+ $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
-+
-+if test "x$enable_dependency_tracking" != xno; then
-+  am_depcomp="$ac_aux_dir/depcomp"
-+  AMDEPBACKSLASH='\'
-+fi
-+ if test "x$enable_dependency_tracking" != xno; then
-+  AMDEP_TRUE=
-+  AMDEP_FALSE='#'
-+else
-+  AMDEP_TRUE='#'
-+  AMDEP_FALSE=
-+fi
-+
-+
-+
-+depcc="$CXX"  am_compiler_list=
-+
+   enableval=$enable_dependency_tracking;
+ fi
+ 
+@@ -4205,9 +5051,9 @@ fi
+ 
+ depcc="$CXX"  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; }
+ $as_echo_n "checking dependency style of $depcc... " >&6; }
+-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
 +if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CXX_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  am__universal=false
-+  case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac
-+
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CXX_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CXX_dependencies_compiler_type=none
-+fi
-+
-+fi
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -4315,7 +5161,7 @@ else
+ fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-+$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-+CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-+
-+ if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCXX_TRUE=
-+  am__fastdepCXX_FALSE='#'
-+else
-+  am__fastdepCXX_TRUE='#'
-+  am__fastdepCXX_FALSE=
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+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 "$am_cv_CXX_dependencies_compiler_type" >&6; }
+ CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
+ 
+@@ -4338,9 +5184,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; }
+ $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
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4351,24 +5197,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"
+   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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
+ 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 "$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
-+
-+
-+fi
-+if test -z "$ac_cv_prog_CC"; then
-+  ac_ct_CC=$CC
-+  # Extract the first word of "gcc", so it can be a program name with args.
-+set dummy gcc; ac_word=$2
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -4378,9 +5224,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; }
+ $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
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -4391,24 +5237,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"
+   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
+     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
+ 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 "$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
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -4417,7 +5263,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
-+    CC=$ac_ct_CC
-+  fi
-+else
-+  CC="$ac_cv_prog_CC"
-+fi
-+
-+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: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -4431,9 +5277,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; }
+ $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
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4444,24 +5290,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"
+   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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
+ 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 "$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
-+
-+
-+  fi
-+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 "no" >&6; }
+ fi
+ 
+@@ -4471,9 +5317,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; }
+ $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
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+  ac_prog_rejected=no
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4485,18 +5331,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"
+   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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+if test $ac_prog_rejected = yes; then
-+  # We found a bogon in the path, so make sure we never use it.
-+  set dummy $ac_cv_prog_CC
-+  shift
-+  if test $# != 0; then
-+    # We chose a different compiler from the bogus one.
-+    # However, it has the same basename, so the bogon will be chosen
-+    # first if we set CC to just the basename; use the full file name.
-+    shift
-+    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-+  fi
-+fi
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
+ IFS=$as_save_IFS
+ 
+ if test $ac_prog_rejected = yes; then
+@@ -4515,10 +5361,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 "$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
-+
-+
-+fi
-+if test -z "$CC"; then
-+  if test -n "$ac_tool_prefix"; then
-+  for ac_prog in cl.exe
-+  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 "no" >&6; }
+ fi
+ 
+@@ -4530,9 +5376,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; }
+ $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
-+  ac_cv_prog_CC="$CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$CC"; then
+@@ -4543,24 +5389,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"
+   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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+CC=$ac_cv_prog_CC
-+if test -n "$CC"; then
+ 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 "$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
-+
-+
-+    test -n "$CC" && break
-+  done
-+fi
-+if test -z "$CC"; then
-+  ac_ct_CC=$CC
-+  for ac_prog in cl.exe
-+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 "no" >&6; }
+ fi
+ 
+@@ -4574,9 +5420,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; }
+ $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
-+  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_CC"; then
+@@ -4587,24 +5433,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"
+   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
+     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
+ 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 "$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
-+
-+
-+  test -n "$ac_ct_CC" && break
-+done
-+
-+  if test "x$ac_ct_CC" = x; then
-+    CC=""
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -4617,7 +5463,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
-+    CC=$ac_ct_CC
-+  fi
-+fi
-+
-+fi
-+
-+
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -4628,62 +5474,42 @@ 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_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: 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
+ 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"
 +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
+ 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=$?
+   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); }
 +  if test -s conftest.err; then
 +    sed '10a\
 +... rest of stderr output deleted ...
@@ -12960,3011 +4437,8605 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; }
 +done
-+
+ 
+-{ $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; }
+ $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
+   $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
-+main ()
-+{
-+#ifndef __GNUC__
-+       choke me
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4697,37 +5523,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
+   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
+ 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
-+else
-+  GCC=
-+fi
-+ac_test_CFLAGS=${CFLAGS+set}
-+ac_save_CFLAGS=$CFLAGS
+ $as_echo "$ac_cv_c_compiler_gnu" >&6; }
+ if test $ac_compiler_gnu = yes; then
+   GCC=yes
+@@ -4736,20 +5541,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; }
+ $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"
+   $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
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4760,35 +5561,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
+   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
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4799,36 +5576,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"
+ 	 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
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -4839,42 +5592,17 @@ 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
-+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
+   ac_cv_prog_cc_g=yes
+-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
+-
+ 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
-+elif test $ac_cv_prog_cc_g = yes; then
-+  if test "$GCC" = yes; then
-+    CFLAGS="-g -O2"
-+  else
-+    CFLAGS="-g"
-+  fi
-+else
-+  if test "$GCC" = yes; then
-+    CFLAGS="-O2"
-+  else
-+    CFLAGS=
-+  fi
-+fi
+ $as_echo "$ac_cv_prog_cc_g" >&6; }
+ if test "$ac_test_CFLAGS" = set; then
+   CFLAGS=$ac_save_CFLAGS
+@@ -4891,18 +5619,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; }
+ $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
+   $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>
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-+struct buf { int x; };
-+FILE * (*rcsopen) (struct buf *, struct stat *, int);
-+static char *e (p, i)
-+     char **p;
-+     int i;
-+{
-+  return p[i];
-+}
-+static char *f (char * (*g) (char **, int), char **p, ...)
-+{
-+  char *s;
-+  va_list v;
-+  va_start (v,p);
-+  s = g (p, va_arg (v,int));
-+  va_end (v);
-+  return s;
-+}
-+
-+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-+   function prototypes and stuff, but not '\xHH' hex character constants.
-+   These don't provoke an error unfortunately, instead are silently treated
-+   as 'x'.  The following induces an error, until -std is added to get
-+   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-+   array size at least.  It's necessary to write '\x00'==0 to get something
-+   that's true only with -std.  */
-+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-+
-+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
-+   inside strings and character constants.  */
-+#define FOO(x) 'x'
-+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-+
-+int test (int i, double x);
-+struct s1 {int (*f) (int a);};
-+struct s2 {int (*f) (double a);};
-+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-+int argc;
-+char **argv;
-+int
-+main ()
-+{
-+return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-+	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-+do
-+  CC="$ac_save_CC $ac_arg"
+ /* end confdefs.h.  */
+ #include <stdarg.h>
+ #include <stdio.h>
+@@ -4959,32 +5683,9 @@ for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ 	-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
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+  test "x$ac_cv_prog_cc_c89" != "xno" && break
-+done
-+rm -f conftest.$ac_ext
-+CC=$ac_save_CC
-+
-+fi
-+# AC_CACHE_VAL
-+case "x$ac_cv_prog_cc_c89" in
-+  x)
+   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
+@@ -4995,17 +5696,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 "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 "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
+ $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'
-+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
-+
-+depcc="$CC"   am_compiler_list=
-+
+ 
+ ac_ext=c
+ ac_cpp='$CPP $CPPFLAGS'
+@@ -5015,9 +5718,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 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; }
+ $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
-+  # We make a subdir and do the tests there.  Otherwise we can end up
-+  # making bogus files that we don't know about and never remove.  For
-+  # instance it was reported that on HP-UX the gcc test will end up
-+  # making a dummy file named `D' -- because `-MD' means `put the output
-+  # in D'.
-+  mkdir conftest.dir
-+  # Copy depcomp to subdir because otherwise we won't find it if we're
-+  # using a relative directory.
-+  cp "$am_depcomp" conftest.dir
-+  cd conftest.dir
-+  # We will build objects and dependencies in a subdirectory because
-+  # it helps to detect inapplicable dependency modes.  For instance
-+  # both Tru64's cc and ICC support -MD to output dependencies as a
-+  # side effect of compilation, but ICC will put the dependencies in
-+  # the current directory while Tru64 will put them in the object
-+  # directory.
-+  mkdir sub
-+
-+  am_cv_CC_dependencies_compiler_type=none
-+  if test "$am_compiler_list" = ""; then
-+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-+  fi
-+  am__universal=false
-+  case " $depcc " in #(
-+     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-+     esac
-+
-+  for depmode in $am_compiler_list; do
-+    # Setup a source with many dependencies, because some compilers
-+    # like to wrap large dependency lists on column 80 (with \), and
-+    # we should not choose a depcomp mode which is confused by this.
-+    #
-+    # We need to recreate these files for each test, as the compiler may
-+    # overwrite some of them when testing with obscure command lines.
-+    # This happens at least with the AIX C compiler.
-+    : > sub/conftest.c
-+    for i in 1 2 3 4 5 6; do
-+      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-+      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-+      # Solaris 8's {/usr,}/bin/sh.
-+      touch sub/conftst$i.h
-+    done
-+    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-+
-+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-+    # mode.  It turns out that the SunPro C++ compiler does not properly
-+    # handle `-M -o', and we need to detect this.  Also, some Intel
-+    # versions had trouble with output in subdirs
-+    am__obj=sub/conftest.${OBJEXT-o}
-+    am__minus_obj="-o $am__obj"
-+    case $depmode in
-+    gcc)
-+      # This depmode causes a compiler race in universal mode.
-+      test "$am__universal" = false || continue
-+      ;;
-+    nosideeffect)
-+      # after this tag, mechanisms are not by side-effect, so they'll
-+      # only be used when explicitly requested
-+      if test "x$enable_dependency_tracking" = xyes; then
-+	continue
-+      else
-+	break
-+      fi
-+      ;;
-+    msvisualcpp | msvcmsys)
-+      # This compiler won't grok `-c -o', but also, the minuso test has
-+      # not run yet.  These depmodes are late enough in the game, and
-+      # so weak that their functioning should not be impacted.
-+      am__obj=conftest.${OBJEXT-o}
-+      am__minus_obj=
-+      ;;
-+    none) break ;;
-+    esac
-+    if depmode=$depmode \
-+       source=sub/conftest.c object=$am__obj \
-+       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-+       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-+         >/dev/null 2>conftest.err &&
-+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-+       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-+       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-+      # icc doesn't choke on unknown options, it will just issue warnings
-+      # or remarks (even with -Werror).  So we grep stderr for any message
-+      # that says an option was ignored or not supported.
-+      # When given -MP, icc 7.0 and 7.1 complain thusly:
-+      #   icc: Command line warning: ignoring option '-M'; no argument required
-+      # The diagnosis changed in icc 8.0:
-+      #   icc: Command line remark: option '-MP' not supported
-+      if (grep 'ignoring option' conftest.err ||
-+          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-+        am_cv_CC_dependencies_compiler_type=$depmode
-+        break
-+      fi
-+    fi
-+  done
-+
-+  cd ..
-+  rm -rf conftest.dir
-+else
-+  am_cv_CC_dependencies_compiler_type=none
-+fi
-+
-+fi
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+@@ -5125,7 +5828,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
-+
-+ if
-+  test "x$enable_dependency_tracking" != xno \
-+  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-+  am__fastdepCC_TRUE=
-+  am__fastdepCC_FALSE='#'
-+else
-+  am__fastdepCC_TRUE='#'
-+  am__fastdepCC_FALSE=
-+fi
-+
-+
-+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 "$am_cv_CC_dependencies_compiler_type" >&6; }
+ CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+ 
+@@ -5143,9 +5846,9 @@ fi
+ 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; }
+ $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
-+  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$RANLIB"; then
+@@ -5156,24 +5859,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"
+   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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+RANLIB=$ac_cv_prog_RANLIB
-+if test -n "$RANLIB"; then
+ 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 "$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
-+
-+
-+fi
-+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 "no" >&6; }
+ fi
+ 
+@@ -5183,9 +5886,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; }
+ $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
-+  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$ac_ct_RANLIB"; then
+@@ -5196,24 +5899,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"
+   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
+     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
+ 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 "$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
-+
-+  if test "x$ac_ct_RANLIB" = x; then
-+    RANLIB=":"
-+  else
-+    case $cross_compiling:$ac_tool_warned in
-+yes:)
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -5222,7 +5925,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
-+    RANLIB=$ac_ct_RANLIB
-+  fi
-+else
-+  RANLIB="$ac_cv_prog_RANLIB"
-+fi
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ ac_tool_warned=yes ;;
+ esac
+@@ -5238,14 +5941,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
+ $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
-+    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_c_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CPP needs to be expanded
+@@ -5260,11 +5963,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>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -5273,78 +5972,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.
+   # Broken: fails on valid input.
+ continue
+ fi
+-
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i 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
+ /* 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
-+  # 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
+   # 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
++rm -f conftest.err conftest.i 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
++rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
-+  break
-+fi
-+
-+    done
-+    ac_cv_prog_CPP=$CPP
-+
-+fi
-+  CPP=$ac_cv_prog_CPP
-+else
-+  ac_cv_prog_CPP=$CPP
-+fi
+   break
+ fi
+ 
+@@ -5356,7 +6011,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
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
+ $as_echo "$CPP" >&6; }
+ ac_preproc_ok=false
+ for ac_c_preproc_warn_flag in '' yes
+@@ -5367,11 +6022,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>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -5380,87 +6031,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.
+   # Broken: fails on valid input.
+ continue
+ fi
+-
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i 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
+ /* 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
-+  # 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
+   # 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
++rm -f conftest.err conftest.i 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
+-  :
++rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
 +
-+else
+ 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_fn_error "C preprocessor \"$CPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
+ $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
+@@ -5470,9 +6074,9 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-{ $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; }
+ $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
-+  ac_path_GREP_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -z "$GREP"; then
+@@ -5483,7 +6087,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ 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
-+# Check for GNU ac_path_GREP and select it if it is found.
-+  # Check for GNU $ac_path_GREP
-+case `"$ac_path_GREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $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
+     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
+@@ -5503,7 +6107,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"
-+      ac_path_GREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
+     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"
+@@ -5518,26 +6122,24 @@ esac
+       $ac_path_GREP_found && break 3
+     done
+   done
+-done
 +  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_GREP_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_GREP"; then
-+    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
+ 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 "$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; }
+ $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
-+   then ac_cv_path_EGREP="$GREP -E"
-+   else
-+     if test -z "$EGREP"; then
-+  ac_path_EGREP_found=false
-+  # Loop through the user's path and test for each of PROGNAME-LIST
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
+@@ -5551,7 +6153,7 @@ for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
+ 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
-+# Check for GNU ac_path_EGREP and select it if it is found.
-+  # Check for GNU $ac_path_EGREP
-+case `"$ac_path_EGREP" --version 2>&1` in
-+*GNU*)
-+  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
-+*)
-+  ac_count=0
-+  $as_echo_n 0123456789 >"conftest.in"
-+  while :
-+  do
-+    cat "conftest.in" "conftest.in" >"conftest.tmp"
-+    mv "conftest.tmp" "conftest.in"
-+    cp "conftest.in" "conftest.nl"
-+    $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
+     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
+@@ -5571,7 +6173,7 @@ case `"$ac_path_EGREP" --version 2>&1` in
+     $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"
-+      ac_path_EGREP_max=$ac_count
-+    fi
-+    # 10*(2^10) chars as input seems more than enough
-+    test $ac_count -gt 10 && break
+     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"
+@@ -5586,12 +6188,10 @@ esac
+       $ac_path_EGREP_found && break 3
+     done
+   done
+-done
 +  done
-+  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
-+esac
-+
-+      $ac_path_EGREP_found && break 3
-+    done
-+  done
-+  done
-+IFS=$as_save_IFS
-+  if test -z "$ac_cv_path_EGREP"; then
-+    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
-+fi
-+
-+   fi
-+fi
+ 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
+@@ -5599,29 +6199,25 @@ 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"
-+
-+
-+if test $ac_cv_c_compiler_gnu = yes; then
+ $as_echo "$ac_cv_path_EGREP" >&6; }
+  EGREP="$ac_cv_path_EGREP"
+ 
+ 
+ if test $ac_cv_c_compiler_gnu = yes; then
+-    { $as_echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
-+$as_echo_n "checking whether $CC needs -traditional... " >&6; }
+ $as_echo_n "checking whether $CC needs -traditional... " >&6; }
+-if test "${ac_cv_prog_gcc_traditional+set}" = set; then
 +if test "${ac_cv_prog_gcc_traditional+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+    ac_pattern="Autoconf.*'x'"
+   $as_echo_n "(cached) " >&6
+ else
+     ac_pattern="Autoconf.*'x'"
+-  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 <sgtty.h>
-+Autoconf TIOCGETP
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ /* end confdefs.h.  */
+ #include <sgtty.h>
+ Autoconf TIOCGETP
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
 +  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
-+  ac_cv_prog_gcc_traditional=yes
-+else
-+  ac_cv_prog_gcc_traditional=no
-+fi
-+rm -f conftest*
-+
-+
-+  if test $ac_cv_prog_gcc_traditional = no; then
+   ac_cv_prog_gcc_traditional=yes
+ else
+   ac_cv_prog_gcc_traditional=no
+@@ -5630,48 +6226,35 @@ rm -f conftest*
+ 
+ 
+   if test $ac_cv_prog_gcc_traditional = no; then
+-    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 <termio.h>
-+Autoconf TCGETA
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ /* end confdefs.h.  */
+ #include <termio.h>
+ Autoconf TCGETA
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "$ac_pattern" >/dev/null 2>&1; then
 +  $EGREP "$ac_pattern" >/dev/null 2>&1; then :
-+  ac_cv_prog_gcc_traditional=yes
-+fi
-+rm -f conftest*
-+
-+  fi
-+fi
+   ac_cv_prog_gcc_traditional=yes
+ fi
+ rm -f conftest*
+ 
+   fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
-+$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
-+  if test $ac_cv_prog_gcc_traditional = yes; then
-+    CC="$CC -traditional"
-+  fi
-+fi
-+
-+ac_header_dirent=no
-+for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-+  as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+ $as_echo "$ac_cv_prog_gcc_traditional" >&6; }
+   if test $ac_cv_prog_gcc_traditional = yes; then
+     CC="$CC -traditional"
+   fi
+ fi
+ 
+-
+-
+-
+-
+-
+ ac_header_dirent=no
+ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
+   as_ac_Header=`$as_echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_hdr that defines DIR" >&5
-+$as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
-+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "checking for $ac_hdr that defines DIR... " >&6; }
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
++if eval "test \"\${$as_ac_Header+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 <sys/types.h>
-+#include <$ac_hdr>
-+
-+int
-+main ()
-+{
-+if ((DIR *) 0)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <$ac_hdr>
+@@ -5685,41 +6268,17 @@ return 0;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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 :
-+  eval "$as_ac_Header=yes"
-+else
+   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"
 +  eval "$as_ac_Header=no"
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ 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
 +eval ac_res=\$$as_ac_Header
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-+_ACEOF
-+
-+ac_header_dirent=$ac_hdr; break
-+fi
-+
-+done
-+# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-+if test $ac_header_dirent = dirent.h; then
+ $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
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
+ _ACEOF
+@@ -5730,17 +6289,13 @@ fi
+ done
+ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
+ if test $ac_header_dirent = dirent.h; then
+-  { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-+$as_echo_n "checking for library containing opendir... " >&6; }
+ $as_echo_n "checking for library containing opendir... " >&6; }
+-if test "${ac_cv_search_opendir+set}" = set; then
 +if test "${ac_cv_search_opendir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* 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 opendir ();
-+int
-+main ()
-+{
-+return opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' dir; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5765,70 +6320,39 @@ for ac_lib in '' dir; do
+     ac_res=-l$ac_lib
+     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+   fi
+-  rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_search_opendir=$ac_res
-+fi
+   ac_cv_search_opendir=$ac_res
+-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
+-  if test "${ac_cv_search_opendir+set}" = set; then
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext
 +  if test "${ac_cv_search_opendir+set}" = set; then :
-+  break
-+fi
-+done
+   break
+ fi
+ done
+-if test "${ac_cv_search_opendir+set}" = set; then
+-  :
 +if test "${ac_cv_search_opendir+set}" = set; then :
 +
-+else
-+  ac_cv_search_opendir=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
+ else
+   ac_cv_search_opendir=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-+$as_echo "$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
+ $as_echo "$ac_cv_search_opendir" >&6; }
+ ac_res=$ac_cv_search_opendir
+-if test "$ac_res" != no; then
 +if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
-+else
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
+ fi
+ 
+ else
+-  { $as_echo "$as_me:$LINENO: checking for library containing opendir" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing opendir" >&5
-+$as_echo_n "checking for library containing opendir... " >&6; }
+ $as_echo_n "checking for library containing opendir... " >&6; }
+-if test "${ac_cv_search_opendir+set}" = set; then
 +if test "${ac_cv_search_opendir+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
+   $as_echo_n "(cached) " >&6
+ else
+   ac_func_search_save_LIBS=$LIBS
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* 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 opendir ();
-+int
-+main ()
-+{
-+return opendir ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' x; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -5853,70 +6377,39 @@ for ac_lib in '' x; do
+     ac_res=-l$ac_lib
+     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+   fi
+-  rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_search_opendir=$ac_res
-+fi
+   ac_cv_search_opendir=$ac_res
+-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
+-  if test "${ac_cv_search_opendir+set}" = set; then
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext
 +  if test "${ac_cv_search_opendir+set}" = set; then :
-+  break
-+fi
-+done
+   break
+ fi
+ done
+-if test "${ac_cv_search_opendir+set}" = set; then
+-  :
 +if test "${ac_cv_search_opendir+set}" = set; then :
 +
-+else
-+  ac_cv_search_opendir=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
+ else
+   ac_cv_search_opendir=no
+ fi
+ rm conftest.$ac_ext
+ LIBS=$ac_func_search_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_opendir" >&5
-+$as_echo "$ac_cv_search_opendir" >&6; }
-+ac_res=$ac_cv_search_opendir
+ $as_echo "$ac_cv_search_opendir" >&6; }
+ ac_res=$ac_cv_search_opendir
+-if test "$ac_res" != no; then
 +if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
-+fi
-+
+   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
+ fi
+ 
+ fi
+ 
+-{ $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; }
+ $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
+   $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>
-+#include <string.h>
-+#include <float.h>
-+
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <stdlib.h>
+ #include <stdarg.h>
+@@ -5931,48 +6424,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
+   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.
+ 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 |
+ /* 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
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
+ else
+   ac_cv_header_stdc=no
+ fi
+@@ -5982,18 +6450,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 |
+ /* 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
-+rm -f conftest*
-+
-+fi
-+
-+if test $ac_cv_header_stdc = yes; then
-+  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
+ else
+   ac_cv_header_stdc=no
+ fi
+@@ -6003,14 +6467,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
+   :
+ 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>
-+#if ((' ' & 0x0FF) == 0x020)
-+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-+#else
-+# define ISLOWER(c) \
-+		   (('a' <= (c) && (c) <= 'i') \
-+		     || ('j' <= (c) && (c) <= 'r') \
-+		     || ('s' <= (c) && (c) <= 'z'))
-+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-+#endif
-+
-+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-+int
-+main ()
-+{
-+  int i;
-+  for (i = 0; i < 256; i++)
-+    if (XOR (islower (i), ISLOWER (i))
-+	|| toupper (i) != TOUPPER (i))
-+      return 2;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <ctype.h>
+ #include <stdlib.h>
+@@ -6037,64 +6497,31 @@ 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
+-  :
+-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 )
+-ac_cv_header_stdc=no
 +else
 +  ac_cv_header_stdc=no
-+fi
+ 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
+ fi
+ 
+-
+ fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
 +{ $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 "$ac_cv_header_stdc" >&6; }
+ if test $ac_cv_header_stdc = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STDC_HEADERS 1
+-_ACEOF
 +$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-+
-+fi
-+
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
-+$as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+ $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
+-if test "${ac_cv_header_sys_wait_h+set}" = set; then
 +if test "${ac_cv_header_sys_wait_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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 <sys/types.h>
-+#include <sys/wait.h>
-+#ifndef WEXITSTATUS
-+# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
-+#endif
-+#ifndef WIFEXITED
-+# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-+#endif
-+
-+int
-+main ()
-+{
-+  int s;
-+  wait (&s);
-+  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/wait.h>
+@@ -6115,108 +6542,29 @@ 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_sys_wait_h=yes
-+else
+   ac_cv_header_sys_wait_h=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_sys_wait_h=no
 +  ac_cv_header_sys_wait_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_sys_wait_h" >&5
-+$as_echo "$ac_cv_header_sys_wait_h" >&6; }
-+if test $ac_cv_header_sys_wait_h = yes; then
-+
+ $as_echo "$ac_cv_header_sys_wait_h" >&6; }
+ if test $ac_cv_header_sys_wait_h = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SYS_WAIT_H 1
+-_ACEOF
 +$as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
-+
-+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
+ 
+ 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"
+-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 :
 +  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
-+
-+fi
-+
-+done
-+
-+
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -6226,16 +6574,12 @@ fi
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for stdbool.h that conforms to C99" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
-+$as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+ $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
+-if test "${ac_cv_header_stdbool_h+set}" = set; then
 +if test "${ac_cv_header_stdbool_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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 <stdbool.h>
-+#ifndef bool
-+ "error: bool is not defined"
-+#endif
-+#ifndef false
-+ "error: false is not defined"
-+#endif
-+#if false
-+ "error: false is not 0"
-+#endif
-+#ifndef true
-+ "error: true is not defined"
-+#endif
-+#if true != 1
-+ "error: true is not 1"
-+#endif
-+#ifndef __bool_true_false_are_defined
-+ "error: __bool_true_false_are_defined is not defined"
-+#endif
-+
-+	struct s { _Bool s: 1; _Bool t; } s;
-+
-+	char a[true == 1 ? 1 : -1];
-+	char b[false == 0 ? 1 : -1];
-+	char c[__bool_true_false_are_defined == 1 ? 1 : -1];
-+	char d[(bool) 0.5 == true ? 1 : -1];
-+	bool e = &s;
-+	char f[(_Bool) 0.0 == false ? 1 : -1];
-+	char g[true];
-+	char h[sizeof (_Bool)];
-+	char i[sizeof s.t];
-+	enum { j = false, k = true, l = false * true, m = true * 256 };
-+	/* The following fails for
-+	   HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
-+	_Bool n[m];
-+	char o[sizeof n == m * sizeof n[0] ? 1 : -1];
-+	char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-+#	if defined __xlc__ || defined __GNUC__
-+	 /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-+	    reported by James Lemley on 2005-10-05; see
-+	    http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-+	    This test is not quite right, since xlc is allowed to
-+	    reject this program, as the initializer for xlcbug is
-+	    not one of the forms that C requires support for.
-+	    However, doing the test right would require a runtime
-+	    test, and that would make cross-compilation harder.
-+	    Let us hope that IBM fixes the xlc bug, and also adds
-+	    support for this kind of constant expression.  In the
-+	    meantime, this test will reject xlc, which is OK, since
-+	    our stdbool.h substitute should suffice.  We also test
-+	    this with GCC, where it should work, to detect more
-+	    quickly whether someone messes up the test in the
-+	    future.  */
-+	 char digs[] = "0123456789";
-+	 int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
-+#	endif
-+	/* Catch a bug in an HP-UX C compiler.  See
-+	   http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
-+	   http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
-+	 */
-+	_Bool q = true;
-+	_Bool *pq = &q;
-+
-+int
-+main ()
-+{
-+
-+	*pq |= q;
-+	*pq |= ! q;
-+	/* Refer to every declared value, to avoid compiler optimizations.  */
-+	return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
-+		+ !m + !n + !o + !p + !q + !pq);
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ #include <stdbool.h>
+@@ -6315,131 +6659,17 @@ 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_stdbool_h=yes
-+else
+   ac_cv_header_stdbool_h=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_stdbool_h=no
 +  ac_cv_header_stdbool_h=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdbool_h" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
-+$as_echo "$ac_cv_header_stdbool_h" >&6; }
+ $as_echo "$ac_cv_header_stdbool_h" >&6; }
+-{ $as_echo "$as_me:$LINENO: checking for _Bool" >&5
+-$as_echo_n "checking for _Bool... " >&6; }
+-if test "${ac_cv_type__Bool+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type__Bool=no
+-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
+-int
+-main ()
+-{
+-if (sizeof (_Bool))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  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
+-int
+-main ()
+-{
+-if (sizeof ((_Bool)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-
+-	ac_cv_type__Bool=yes
+-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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type__Bool" >&5
+-$as_echo "$ac_cv_type__Bool" >&6; }
+-if test "x$ac_cv_type__Bool" = x""yes; then
 +ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
 +if test "x$ac_cv_type__Bool" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE__BOOL 1
-+_ACEOF
-+
-+
-+fi
-+
-+if test $ac_cv_header_stdbool_h = yes; then
-+
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE__BOOL 1
+@@ -6450,22 +6680,16 @@ fi
+ 
+ if test $ac_cv_header_stdbool_h = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STDBOOL_H 1
+-_ACEOF
 +$as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h
-+
-+fi
-+
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
-+$as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+ $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
+-if test "${ac_cv_header_time+set}" = set; then
 +if test "${ac_cv_header_time+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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 <sys/types.h>
-+#include <sys/time.h>
-+#include <time.h>
-+
-+int
-+main ()
-+{
-+if ((struct tm *) 0)
-+return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/time.h>
+@@ -6480,54 +6704,27 @@ return 0;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_time=yes
-+else
+   ac_cv_header_time=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_time=no
 +  ac_cv_header_time=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_time" >&5
-+$as_echo "$ac_cv_header_time" >&6; }
-+if test $ac_cv_header_time = yes; then
-+
+ $as_echo "$ac_cv_header_time" >&6; }
+ if test $ac_cv_header_time = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define TIME_WITH_SYS_TIME 1
+-_ACEOF
 +$as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
-+
-+fi
-+
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether stat file-mode macros are broken" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
-+$as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+ $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
+-if test "${ac_cv_header_stat_broken+set}" = set; then
 +if test "${ac_cv_header_stat_broken+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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 <sys/types.h>
-+#include <sys/stat.h>
-+
-+#if defined S_ISBLK && defined S_IFDIR
-+extern char c1[S_ISBLK (S_IFDIR) ? -1 : 1];
-+#endif
-+
-+#if defined S_ISBLK && defined S_IFCHR
-+extern char c2[S_ISBLK (S_IFCHR) ? -1 : 1];
-+#endif
-+
-+#if defined S_ISLNK && defined S_IFREG
-+extern char c3[S_ISLNK (S_IFREG) ? -1 : 1];
-+#endif
-+
-+#if defined S_ISSOCK && defined S_IFREG
-+extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
-+#endif
-+
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -6549,41 +6746,18 @@ extern char c4[S_ISSOCK (S_IFREG) ? -1 : 1];
+ #endif
+ 
+ _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_stat_broken=no
-+else
+   ac_cv_header_stat_broken=no
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_header_stat_broken=yes
 +  ac_cv_header_stat_broken=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stat_broken" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stat_broken" >&5
-+$as_echo "$ac_cv_header_stat_broken" >&6; }
-+if test $ac_cv_header_stat_broken = yes; then
-+
+ $as_echo "$ac_cv_header_stat_broken" >&6; }
+ if test $ac_cv_header_stat_broken = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STAT_MACROS_BROKEN 1
+-_ACEOF
 +$as_echo "#define STAT_MACROS_BROKEN 1" >>confdefs.h
-+
-+fi
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+if test "x$CC" != xcc; then
+ 
+ fi
+ 
+@@ -6594,22 +6768,18 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ if test "x$CC" != xcc; then
+-  { $as_echo "$as_me:$LINENO: checking whether $CC and cc understand -c and -o together" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
-+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
-+else
+ $as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
+ else
+-  { $as_echo "$as_me:$LINENO: checking whether cc understands -c and -o together" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
-+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
-+fi
-+set dummy $CC; ac_cc=`$as_echo "$2" |
-+		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-+if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
+ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then
++if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+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
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+# Make sure it works both with $CC and with simple cc.
-+# We do the test twice because some compilers refuse to overwrite an
-+# existing .o file with -o, though they will create one.
-+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-+rm -f conftest2.*
+ /* end confdefs.h.  */
+ 
+ int
+@@ -6625,63 +6795,63 @@ _ACEOF
+ # existing .o file with -o, though they will create one.
+ ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+ rm -f conftest2.*
+-if { (case "(($ac_try" in
 +if { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
+   *\"* | *\`* | *\\*) 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_try") 2>&5
-+  ac_status=$?
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-   test -f conftest2.$ac_objext && { (case "(($ac_try" in
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } &&
 +   test -f conftest2.$ac_objext && { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
+   *\"* | *\`* | *\\*) 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_try") 2>&5
-+  ac_status=$?
+   (eval "$ac_try") 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
-+  eval ac_cv_prog_cc_${ac_cc}_c_o=yes
-+  if test "x$CC" != xcc; then
-+    # Test first that cc exists at all.
-+    if { ac_try='cc -c conftest.$ac_ext >&5'
+ then
+   eval ac_cv_prog_cc_${ac_cc}_c_o=yes
+   if test "x$CC" != xcc; then
+     # Test first that cc exists at all.
+     if { ac_try='cc -c conftest.$ac_ext >&5'
+-  { (case "(($ac_try" in
 +  { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
+   *\"* | *\`* | *\\*) 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_try") 2>&5
-+  ac_status=$?
+   (eval "$ac_try") 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
-+      ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
-+      rm -f conftest2.*
+       ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+       rm -f conftest2.*
+-      if { (case "(($ac_try" in
 +      if { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
+   *\"* | *\`* | *\\*) 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_try") 2>&5
-+  ac_status=$?
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+-  (exit $ac_status); } &&
+-	 test -f conftest2.$ac_objext && { (case "(($ac_try" in
 +  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 +  test $ac_status = 0; } &&
 +	 test -f conftest2.$ac_objext && { { case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
+   *\"* | *\`* | *\\*) 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_try") 2>&5
-+  ac_status=$?
+   (eval "$ac_try") 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
-+	# cc works too.
-+	:
-+      else
-+	# cc exists but doesn't like -o.
-+	eval ac_cv_prog_cc_${ac_cc}_c_o=no
-+      fi
-+    fi
-+  fi
-+else
-+  eval ac_cv_prog_cc_${ac_cc}_c_o=no
-+fi
-+rm -f core conftest*
-+
-+fi
-+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
+       then
+ 	# cc works too.
+ 	:
+@@ -6698,15 +6868,13 @@ rm -f core conftest*
+ 
+ fi
+ if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; 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 "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; }
-+
+ $as_echo "no" >&6; }
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define NO_MINUS_C_MINUS_O 1
+-_ACEOF
 +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
-+
-+fi
-+
-+# FIXME: we rely on the cache variable name because
-+# there is no other way.
-+set dummy $CC
-+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
-+if test "$am_t" != yes; then
-+   # Losing compiler, so override with the script.
-+   # FIXME: It is wrong to rewrite CC.
-+   # But if we don't then we get into trouble of one sort or another.
-+   # A longer-term fix would be to have automake use am__CC in this case,
-+   # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
-+   CC="$am_aux_dir/compile $CC"
-+fi
-+
-+
-+
-+for ac_header in time.h syslog.h stddef.h unistd.h arpa/inet.h fcntl.h
+ 
+ fi
+ 
+@@ -6726,788 +6894,76 @@ fi
+ 
+ 
+ 
+-
+-
+-
+-
+-
+-
+ for ac_header in time.h syslog.h stddef.h unistd.h arpa/inet.h fcntl.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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 :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$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
-+
-+else
-+  as_fn_error "required header not found" "$LINENO" 5
-+fi
-+
-+done
-+
-+
-+for ac_header in limits.h netdb.h netinet/in.h stdlib.h string.h sys/file.h
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required header not found" >&5
+-$as_echo "$as_me: error: required header not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required header not found" "$LINENO" 5
+ fi
+ 
+ done
+ 
+ 
+-
+-
+-
+-
+-
+-
+ for ac_header in limits.h netdb.h netinet/in.h stdlib.h string.h sys/file.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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 :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$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
-+
-+else
-+  as_fn_error "required header not found" "$LINENO" 5
-+fi
-+
-+done
-+
-+for ac_header in sys/ioctl.h sys/socket.h sys/time.h sys/types.h sys/wait.h
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required header not found" >&5
+-$as_echo "$as_me: error: required header not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required header not found" "$LINENO" 5
+ fi
+ 
+ done
+ 
+-
+-
+-
+-
+-
+ for ac_header in sys/ioctl.h sys/socket.h sys/time.h sys/types.h sys/wait.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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 :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$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
-+
-+else
-+  as_fn_error "required header not found" "$LINENO" 5
-+fi
-+
-+done
-+
-+
-+for ac_header in langinfo.h locale.h
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required header not found" >&5
+-$as_echo "$as_me: error: required header not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required header not found" "$LINENO" 5
+ fi
+ 
+ done
+ 
+ 
+-
+-
+ for ac_header in langinfo.h locale.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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 :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$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
-+
-+else
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+-  { $as_echo "$as_me:$LINENO: WARNING: Header that is required to retrieve system locale not found" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Header that is required to retrieve system locale not found" >&5
-+$as_echo "$as_me: WARNING: Header that is required to retrieve system locale not found" >&2;}
-+fi
-+
-+done
-+
-+
-+for ac_header in sys/utsname.h
+ $as_echo "$as_me: WARNING: Header that is required to retrieve system locale not found" >&2;}
+ fi
+ 
+ done
+ 
+ 
+-
+ for ac_header in sys/utsname.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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" "sys/utsname.h" "ac_cv_header_sys_utsname_h" "$ac_includes_default"
 +if test "x$ac_cv_header_sys_utsname_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_SYS_UTSNAME_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
-+for ac_header in sched.h ctype.h
+ _ACEOF
+ 
+ fi
+@@ -7515,150 +6971,11 @@ fi
+ done
+ 
+ 
+-
+-
+ for ac_header in sched.h ctype.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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 :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$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
-+
-+fi
-+
-+done
-+
-+for ac_func in sched_getparam sched_setparam sched_get_priority_min sched_get_priority_max
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -7667,103 +6984,11 @@ fi
+ 
+ done
+ 
+-
+-
+-
+-
+ for ac_func in sched_getparam sched_setparam sched_get_priority_min sched_get_priority_max
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+for ac_func in mkdir
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -7772,359 +6997,38 @@ fi
+ done
+ 
+ 
+-
+ for ac_func in mkdir
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  ac_fn_c_check_func "$LINENO" "mkdir" "ac_cv_func_mkdir"
 +if test "x$ac_cv_func_mkdir" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_MKDIR 1
-+_ACEOF
-+
-+else
-+  as_fn_error "required function not found" "$LINENO" 5
-+fi
-+done
-+
-+
-+for ac_header in getopt.h
+ _ACEOF
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required function not found" >&5
+-$as_echo "$as_me: error: required function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required function not found" "$LINENO" 5
+ fi
+ done
+ 
+ 
+-
+ for ac_header in getopt.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
 +if test "x$ac_cv_header_getopt_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+-
+-
+-for ac_func in getopt_long
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  return 0;
+-}
 +#define HAVE_GETOPT_H 1
-+_ACEOF
-+
+ _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
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +            for ac_func in getopt_long
 +do :
 +  ac_fn_c_check_func "$LINENO" "getopt_long" "ac_cv_func_getopt_long"
 +if test "x$ac_cv_func_getopt_long" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_GETOPT_LONG 1
-+_ACEOF
-+
-+else
+ _ACEOF
+ 
+ else
+-  { $as_echo "$as_me:$LINENO: WARNING: getopt_long not found - all command line options disabled" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: getopt_long not found - all command line options disabled" >&5
-+$as_echo "$as_me: WARNING: getopt_long not found - all command line options disabled" >&2;}
-+
-+fi
-+done
-+
-+
-+
-+else
-+
+ $as_echo "$as_me: WARNING: getopt_long not found - all command line options disabled" >&2;}
+ 
+ fi
+@@ -8134,7 +7038,7 @@ done
+ 
+ else
+ 
+-    { $as_echo "$as_me:$LINENO: WARNING: getopt.h not found - all command line options disabled" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: getopt.h not found - all command line options disabled" >&5
-+$as_echo "$as_me: WARNING: getopt.h not found - all command line options disabled" >&2;}
-+
-+fi
-+
-+done
-+
-+
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
+ $as_echo "$as_me: WARNING: getopt.h not found - all command line options disabled" >&2;}
+ 
+ fi
+@@ -8169,13 +7073,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_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
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
+       esac ;;
+     esac
+   done
+@@ -8183,8 +7087,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+   (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"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+@@ -8207,11 +7111,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ 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: 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
-+rm -f confcache
-+
-+
-+
-+CPPFLAGS_SAVE="$CPPFLAGS"
-+CFLAGS_SAVE="$CFLAGS"
-+CXXFLAGS_SAVE="$CXXFLAGS"
-+LDFLAGS_SAVE="$LDFLAGS"
-+
-+if test "x$EXTERNAL_TRANSCODING_OPTION_ENABLED" = xyes; then
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+@@ -8225,118 +7129,24 @@ CXXFLAGS_SAVE="$CXXFLAGS"
+ LDFLAGS_SAVE="$LDFLAGS"
+ 
+ if test "x$EXTERNAL_TRANSCODING_OPTION_ENABLED" = xyes; then
+-
+-for ac_func in mkfifo
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +    for ac_func in mkfifo
 +do :
 +  ac_fn_c_check_func "$LINENO" "mkfifo" "ac_cv_func_mkfifo"
 +if test "x$ac_cv_func_mkfifo" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_MKFIFO 1
-+_ACEOF
-+
-+
+ _ACEOF
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define EXTERNAL_TRANSCODING 1
+-_ACEOF
 +$as_echo "#define EXTERNAL_TRANSCODING 1" >>confdefs.h
-+
-+
-+else
-+
-+           if test "x$EXTERNAL_TRANSCODING_OPTION_REQUESTED" = xyes; then
-+               as_fn_error "mkfifo is required by the external transcoding feature" "$LINENO" 5
-+           else
+ 
+ 
+ else
+ 
+            if test "x$EXTERNAL_TRANSCODING_OPTION_REQUESTED" = xyes; then
+-               { { $as_echo "$as_me:$LINENO: error: mkfifo is required by the external transcoding feature" >&5
+-$as_echo "$as_me: error: mkfifo is required by the external transcoding feature" >&2;}
+-   { (exit 1); exit 1; }; }
++               as_fn_error $? "mkfifo is required by the external transcoding feature" "$LINENO" 5
+            else
+-               { $as_echo "$as_me:$LINENO: WARNING: mkfifo is required by the external transcoding feature" >&5
 +               { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: mkfifo is required by the external transcoding feature" >&5
-+$as_echo "$as_me: WARNING: mkfifo is required by the external transcoding feature" >&2;}
-+               EXTERNAL_TRANSCODING_OPTION_ENABLED=disabled
-+
-+           fi
-+
-+
-+fi
-+done
-+
-+fi
-+
-+ICONV_CXXFLAGS=
-+ICONV_LIBS=
-+
-+if test -n "$ICONV_SEARCH_HEADERS"; then
-+as_ac_Header=`$as_echo "ac_cv_header_$ICONV_SEARCH_HEADERS/iconv.h" | $as_tr_sh`
+ $as_echo "$as_me: WARNING: mkfifo is required by the external transcoding feature" >&2;}
+                EXTERNAL_TRANSCODING_OPTION_ENABLED=disabled
+ 
+@@ -8353,153 +7163,14 @@ ICONV_LIBS=
+ 
+ if test -n "$ICONV_SEARCH_HEADERS"; then
+ as_ac_Header=`$as_echo "ac_cv_header_$ICONV_SEARCH_HEADERS/iconv.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $ICONV_SEARCH_HEADERS/iconv.h" >&5
+-$as_echo_n "checking for $ICONV_SEARCH_HEADERS/iconv.h... " >&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 $ICONV_SEARCH_HEADERS/iconv.h usability" >&5
+-$as_echo_n "checking $ICONV_SEARCH_HEADERS/iconv.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 <$ICONV_SEARCH_HEADERS/iconv.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 $ICONV_SEARCH_HEADERS/iconv.h presence" >&5
+-$as_echo_n "checking $ICONV_SEARCH_HEADERS/iconv.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 <$ICONV_SEARCH_HEADERS/iconv.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
+-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: $ICONV_SEARCH_HEADERS/iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $ICONV_SEARCH_HEADERS/iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ICONV_SEARCH_HEADERS/iconv.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $ICONV_SEARCH_HEADERS/iconv.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $ICONV_SEARCH_HEADERS/iconv.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $ICONV_SEARCH_HEADERS/iconv.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ICONV_SEARCH_HEADERS/iconv.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $ICONV_SEARCH_HEADERS/iconv.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ICONV_SEARCH_HEADERS/iconv.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $ICONV_SEARCH_HEADERS/iconv.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ICONV_SEARCH_HEADERS/iconv.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $ICONV_SEARCH_HEADERS/iconv.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ICONV_SEARCH_HEADERS/iconv.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $ICONV_SEARCH_HEADERS/iconv.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $ICONV_SEARCH_HEADERS/iconv.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $ICONV_SEARCH_HEADERS/iconv.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $ICONV_SEARCH_HEADERS/iconv.h" >&5
+-$as_echo_n "checking for $ICONV_SEARCH_HEADERS/iconv.h... " >&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
 +ac_fn_c_check_header_mongrel "$LINENO" "$ICONV_SEARCH_HEADERS/iconv.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+            ICONV_CXXFLAGS="-I$ICONV_SEARCH_HEADERS"
-+
-+else
-+
-+            as_fn_error "iconv.h not found in requested location $ICONV_SEARCH_HEADERS" "$LINENO" 5
-+
-+
-+fi
-+
-+
-+
-+else
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+             ICONV_CXXFLAGS="-I$ICONV_SEARCH_HEADERS"
+ 
+ else
+ 
+-            { { $as_echo "$as_me:$LINENO: error: iconv.h not found in requested location $ICONV_SEARCH_HEADERS" >&5
+-$as_echo "$as_me: error: iconv.h not found in requested location $ICONV_SEARCH_HEADERS" >&2;}
+-   { (exit 1); exit 1; }; }
++            as_fn_error $? "iconv.h not found in requested location $ICONV_SEARCH_HEADERS" "$LINENO" 5
+ 
+ 
+ fi
+@@ -8507,276 +7178,14 @@ fi
+ 
+ 
+ else
+-if test "${ac_cv_header_iconv_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for iconv.h" >&5
+-$as_echo_n "checking for iconv.h... " >&6; }
+-if test "${ac_cv_header_iconv_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5
+-$as_echo "$ac_cv_header_iconv_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking iconv.h usability" >&5
+-$as_echo_n "checking iconv.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 <iconv.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 iconv.h presence" >&5
+-$as_echo_n "checking iconv.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 <iconv.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
+-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: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: iconv.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: iconv.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: iconv.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: iconv.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: iconv.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: iconv.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: iconv.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: iconv.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: iconv.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: iconv.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: iconv.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: iconv.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: iconv.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for iconv.h" >&5
+-$as_echo_n "checking for iconv.h... " >&6; }
+-if test "${ac_cv_header_iconv_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_iconv_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_iconv_h" >&5
+-$as_echo "$ac_cv_header_iconv_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_iconv_h" = x""yes; then
 +ac_fn_c_check_header_mongrel "$LINENO" "iconv.h" "ac_cv_header_iconv_h" "$ac_includes_default"
 +if test "x$ac_cv_header_iconv_h" = x""yes; then :
-+  ICONV_OK=yes
-+else
-+
-+            unset ac_cv_header_iconv_h
+   ICONV_OK=yes
+ else
+ 
+             unset ac_cv_header_iconv_h
+-            if test "${ac_cv_header__usr_local_include_iconv_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for /usr/local/include/iconv.h" >&5
+-$as_echo_n "checking for /usr/local/include/iconv.h... " >&6; }
+-if test "${ac_cv_header__usr_local_include_iconv_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header__usr_local_include_iconv_h" >&5
+-$as_echo "$ac_cv_header__usr_local_include_iconv_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking /usr/local/include/iconv.h usability" >&5
+-$as_echo_n "checking /usr/local/include/iconv.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 </usr/local/include/iconv.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 /usr/local/include/iconv.h presence" >&5
+-$as_echo_n "checking /usr/local/include/iconv.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 </usr/local/include/iconv.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
+-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: /usr/local/include/iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: /usr/local/include/iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: /usr/local/include/iconv.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: /usr/local/include/iconv.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: /usr/local/include/iconv.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: /usr/local/include/iconv.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: /usr/local/include/iconv.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: /usr/local/include/iconv.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: /usr/local/include/iconv.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: /usr/local/include/iconv.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: /usr/local/include/iconv.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: /usr/local/include/iconv.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: /usr/local/include/iconv.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: /usr/local/include/iconv.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: /usr/local/include/iconv.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: /usr/local/include/iconv.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for /usr/local/include/iconv.h" >&5
+-$as_echo_n "checking for /usr/local/include/iconv.h... " >&6; }
+-if test "${ac_cv_header__usr_local_include_iconv_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header__usr_local_include_iconv_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header__usr_local_include_iconv_h" >&5
+-$as_echo "$ac_cv_header__usr_local_include_iconv_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header__usr_local_include_iconv_h" = x""yes; then
 +            ac_fn_c_check_header_mongrel "$LINENO" "/usr/local/include/iconv.h" "ac_cv_header__usr_local_include_iconv_h" "$ac_includes_default"
 +if test "x$ac_cv_header__usr_local_include_iconv_h" = x""yes; then :
-+
-+                    ICONV_CXXFLAGS="-I/usr/local/include"
-+                    if test -z "$ICONV_SEARCH_LIBS"; then
-+                        LDFLAGS="-L/usr/local/lib"
-+                    fi
-+
-+else
-+
-+                    unset ac_cv_header_iconv_h
-+                    as_ac_Header=`$as_echo "ac_cv_header_$SEARCH_DIR_HEADERS/iconv.h" | $as_tr_sh`
+ 
+                     ICONV_CXXFLAGS="-I/usr/local/include"
+                     if test -z "$ICONV_SEARCH_LIBS"; then
+@@ -8787,145 +7196,8 @@ else
+ 
+                     unset ac_cv_header_iconv_h
+                     as_ac_Header=`$as_echo "ac_cv_header_$SEARCH_DIR_HEADERS/iconv.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $SEARCH_DIR_HEADERS/iconv.h" >&5
+-$as_echo_n "checking for $SEARCH_DIR_HEADERS/iconv.h... " >&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 $SEARCH_DIR_HEADERS/iconv.h usability" >&5
+-$as_echo_n "checking $SEARCH_DIR_HEADERS/iconv.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 <$SEARCH_DIR_HEADERS/iconv.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 $SEARCH_DIR_HEADERS/iconv.h presence" >&5
+-$as_echo_n "checking $SEARCH_DIR_HEADERS/iconv.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 <$SEARCH_DIR_HEADERS/iconv.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
+-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: $SEARCH_DIR_HEADERS/iconv.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $SEARCH_DIR_HEADERS/iconv.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $SEARCH_DIR_HEADERS/iconv.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $SEARCH_DIR_HEADERS/iconv.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $SEARCH_DIR_HEADERS/iconv.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $SEARCH_DIR_HEADERS/iconv.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $SEARCH_DIR_HEADERS/iconv.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $SEARCH_DIR_HEADERS/iconv.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $SEARCH_DIR_HEADERS/iconv.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $SEARCH_DIR_HEADERS/iconv.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $SEARCH_DIR_HEADERS/iconv.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $SEARCH_DIR_HEADERS/iconv.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $SEARCH_DIR_HEADERS/iconv.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $SEARCH_DIR_HEADERS/iconv.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $SEARCH_DIR_HEADERS/iconv.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $SEARCH_DIR_HEADERS/iconv.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $SEARCH_DIR_HEADERS/iconv.h" >&5
+-$as_echo_n "checking for $SEARCH_DIR_HEADERS/iconv.h... " >&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
 +ac_fn_c_check_header_mongrel "$LINENO" "$SEARCH_DIR_HEADERS/iconv.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                            ICONV_CXXFLAGS="-I$SEARCH_DIR_HEADERS"
-+                            if test -z "$ICONV_SEARCH_LIBS"; then
-+                                LDFLAGS="-L$SEARCH_DIR_LIBS"
-+                            fi
-+
-+else
-+  as_fn_error "required header iconv.h not found on your system" "$LINENO" 5
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+fi
-+
-+LIBICONV=0
-+if test -n "$ICONV_SEARCH_LIBS"; then
-+    if test "x$ICONV_LIB_OPTION_ENABLED" = xno; then
-+        LDFLAGS="-L$ICONV_SEARCH_LIBS"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                             ICONV_CXXFLAGS="-I$SEARCH_DIR_HEADERS"
+                             if test -z "$ICONV_SEARCH_LIBS"; then
+@@ -8933,9 +7205,7 @@ as_val=`eval 'as_val=${'$as_ac_Header'}
+                             fi
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required header iconv.h not found on your system" >&5
+-$as_echo "$as_me: error: required header iconv.h not found on your system" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required header iconv.h not found on your system" "$LINENO" 5
+ 
+ fi
+ 
+@@ -8956,110 +7226,22 @@ LIBICONV=0
+ if test -n "$ICONV_SEARCH_LIBS"; then
+     if test "x$ICONV_LIB_OPTION_ENABLED" = xno; then
+         LDFLAGS="-L$ICONV_SEARCH_LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for iconv" >&5
+-$as_echo_n "checking for iconv... " >&6; }
+-if test "${ac_cv_func_iconv+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 iconv to an innocuous variant, in case <limits.h> declares iconv.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define iconv innocuous_iconv
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char iconv (); 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 iconv
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char iconv ();
+-/* 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_iconv || defined __stub___iconv
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return iconv ();
+-  ;
+-  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_iconv=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_iconv=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_iconv" >&5
+-$as_echo "$ac_cv_func_iconv" >&6; }
+-if test "x$ac_cv_func_iconv" = x""yes; then
 +        ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv"
 +if test "x$ac_cv_func_iconv" = x""yes; then :
-+
-+                ICONV_LIBS="-L$ICONV_SEARCH_LIBS"
-+
-+else
-+
-+                LDFLAGS="-L$ICONV_SEARCH_LIBS -liconv"
+ 
+                 ICONV_LIBS="-L$ICONV_SEARCH_LIBS"
+ 
+ else
+ 
+                 LDFLAGS="-L$ICONV_SEARCH_LIBS -liconv"
+-                { $as_echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -liconv" >&5
-+$as_echo_n "checking for iconv in -liconv... " >&6; }
+ $as_echo_n "checking for iconv in -liconv... " >&6; }
+-if test "${ac_cv_lib_iconv_iconv+set}" = set; then
 +if test "${ac_cv_lib_iconv_iconv+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char iconv ();
-+int
-+main ()
-+{
-+return iconv ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -9077,61 +7259,32 @@ return iconv ();
+   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_iconv_iconv=yes
-+else
+   ac_cv_lib_iconv_iconv=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_iconv_iconv=no
 +  ac_cv_lib_iconv_iconv=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv" >&5
-+$as_echo "$ac_cv_lib_iconv_iconv" >&6; }
+ $as_echo "$ac_cv_lib_iconv_iconv" >&6; }
+-if test "x$ac_cv_lib_iconv_iconv" = x""yes; then
 +if test "x$ac_cv_lib_iconv_iconv" = x""yes; then :
-+
-+                        ICONV_LIBS="-L$ICONV_SEARCH_LIBS -liconv"
-+                        LIBICONV=1
-+
-+else
-+
+ 
+                         ICONV_LIBS="-L$ICONV_SEARCH_LIBS -liconv"
+                         LIBICONV=1
+ 
+ else
+ 
+-                        { $as_echo "$as_me:$LINENO: checking for libiconv in -liconv" >&5
 +                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -liconv" >&5
-+$as_echo_n "checking for libiconv in -liconv... " >&6; }
+ $as_echo_n "checking for libiconv in -liconv... " >&6; }
+-if test "${ac_cv_lib_iconv_libiconv+set}" = set; then
 +if test "${ac_cv_lib_iconv_libiconv+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char libiconv ();
-+int
-+main ()
-+{
-+return libiconv ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -9149,51 +7302,24 @@ return libiconv ();
+   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_iconv_libiconv=yes
-+else
+   ac_cv_lib_iconv_libiconv=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_iconv_libiconv=no
 +  ac_cv_lib_iconv_libiconv=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv" >&5
-+$as_echo "$ac_cv_lib_iconv_libiconv" >&6; }
+ $as_echo "$ac_cv_lib_iconv_libiconv" >&6; }
+-if test "x$ac_cv_lib_iconv_libiconv" = x""yes; then
 +if test "x$ac_cv_lib_iconv_libiconv" = x""yes; then :
-+
-+                                ICONV_LIBS="-L$ICONV_SEARCH_LIBS -liconv"
-+                                LIBICONV=1
-+
-+else
-+  as_fn_error "required library iconv not found in requested location $ICONV_SEARCH_LIBS" "$LINENO" 5
-+
-+fi
-+
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    else
-+        LDFLAGS="-L$ICONV_SEARCH_LIBS -liconv"
+ 
+                                 ICONV_LIBS="-L$ICONV_SEARCH_LIBS -liconv"
+                                 LIBICONV=1
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required library iconv not found in requested location $ICONV_SEARCH_LIBS" >&5
+-$as_echo "$as_me: error: required library iconv not found in requested location $ICONV_SEARCH_LIBS" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required library iconv not found in requested location $ICONV_SEARCH_LIBS" "$LINENO" 5
+ 
+ fi
+ 
+@@ -9207,18 +7333,14 @@ fi
+ 
+     else
+         LDFLAGS="-L$ICONV_SEARCH_LIBS -liconv"
+-        { $as_echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -liconv" >&5
-+$as_echo_n "checking for iconv in -liconv... " >&6; }
+ $as_echo_n "checking for iconv in -liconv... " >&6; }
+-if test "${ac_cv_lib_iconv_iconv+set}" = set; then
 +if test "${ac_cv_lib_iconv_iconv+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char iconv ();
-+int
-+main ()
-+{
-+return iconv ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -9236,143 +7358,32 @@ return iconv ();
+   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_iconv_iconv=yes
-+else
+   ac_cv_lib_iconv_iconv=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_iconv_iconv=no
 +  ac_cv_lib_iconv_iconv=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv" >&5
-+$as_echo "$ac_cv_lib_iconv_iconv" >&6; }
+ $as_echo "$ac_cv_lib_iconv_iconv" >&6; }
+-if test "x$ac_cv_lib_iconv_iconv" = x""yes; then
 +if test "x$ac_cv_lib_iconv_iconv" = x""yes; then :
-+
-+                    ICONV_LIBS="-L$ICONV_SEARCH_LIBS -liconv"
-+                    LIBICONV=1
-+
-+else
-+  as_fn_error "You specified to use libiconv but it was not found in the requested location $ICONV_SEARCH_LIBS" "$LINENO" 5
-+
-+fi
-+
-+    fi
-+else
-+    if test "x$ICONV_LIB_OPTION_ENABLED" = xno; then
+ 
+                     ICONV_LIBS="-L$ICONV_SEARCH_LIBS -liconv"
+                     LIBICONV=1
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: You specified to use libiconv but it was not found in the requested location $ICONV_SEARCH_LIBS" >&5
+-$as_echo "$as_me: error: You specified to use libiconv but it was not found in the requested location $ICONV_SEARCH_LIBS" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "You specified to use libiconv but it was not found in the requested location $ICONV_SEARCH_LIBS" "$LINENO" 5
+ 
+ fi
+ 
+     fi
+ else
+     if test "x$ICONV_LIB_OPTION_ENABLED" = xno; then
+-        { $as_echo "$as_me:$LINENO: checking for iconv" >&5
+-$as_echo_n "checking for iconv... " >&6; }
+-if test "${ac_cv_func_iconv+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 iconv to an innocuous variant, in case <limits.h> declares iconv.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define iconv innocuous_iconv
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char iconv (); 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 iconv
+-
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char iconv ();
+-/* 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_iconv || defined __stub___iconv
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return iconv ();
+-  ;
+-  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_iconv=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_iconv=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_iconv" >&5
+-$as_echo "$ac_cv_func_iconv" >&6; }
+-if test "x$ac_cv_func_iconv" = x""yes; then
 +        ac_fn_c_check_func "$LINENO" "iconv" "ac_cv_func_iconv"
 +if test "x$ac_cv_func_iconv" = x""yes; then :
-+
-+                ICONV_LIBS="$LDFLAGS"
-+
-+else
-+
-+
-+                LDFLAGS="$LDFLAGS -liconv"
+ 
+                 ICONV_LIBS="$LDFLAGS"
+ 
+@@ -9380,18 +7391,14 @@ else
+ 
+ 
+                 LDFLAGS="$LDFLAGS -liconv"
+-                { $as_echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -liconv" >&5
-+$as_echo_n "checking for iconv in -liconv... " >&6; }
+ $as_echo_n "checking for iconv in -liconv... " >&6; }
+-if test "${ac_cv_lib_iconv_iconv+set}" = set; then
 +if test "${ac_cv_lib_iconv_iconv+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char iconv ();
-+int
-+main ()
-+{
-+return iconv ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -9409,61 +7416,32 @@ return iconv ();
+   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_iconv_iconv=yes
-+else
+   ac_cv_lib_iconv_iconv=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_iconv_iconv=no
 +  ac_cv_lib_iconv_iconv=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv" >&5
-+$as_echo "$ac_cv_lib_iconv_iconv" >&6; }
+ $as_echo "$ac_cv_lib_iconv_iconv" >&6; }
+-if test "x$ac_cv_lib_iconv_iconv" = x""yes; then
 +if test "x$ac_cv_lib_iconv_iconv" = x""yes; then :
-+
-+                        ICONV_LIBS="$LDFLAGS"
-+                        LIBICONV=1
-+
-+else
-+
+ 
+                         ICONV_LIBS="$LDFLAGS"
+                         LIBICONV=1
+ 
+ else
+ 
+-                        { $as_echo "$as_me:$LINENO: checking for libiconv in -liconv" >&5
 +                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv in -liconv" >&5
-+$as_echo_n "checking for libiconv in -liconv... " >&6; }
+ $as_echo_n "checking for libiconv in -liconv... " >&6; }
+-if test "${ac_cv_lib_iconv_libiconv+set}" = set; then
 +if test "${ac_cv_lib_iconv_libiconv+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char libiconv ();
-+int
-+main ()
-+{
-+return libiconv ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -9481,51 +7459,24 @@ return libiconv ();
+   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_iconv_libiconv=yes
-+else
+   ac_cv_lib_iconv_libiconv=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_iconv_libiconv=no
 +  ac_cv_lib_iconv_libiconv=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_libiconv" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_libiconv" >&5
-+$as_echo "$ac_cv_lib_iconv_libiconv" >&6; }
+ $as_echo "$ac_cv_lib_iconv_libiconv" >&6; }
+-if test "x$ac_cv_lib_iconv_libiconv" = x""yes; then
 +if test "x$ac_cv_lib_iconv_libiconv" = x""yes; then :
-+
-+                                ICONV_LIBS="$LDFLAGS"
-+                                LIBICONV=1
-+
-+else
-+  as_fn_error "required library iconv not found on your system" "$LINENO" 5
-+
-+fi
-+
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    else
-+        LDFLAGS="$LDFLAGS -liconv"
+ 
+                                 ICONV_LIBS="$LDFLAGS"
+                                 LIBICONV=1
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required library iconv not found on your system" >&5
+-$as_echo "$as_me: error: required library iconv not found on your system" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required library iconv not found on your system" "$LINENO" 5
+ 
+ fi
+ 
+@@ -9539,18 +7490,14 @@ fi
+ 
+     else
+         LDFLAGS="$LDFLAGS -liconv"
+-        { $as_echo "$as_me:$LINENO: checking for iconv in -liconv" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv in -liconv" >&5
-+$as_echo_n "checking for iconv in -liconv... " >&6; }
+ $as_echo_n "checking for iconv in -liconv... " >&6; }
+-if test "${ac_cv_lib_iconv_iconv+set}" = set; then
 +if test "${ac_cv_lib_iconv_iconv+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-liconv  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-liconv  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char iconv ();
-+int
-+main ()
-+{
-+return iconv ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -9568,52 +7515,25 @@ return iconv ();
+   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_iconv_iconv=yes
-+else
+   ac_cv_lib_iconv_iconv=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_iconv_iconv=no
 +  ac_cv_lib_iconv_iconv=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_iconv_iconv" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_iconv_iconv" >&5
-+$as_echo "$ac_cv_lib_iconv_iconv" >&6; }
+ $as_echo "$ac_cv_lib_iconv_iconv" >&6; }
+-if test "x$ac_cv_lib_iconv_iconv" = x""yes; then
 +if test "x$ac_cv_lib_iconv_iconv" = x""yes; then :
-+
-+                    ICONV_LIBS="$LDFLAGS"
-+                    LIBICONV=1
-+
-+else
-+
-+                    as_fn_error "You specified to use libiconv but the library was not found" "$LINENO" 5
-+
-+
-+fi
-+
-+    fi
-+fi
-+
-+if test $LIBICONV -eq 1; then
-+
+ 
+                     ICONV_LIBS="$LDFLAGS"
+                     LIBICONV=1
+ 
+ else
+ 
+-                    { { $as_echo "$as_me:$LINENO: error: You specified to use libiconv but the library was not found" >&5
+-$as_echo "$as_me: error: You specified to use libiconv but the library was not found" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "You specified to use libiconv but the library was not found" "$LINENO" 5
+ 
+ 
+ fi
+@@ -9623,9 +7543,7 @@ fi
+ 
+ if test $LIBICONV -eq 1; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBICONV 1
+-_ACEOF
 +$as_echo "#define HAVE_LIBICONV 1" >>confdefs.h
-+
-+fi
-+
-+
-+
-+
-+CFLAGS="$CFLAGS $ICONV_CXXFLAGS -Werror"
+ 
+ fi
+ 
+@@ -9633,13 +7551,9 @@ fi
+ 
+ 
+ CFLAGS="$CFLAGS $ICONV_CXXFLAGS -Werror"
+-{ $as_echo "$as_me:$LINENO: checking if iconv declaration requires const char cast" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if iconv declaration requires const char cast" >&5
-+$as_echo_n "checking if iconv declaration requires const char cast... " >&6; }
+ $as_echo_n "checking if iconv declaration requires const char cast... " >&6; }
+-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 <iconv.h>
-+
-+int
-+main ()
-+{
-+
-+            char **ptr = NULL;
-+            size_t len;
-+            iconv_t cd = NULL;
-+            (void)iconv(cd, ptr, &len, ptr, &len);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+              #include <stdlib.h>
+@@ -9659,44 +7573,21 @@ 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 :
-+
+ 
+-         { $as_echo "$as_me:$LINENO: result: no" >&5
 +         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+else
-+
-+
+ $as_echo "no" >&6; }
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ICONV_CONST 1
+-_ACEOF
 +$as_echo "#define ICONV_CONST 1" >>confdefs.h
-+
-+
+ 
+ 
+-         { $as_echo "$as_me:$LINENO: result: yes" >&5
 +         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+CFLAGS="$CFLAGS_SAVE"
-+CXXFLAGS="$CXXFLAGS_SAVE"
-+LDFLAGS="$LDFLAGS_SAVE"
-+
-+for ac_header in execinfo.h
+ $as_echo "yes" >&6; }
+ 
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+@@ -9704,151 +7595,12 @@ CFLAGS="$CFLAGS_SAVE"
+ CXXFLAGS="$CXXFLAGS_SAVE"
+ LDFLAGS="$LDFLAGS_SAVE"
+ 
+-
+ for ac_header in execinfo.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
 +if test "x$ac_cv_header_execinfo_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_EXECINFO_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
+ _ACEOF
+ 
+ fi
+@@ -9856,103 +7608,9 @@ fi
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for time_t" >&5
+-$as_echo_n "checking for time_t... " >&6; }
+-if test "${ac_cv_type_time_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_time_t=no
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-
+-int
+-main ()
+-{
+-if (sizeof (time_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-#include <sys/types.h>
+-
+-int
+-main ()
+-{
+-if (sizeof ((time_t)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-
+-	ac_cv_type_time_t=yes
+-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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_time_t" >&5
+-$as_echo "$ac_cv_type_time_t" >&6; }
+-if test "x$ac_cv_type_time_t" = x""yes; then
 +ac_fn_c_check_type "$LINENO" "time_t" "ac_cv_type_time_t" "#include <sys/types.h>
 +"
 +if test "x$ac_cv_type_time_t" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_TIME_T 1
-+_ACEOF
-+
-+
-+fi
-+
-+
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_TIME_T 1
+@@ -9989,13 +7647,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_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
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
+       esac ;;
+     esac
+   done
+@@ -10003,8 +7661,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+   (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"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+@@ -10027,26 +7685,26 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ 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: 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
-+rm -f confcache
-+
-+# Check whether --enable-largefile was given.
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+ 
+ # Check whether --enable-largefile was given.
+-if test "${enable_largefile+set}" = set; then
 +if test "${enable_largefile+set}" = set; then :
-+  enableval=$enable_largefile;
-+fi
-+
-+if test "$enable_largefile" != no; then
-+
+   enableval=$enable_largefile;
+ fi
+ 
+ if test "$enable_largefile" != no; then
+ 
+-  { $as_echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-+$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+ $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
+-if test "${ac_cv_sys_largefile_CC+set}" = set; then
 +if test "${ac_cv_sys_largefile_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_sys_largefile_CC=no
-+     if test "$GCC" != yes; then
-+       ac_save_CC=$CC
-+       while :; do
-+	 # IRIX 6.2 and later do not support large files by default,
-+	 # so use the C compiler's -n32 option if that helps.
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_sys_largefile_CC=no
+@@ -10055,11 +7713,7 @@ else
+        while :; do
+ 	 # IRIX 6.2 and later do not support large files by default,
+ 	 # so use the C compiler's -n32 option if that helps.
+-	 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>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -10078,60 +7732,14 @@ 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 :
-+  break
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+	 CC="$CC -n32"
+   break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext
+ 	 CC="$CC -n32"
+-	 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_sys_largefile_CC=' -n32'; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext
-+	 break
-+       done
-+       CC=$ac_save_CC
-+       rm -f conftest.$ac_ext
-+    fi
-+fi
+   ac_cv_sys_largefile_CC=' -n32'; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext
+ 	 break
+        done
+@@ -10139,23 +7747,19 @@ rm -f core conftest.err conftest.$ac_objext
+        rm -f conftest.$ac_ext
+     fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-+$as_echo "$ac_cv_sys_largefile_CC" >&6; }
-+  if test "$ac_cv_sys_largefile_CC" != no; then
-+    CC=$CC$ac_cv_sys_largefile_CC
-+  fi
-+
+ $as_echo "$ac_cv_sys_largefile_CC" >&6; }
+   if test "$ac_cv_sys_largefile_CC" != no; then
+     CC=$CC$ac_cv_sys_largefile_CC
+   fi
+ 
+-  { $as_echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-+$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+ $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
+-if test "${ac_cv_sys_file_offset_bits+set}" = set; then
 +if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  while :; do
+   $as_echo_n "(cached) " >&6
+ else
+   while :; do
+-  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>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -10174,38 +7778,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_sys_file_offset_bits=no; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cv_sys_file_offset_bits=no; break
+-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
+-  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.  */
-+#define _FILE_OFFSET_BITS 64
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #define _FILE_OFFSET_BITS 64
+ #include <sys/types.h>
+@@ -10225,38 +7802,15 @@ 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_sys_file_offset_bits=64; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_sys_file_offset_bits=unknown
-+  break
-+done
-+fi
+   ac_cv_sys_file_offset_bits=64; break
+-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
+   ac_cv_sys_file_offset_bits=unknown
+   break
+ done
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-+$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-+case $ac_cv_sys_file_offset_bits in #(
-+  no | unknown) ;;
-+  *)
-+cat >>confdefs.h <<_ACEOF
-+#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-+_ACEOF
-+;;
-+esac
-+rm -rf conftest*
-+  if test $ac_cv_sys_file_offset_bits = unknown; then
+ $as_echo "$ac_cv_sys_file_offset_bits" >&6; }
+ case $ac_cv_sys_file_offset_bits in #(
+   no | unknown) ;;
+@@ -10268,17 +7822,13 @@ _ACEOF
+ esac
+ rm -rf conftest*
+   if test $ac_cv_sys_file_offset_bits = unknown; then
+-    { $as_echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-+$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+ $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
+-if test "${ac_cv_sys_large_files+set}" = set; then
 +if test "${ac_cv_sys_large_files+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  while :; do
+   $as_echo_n "(cached) " >&6
+ else
+   while :; do
+-  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>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+  /* Check that off_t can represent 2**63 - 1 correctly.
+@@ -10297,38 +7847,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_sys_large_files=no; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_cv_sys_large_files=no; break
+-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
+-  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.  */
-+#define _LARGE_FILES 1
-+#include <sys/types.h>
-+ /* Check that off_t can represent 2**63 - 1 correctly.
-+    We can't simply define LARGE_OFF_T to be 9223372036854775807,
-+    since some C++ compilers masquerading as C compilers
-+    incorrectly reject 9223372036854775807.  */
-+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
-+  int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721
-+		       && LARGE_OFF_T % 2147483647 == 1)
-+		      ? 1 : -1];
-+int
-+main ()
-+{
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #define _LARGE_FILES 1
+ #include <sys/types.h>
+@@ -10348,38 +7871,15 @@ 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_sys_large_files=1; break
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  ac_cv_sys_large_files=unknown
-+  break
-+done
-+fi
+   ac_cv_sys_large_files=1; break
+-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
+   ac_cv_sys_large_files=unknown
+   break
+ done
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-+$as_echo "$ac_cv_sys_large_files" >&6; }
-+case $ac_cv_sys_large_files in #(
-+  no | unknown) ;;
-+  *)
-+cat >>confdefs.h <<_ACEOF
-+#define _LARGE_FILES $ac_cv_sys_large_files
-+_ACEOF
-+;;
-+esac
-+rm -rf conftest*
-+  fi
-+fi
-+
+ $as_echo "$ac_cv_sys_large_files" >&6; }
+ case $ac_cv_sys_large_files in #(
+   no | unknown) ;;
+@@ -10393,102 +7893,9 @@ rm -rf conftest*
+   fi
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
+-$as_echo_n "checking for off_t... " >&6; }
+-if test "${ac_cv_type_off_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_off_t=no
+-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
+-int
+-main ()
+-{
+-if (sizeof (off_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  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
+-int
+-main ()
+-{
+-if (sizeof ((off_t)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-
+-	ac_cv_type_off_t=yes
+-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
+-
 +ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
 +if test "x$ac_cv_type_off_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define off_t long int
-+_ACEOF
-+
-+fi
-+
+ 
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
+-$as_echo "$ac_cv_type_off_t" >&6; }
+-if test "x$ac_cv_type_off_t" = x""yes; then
+-  :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -10497,102 +7904,9 @@ _ACEOF
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+-$as_echo_n "checking for size_t... " >&6; }
+-if test "${ac_cv_type_size_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_size_t=no
+-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
+-int
+-main ()
+-{
+-if (sizeof (size_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  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
+-int
+-main ()
+-{
+-if (sizeof ((size_t)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-
+-	ac_cv_type_size_t=yes
+-fi
 +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
 +if test "x$ac_cv_type_size_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
-+_ACEOF
-+
-+fi
-+
-+#AC_CHECK_TYPES([ssize_t], [], [], [#include <sys/types.h>])
-+
-+if test "x$FSEEKO_CHECK_OPTION_ENABLED" = xyes; then
+ 
+-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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-$as_echo "$ac_cv_type_size_t" >&6; }
+-if test "x$ac_cv_type_size_t" = x""yes; then
+-  :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -10604,17 +7918,13 @@ fi
+ #AC_CHECK_TYPES([ssize_t], [], [], [#include <sys/types.h>])
+ 
+ if test "x$FSEEKO_CHECK_OPTION_ENABLED" = xyes; then
+-    { $as_echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
-+$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+ $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
+-if test "${ac_cv_sys_largefile_source+set}" = set; then
 +if test "${ac_cv_sys_largefile_source+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  while :; do
+   $as_echo_n "(cached) " >&6
+ else
+   while :; do
+-  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> /* for off_t */
-+     #include <stdio.h>
-+int
-+main ()
-+{
-+int (*fp) (FILE *, off_t, int) = fseeko;
-+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h> /* for off_t */
+      #include <stdio.h>
+@@ -10627,43 +7937,12 @@ int (*fp) (FILE *, off_t, int) = fseeko;
+   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_sys_largefile_source=no; break
-+fi
+   ac_cv_sys_largefile_source=no; break
+-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
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+#define _LARGEFILE_SOURCE 1
-+#include <sys/types.h> /* for off_t */
-+     #include <stdio.h>
-+int
-+main ()
-+{
-+int (*fp) (FILE *, off_t, int) = fseeko;
-+     return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #define _LARGEFILE_SOURCE 1
+ #include <sys/types.h> /* for off_t */
+@@ -10677,43 +7956,16 @@ int (*fp) (FILE *, off_t, int) = fseeko;
+   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_sys_largefile_source=1; break
-+fi
+   ac_cv_sys_largefile_source=1; break
+-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
-+  ac_cv_sys_largefile_source=unknown
-+  break
-+done
-+fi
+   ac_cv_sys_largefile_source=unknown
+   break
+ done
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
-+$as_echo "$ac_cv_sys_largefile_source" >&6; }
-+case $ac_cv_sys_largefile_source in #(
-+  no | unknown) ;;
-+  *)
-+cat >>confdefs.h <<_ACEOF
-+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
-+_ACEOF
-+;;
-+esac
-+rm -rf conftest*
-+
-+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
-+# in glibc 2.1.3, but that breaks too many other things.
-+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
-+if test $ac_cv_sys_largefile_source != unknown; then
-+
+ $as_echo "$ac_cv_sys_largefile_source" >&6; }
+ case $ac_cv_sys_largefile_source in #(
+   no | unknown) ;;
+@@ -10730,26 +7982,22 @@ rm -rf conftest*
+ # If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
+ if test $ac_cv_sys_largefile_source != unknown; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FSEEKO 1
+-_ACEOF
 +$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
-+
-+fi
-+
-+
-+    if test "$ac_cv_func_fseeko" = no || test "$ac_cv_sys_largefile_source" = unknown; then
+ 
+ fi
+ 
+ 
+     if test "$ac_cv_func_fseeko" = no || test "$ac_cv_sys_largefile_source" = unknown; then
+-        { $as_echo "$as_me:$LINENO: WARNING: fseeko has not been found on your system, will use fseek instead." >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: fseeko has not been found on your system, will use fseek instead." >&5
-+$as_echo "$as_me: WARNING: fseeko has not been found on your system, will use fseek instead." >&2;}
+ $as_echo "$as_me: WARNING: fseeko has not been found on your system, will use fseek instead." >&2;}
+-        { $as_echo "$as_me:$LINENO: WARNING: This has not been tested, please report if you have any problems." >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This has not been tested, please report if you have any problems." >&5
-+$as_echo "$as_me: WARNING: This has not been tested, please report if you have any problems." >&2;}
-+
+ $as_echo "$as_me: WARNING: This has not been tested, please report if you have any problems." >&2;}
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define fseeko fseek
+-_ACEOF
 +$as_echo "#define fseeko fseek" >>confdefs.h
-+
-+    fi
-+else
+ 
+     fi
+ else
+-    { $as_echo "$as_me:$LINENO: WARNING: Skipping fseeko test! (requested by user)" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Skipping fseeko test! (requested by user)" >&5
-+$as_echo "$as_me: WARNING: Skipping fseeko test! (requested by user)" >&2;}
-+fi
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
+ $as_echo "$as_me: WARNING: Skipping fseeko test! (requested by user)" >&2;}
+ fi
+ 
+@@ -10757,352 +8005,26 @@ fi
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of off_t" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5
-+$as_echo_n "checking size of off_t... " >&6; }
+ $as_echo_n "checking size of off_t... " >&6; }
+-if test "${ac_cv_sizeof_off_t+set}" = set; then
 +if test "${ac_cv_sizeof_off_t+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr $ac_mid + 1`
+-			if test $ac_lo -le $ac_mid; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_hi=`expr '(' $ac_mid ')' - 1`
+-			if test $ac_mid -le $ac_hi; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo= ac_hi=
+-fi
 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (off_t))" "ac_cv_sizeof_off_t"        "$ac_includes_default"; then :
-+
-+else
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (off_t))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_off_t=$ac_lo;;
+-'') if test "$ac_cv_type_off_t" = yes; then
+-     { { $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 compute sizeof (off_t)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (off_t)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
+-   else
+-     ac_cv_sizeof_off_t=0
+-   fi ;;
+-esac
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-static long int longval () { return (long int) (sizeof (off_t)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (off_t)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    return 1;
+-  if (((long int) (sizeof (off_t))) < 0)
+-    {
+-      long int i = longval ();
+-      if (i != ((long int) (sizeof (off_t))))
+-	return 1;
+-      fprintf (f, "%ld", i);
+-    }
+-  else
+-    {
+-      unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (off_t))))
+-	return 1;
+-      fprintf (f, "%lu", i);
+-    }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+-  return ferror (f) || fclose (f) != 0;
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  ac_cv_sizeof_off_t=`cat conftest.val`
+ 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 )
+-if test "$ac_cv_type_off_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +  if test "$ac_cv_type_off_t" = yes; then
 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (off_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+   else
-+     ac_cv_sizeof_off_t=0
-+   fi
-+fi
-+
-+fi
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (off_t)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (off_t)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++as_fn_error 77 "cannot compute sizeof (off_t)
++See \`config.log' for more details" "$LINENO" 5 ; }
+    else
+      ac_cv_sizeof_off_t=0
+    fi
+ 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
+-rm -f conftest.val
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5
-+$as_echo "$ac_cv_sizeof_off_t" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_OFF_T $ac_cv_sizeof_off_t
-+_ACEOF
-+
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
+ $as_echo "$ac_cv_sizeof_off_t" >&6; }
+ 
+ 
+@@ -11116,352 +8038,26 @@ _ACEOF
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of size_t" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5
-+$as_echo_n "checking size of size_t... " >&6; }
+ $as_echo_n "checking size of size_t... " >&6; }
+-if test "${ac_cv_sizeof_size_t+set}" = set; then
 +if test "${ac_cv_sizeof_size_t+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr $ac_mid + 1`
+-			if test $ac_lo -le $ac_mid; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_hi=`expr '(' $ac_mid ')' - 1`
+-			if test $ac_mid -le $ac_hi; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (size_t))" "ac_cv_sizeof_size_t"        "$ac_includes_default"; then :
-+
-+else
+ 
+-	ac_lo= ac_hi=
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (size_t))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_size_t=$ac_lo;;
+-'') if test "$ac_cv_type_size_t" = yes; then
+-     { { $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 compute sizeof (size_t)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
+-   else
+-     ac_cv_sizeof_size_t=0
+-   fi ;;
+-esac
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-static long int longval () { return (long int) (sizeof (size_t)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (size_t)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    return 1;
+-  if (((long int) (sizeof (size_t))) < 0)
+-    {
+-      long int i = longval ();
+-      if (i != ((long int) (sizeof (size_t))))
+-	return 1;
+-      fprintf (f, "%ld", i);
+-    }
+-  else
+-    {
+-      unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (size_t))))
+-	return 1;
+-      fprintf (f, "%lu", i);
+-    }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+-  return ferror (f) || fclose (f) != 0;
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  ac_cv_sizeof_size_t=`cat conftest.val`
+ 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 )
+-if test "$ac_cv_type_size_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +  if test "$ac_cv_type_size_t" = yes; then
 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (size_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+   else
-+     ac_cv_sizeof_size_t=0
-+   fi
-+fi
-+
-+fi
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (size_t)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++as_fn_error 77 "cannot compute sizeof (size_t)
++See \`config.log' for more details" "$LINENO" 5 ; }
+    else
+      ac_cv_sizeof_size_t=0
+    fi
+ 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
+-rm -f conftest.val
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_size_t" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5
-+$as_echo "$ac_cv_sizeof_size_t" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t
-+_ACEOF
-+
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
+ $as_echo "$ac_cv_sizeof_size_t" >&6; }
+ 
+ 
+@@ -11475,352 +8071,26 @@ _ACEOF
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of time_t" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5
-+$as_echo_n "checking size of time_t... " >&6; }
+ $as_echo_n "checking size of time_t... " >&6; }
+-if test "${ac_cv_sizeof_time_t+set}" = set; then
 +if test "${ac_cv_sizeof_time_t+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr $ac_mid + 1`
+-			if test $ac_lo -le $ac_mid; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_hi=`expr '(' $ac_mid ')' - 1`
+-			if test $ac_mid -le $ac_hi; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo= ac_hi=
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (time_t))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_time_t=$ac_lo;;
+-'') if test "$ac_cv_type_time_t" = yes; then
+-     { { $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 compute sizeof (time_t)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (time_t)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
+-   else
+-     ac_cv_sizeof_time_t=0
+-   fi ;;
+-esac
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-static long int longval () { return (long int) (sizeof (time_t)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (time_t)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    return 1;
+-  if (((long int) (sizeof (time_t))) < 0)
+-    {
+-      long int i = longval ();
+-      if (i != ((long int) (sizeof (time_t))))
+-	return 1;
+-      fprintf (f, "%ld", i);
+-    }
+-  else
+-    {
+-      unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (time_t))))
+-	return 1;
+-      fprintf (f, "%lu", i);
+-    }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+-  return ferror (f) || fclose (f) != 0;
 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (time_t))" "ac_cv_sizeof_time_t"        "$ac_includes_default"; then :
-+
-+else
+ 
+-  ;
+-  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
+-  ac_cv_sizeof_time_t=`cat conftest.val`
+ 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 )
+-if test "$ac_cv_type_time_t" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +  if test "$ac_cv_type_time_t" = yes; then
 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (time_t)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+   else
-+     ac_cv_sizeof_time_t=0
-+   fi
-+fi
-+
-+fi
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (time_t)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (time_t)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++as_fn_error 77 "cannot compute sizeof (time_t)
++See \`config.log' for more details" "$LINENO" 5 ; }
+    else
+      ac_cv_sizeof_time_t=0
+    fi
+ 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
+-rm -f conftest.val
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_time_t" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5
-+$as_echo "$ac_cv_sizeof_time_t" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_TIME_T $ac_cv_sizeof_time_t
-+_ACEOF
-+
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
+ $as_echo "$ac_cv_sizeof_time_t" >&6; }
+ 
+ 
+@@ -11834,352 +8104,26 @@ _ACEOF
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of unsigned int" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned int" >&5
-+$as_echo_n "checking size of unsigned int... " >&6; }
+ $as_echo_n "checking size of unsigned int... " >&6; }
+-if test "${ac_cv_sizeof_unsigned_int+set}" = set; then
 +if test "${ac_cv_sizeof_unsigned_int+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr $ac_mid + 1`
+-			if test $ac_lo -le $ac_mid; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_hi=`expr '(' $ac_mid ')' - 1`
+-			if test $ac_mid -le $ac_hi; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo= ac_hi=
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned int))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_unsigned_int=$ac_lo;;
+-'') if test "$ac_cv_type_unsigned_int" = yes; then
+-     { { $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 compute sizeof (unsigned int)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (unsigned int)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
+-   else
+-     ac_cv_sizeof_unsigned_int=0
+-   fi ;;
+-esac
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-static long int longval () { return (long int) (sizeof (unsigned int)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (unsigned int)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    return 1;
+-  if (((long int) (sizeof (unsigned int))) < 0)
+-    {
+-      long int i = longval ();
+-      if (i != ((long int) (sizeof (unsigned int))))
+-	return 1;
+-      fprintf (f, "%ld", i);
+-    }
+-  else
+-    {
+-      unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (unsigned int))))
+-	return 1;
+-      fprintf (f, "%lu", i);
+-    }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+-  return ferror (f) || fclose (f) != 0;
 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned int))" "ac_cv_sizeof_unsigned_int"        "$ac_includes_default"; then :
-+
-+else
+ 
+-  ;
+-  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
+-  ac_cv_sizeof_unsigned_int=`cat conftest.val`
+ 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 )
+-if test "$ac_cv_type_unsigned_int" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +  if test "$ac_cv_type_unsigned_int" = yes; then
 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (unsigned int)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+   else
-+     ac_cv_sizeof_unsigned_int=0
-+   fi
-+fi
-+
-+fi
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (unsigned int)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++as_fn_error 77 "cannot compute sizeof (unsigned int)
++See \`config.log' for more details" "$LINENO" 5 ; }
+    else
+      ac_cv_sizeof_unsigned_int=0
+    fi
+ 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
+-rm -f conftest.val
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_int" >&5
-+$as_echo "$ac_cv_sizeof_unsigned_int" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int
-+_ACEOF
-+
-+
-+# The cast to long int works around a bug in the HP C Compiler
-+# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
-+# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-+# This bug is HP SR number 8606223364.
+ $as_echo "$ac_cv_sizeof_unsigned_int" >&6; }
+ 
+ 
+@@ -12193,352 +8137,26 @@ _ACEOF
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ $as_echo "$as_me:$LINENO: checking size of unsigned long" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of unsigned long" >&5
-+$as_echo_n "checking size of unsigned long... " >&6; }
+ $as_echo_n "checking size of unsigned long... " >&6; }
+-if test "${ac_cv_sizeof_unsigned_long+set}" = set; then
 +if test "${ac_cv_sizeof_unsigned_long+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
+-  # Depending upon the size, compute the lo and hi bounds.
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=0 ac_mid=0
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr $ac_mid + 1`
+-			if test $ac_lo -le $ac_mid; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) < 0)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=-1 ac_mid=-1
+-  while :; do
+-    cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) >= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_lo=$ac_mid; break
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_hi=`expr '(' $ac_mid ')' - 1`
+-			if test $ac_mid -le $ac_hi; then
+-			  ac_lo= ac_hi=
+-			  break
+-			fi
+-			ac_mid=`expr 2 '*' $ac_mid`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-  done
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo= ac_hi=
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-# Binary search between lo and hi bounds.
+-while test "x$ac_lo" != "x$ac_hi"; do
+-  ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(((long int) (sizeof (unsigned long))) <= $ac_mid)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_hi=$ac_mid
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_lo=`expr '(' $ac_mid ')' + 1`
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-done
+-case $ac_lo in
+-?*) ac_cv_sizeof_unsigned_long=$ac_lo;;
+-'') if test "$ac_cv_type_unsigned_long" = yes; then
+-     { { $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 compute sizeof (unsigned long)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (unsigned long)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
+-   else
+-     ac_cv_sizeof_unsigned_long=0
+-   fi ;;
+-esac
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-static long int longval () { return (long int) (sizeof (unsigned long)); }
+-static unsigned long int ulongval () { return (long int) (sizeof (unsigned long)); }
+-#include <stdio.h>
+-#include <stdlib.h>
+-int
+-main ()
+-{
+-
+-  FILE *f = fopen ("conftest.val", "w");
+-  if (! f)
+-    return 1;
+-  if (((long int) (sizeof (unsigned long))) < 0)
+-    {
+-      long int i = longval ();
+-      if (i != ((long int) (sizeof (unsigned long))))
+-	return 1;
+-      fprintf (f, "%ld", i);
+-    }
+-  else
+-    {
+-      unsigned long int i = ulongval ();
+-      if (i != ((long int) (sizeof (unsigned long))))
+-	return 1;
+-      fprintf (f, "%lu", i);
+-    }
+-  /* Do not output a trailing newline, as this causes \r\n confusion
+-     on some platforms.  */
+-  return ferror (f) || fclose (f) != 0;
 +  if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (unsigned long))" "ac_cv_sizeof_unsigned_long"        "$ac_includes_default"; then :
-+
-+else
+ 
+-  ;
+-  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
+-  ac_cv_sizeof_unsigned_long=`cat conftest.val`
+ 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 )
+-if test "$ac_cv_type_unsigned_long" = yes; then
+-     { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
 +  if test "$ac_cv_type_unsigned_long" = yes; then
 +     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-+{ as_fn_set_status 77
-+as_fn_error "cannot compute sizeof (unsigned long)
-+See \`config.log' for more details." "$LINENO" 5; }; }
-+   else
-+     ac_cv_sizeof_unsigned_long=0
-+   fi
-+fi
-+
-+fi
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long)
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: cannot compute sizeof (unsigned long)
+-See \`config.log' for more details." >&2;}
+-   { (exit 77); exit 77; }; }; }
++as_fn_error 77 "cannot compute sizeof (unsigned long)
++See \`config.log' for more details" "$LINENO" 5 ; }
+    else
+      ac_cv_sizeof_unsigned_long=0
+    fi
+ 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
+-rm -f conftest.val
++
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_unsigned_long" >&5
-+$as_echo "$ac_cv_sizeof_unsigned_long" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long
-+_ACEOF
-+
-+
-+for ac_func in strtoll nl_langinfo setlocale
+ $as_echo "$ac_cv_sizeof_unsigned_long" >&6; }
+ 
+ 
+@@ -12548,102 +8166,11 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-
+-
+-
+ for ac_func in strtoll nl_langinfo setlocale
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+for ac_func in backtrace backtrace_symbols
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -12651,101 +8178,11 @@ _ACEOF
+ fi
+ done
+ 
+-
+-
+ for ac_func in backtrace backtrace_symbols
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+# Checks for typedefs, structures, and compiler characteristics.
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -12754,16 +8191,12 @@ fi
+ done
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+-{ $as_echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
-+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+ $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
+-if test "${ac_cv_c_const+set}" = set; then
 +if test "${ac_cv_c_const+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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
-+main ()
-+{
-+/* FIXME: Include the comments suggested by Paul. */
-+#ifndef __cplusplus
-+  /* Ultrix mips cc rejects this.  */
-+  typedef int charset[2];
-+  const charset cs;
-+  /* SunOS 4.1.1 cc rejects this.  */
-+  char const *const *pcpcc;
-+  char **ppc;
-+  /* NEC SVR4.0.2 mips cc rejects this.  */
-+  struct point {int x, y;};
-+  static struct point const zero = {0,0};
-+  /* AIX XL C 1.02.0.0 rejects this.
-+     It does not let you subtract one const X* pointer from another in
-+     an arm of an if-expression whose if-part is not a constant
-+     expression */
-+  const char *g = "string";
-+  pcpcc = &g + (g ? g-g : 0);
-+  /* HPUX 7.0 cc rejects these. */
-+  ++pcpcc;
-+  ppc = (char**) pcpcc;
-+  pcpcc = (char const *const *) ppc;
-+  { /* SCO 3.2v4 cc rejects this.  */
-+    char *t;
-+    char const *s = 0 ? (char *) 0 : (char const *) 0;
-+
-+    *t++ = 0;
-+    if (s) return 0;
-+  }
-+  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-+    int x[] = {25, 17};
-+    const int *foo = &x[0];
-+    ++foo;
-+  }
-+  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-+    typedef const int *iptr;
-+    iptr p = 0;
-+    ++p;
-+  }
-+  { /* AIX XL C 1.02.0.0 rejects this saying
-+       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-+    struct s { int j; const int *ap[3]; };
-+    struct s *b; b->j = 5;
-+  }
-+  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-+    const int foo = 10;
-+    if (!foo) return 0;
-+  }
-+  return !cs[0] && !zero.x;
-+#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -12823,56 +8256,29 @@ 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_const=yes
-+else
+   ac_cv_c_const=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_c_const=no
 +  ac_cv_c_const=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
-+$as_echo "$ac_cv_c_const" >&6; }
-+if test $ac_cv_c_const = no; then
-+
+ $as_echo "$ac_cv_c_const" >&6; }
+ if test $ac_cv_c_const = no; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define const /**/
+-_ACEOF
 +$as_echo "#define const /**/" >>confdefs.h
-+
-+fi
-+
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for inline" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
-+$as_echo_n "checking for inline... " >&6; }
+ $as_echo_n "checking for inline... " >&6; }
+-if test "${ac_cv_c_inline+set}" = set; then
 +if test "${ac_cv_c_inline+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_cv_c_inline=no
-+for ac_kw in inline __inline__ __inline; do
+   $as_echo_n "(cached) " >&6
+ else
+   ac_cv_c_inline=no
+ for ac_kw in inline __inline__ __inline; do
+-  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 __cplusplus
-+typedef int foo_t;
-+static $ac_kw foo_t static_foo () {return 0; }
-+$ac_kw foo_t foo () {return 0; }
-+#endif
-+
-+_ACEOF
+ /* end confdefs.h.  */
+ #ifndef __cplusplus
+ typedef int foo_t;
+@@ -12881,41 +8287,17 @@ $ac_kw foo_t foo () {return 0; }
+ #endif
+ 
+ _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_inline=$ac_kw
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  test "$ac_cv_c_inline" != no && break
-+done
-+
-+fi
+   ac_cv_c_inline=$ac_kw
+-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
+   test "$ac_cv_c_inline" != no && break
+ done
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_inline" >&5
-+$as_echo "$ac_cv_c_inline" >&6; }
-+
-+case $ac_cv_c_inline in
-+  inline | yes) ;;
-+  *)
-+    case $ac_cv_c_inline in
-+      no) ac_val=;;
-+      *) ac_val=$ac_cv_c_inline;;
-+    esac
-+    cat >>confdefs.h <<_ACEOF
-+#ifndef __cplusplus
-+#define inline $ac_val
-+#endif
-+_ACEOF
-+    ;;
-+esac
-+
+ $as_echo "$ac_cv_c_inline" >&6; }
+ 
+-
+ case $ac_cv_c_inline in
+   inline | yes) ;;
+   *)
+@@ -12931,16 +8313,12 @@ _ACEOF
+     ;;
+ esac
+ 
+-{ $as_echo "$as_me:$LINENO: checking for working volatile" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
-+$as_echo_n "checking for working volatile... " >&6; }
+ $as_echo_n "checking for working volatile... " >&6; }
+-if test "${ac_cv_c_volatile+set}" = set; then
 +if test "${ac_cv_c_volatile+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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
-+main ()
-+{
-+
-+volatile int x;
-+int * volatile y = (int *) 0;
-+return !x && !y;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ int
+@@ -12954,54 +8332,27 @@ return !x && !y;
+   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_volatile=yes
-+else
+   ac_cv_c_volatile=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_c_volatile=no
 +  ac_cv_c_volatile=no
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_volatile" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_volatile" >&5
-+$as_echo "$ac_cv_c_volatile" >&6; }
-+if test $ac_cv_c_volatile = no; then
-+
+ $as_echo "$ac_cv_c_volatile" >&6; }
+ if test $ac_cv_c_volatile = no; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define volatile /**/
+-_ACEOF
 +$as_echo "#define volatile /**/" >>confdefs.h
-+
-+fi
-+
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking return type of signal handlers" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-+$as_echo_n "checking return type of signal handlers... " >&6; }
+ $as_echo_n "checking return type of signal handlers... " >&6; }
+-if test "${ac_cv_type_signal+set}" = set; then
 +if test "${ac_cv_type_signal+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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 <sys/types.h>
-+#include <signal.h>
-+
-+int
-+main ()
-+{
-+return *(signal (0, 0)) (0) == 1;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <signal.h>
+@@ -13014,35 +8365,14 @@ return *(signal (0, 0)) (0) == 1;
+   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_type_signal=int
-+else
+   ac_cv_type_signal=int
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_type_signal=void
 +  ac_cv_type_signal=void
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-+$as_echo "$ac_cv_type_signal" >&6; }
-+
-+cat >>confdefs.h <<_ACEOF
-+#define RETSIGTYPE $ac_cv_type_signal
-+_ACEOF
-+
-+
+ $as_echo "$ac_cv_type_signal" >&6; }
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -13050,102 +8380,9 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
+-$as_echo_n "checking for pid_t... " >&6; }
+-if test "${ac_cv_type_pid_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_pid_t=no
+-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
+-int
+-main ()
+-{
+-if (sizeof (pid_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  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
+-int
+-main ()
+-{
+-if (sizeof ((pid_t)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-
+-	ac_cv_type_pid_t=yes
+-fi
 +ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
 +if test "x$ac_cv_type_pid_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define pid_t int
-+_ACEOF
-+
-+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
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
+-$as_echo "$ac_cv_type_pid_t" >&6; }
+-if test "x$ac_cv_type_pid_t" = x""yes; then
+-  :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -13154,102 +8391,9 @@ _ACEOF
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for size_t" >&5
+-$as_echo_n "checking for size_t... " >&6; }
+-if test "${ac_cv_type_size_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_size_t=no
+-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
+-int
+-main ()
+-{
+-if (sizeof (size_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  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
+-int
+-main ()
+-{
+-if (sizeof ((size_t)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-
+-	ac_cv_type_size_t=yes
+-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
+-
 +ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
 +if test "x$ac_cv_type_size_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define size_t unsigned int
-+_ACEOF
-+
-+fi
-+
+ 
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
+-$as_echo "$ac_cv_type_size_t" >&6; }
+-if test "x$ac_cv_type_size_t" = x""yes; then
+-  :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -13258,113 +8402,8 @@ _ACEOF
+ 
+ fi
+ 
+-
+-  { $as_echo "$as_me:$LINENO: checking for int64_t" >&5
+-$as_echo_n "checking for int64_t... " >&6; }
+-if test "${ac_cv_c_int64_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_c_int64_t=no
+-     for ac_type in 'int64_t' 'int' 'long int' \
+-	 'long long int' 'short int' 'signed char'; do
+-       cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(0 < ($ac_type) (((($ac_type) 1 << (64 - 2)) - 1) * 2 + 1))];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  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
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($ac_type) (((($ac_type) 1 << (64 - 2)) - 1) * 2 + 1)
+-		 < ($ac_type) (((($ac_type) 1 << (64 - 2)) - 1) * 2 + 2))];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-
+-	case $ac_type in
+-  int64_t) ac_cv_c_int64_t=yes ;;
+-  *) ac_cv_c_int64_t=$ac_type ;;
+-esac
+-
+-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
+-       test "$ac_cv_c_int64_t" != no && break
+-     done
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_int64_t" >&5
+-$as_echo "$ac_cv_c_int64_t" >&6; }
+-  case $ac_cv_c_int64_t in #(
 +ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t"
 +case $ac_cv_c_int64_t in #(
-+  no|yes) ;; #(
-+  *)
-+
-+cat >>confdefs.h <<_ACEOF
-+#define int64_t $ac_cv_c_int64_t
-+_ACEOF
-+;;
-+esac
-+
+   no|yes) ;; #(
+   *)
+ 
+@@ -13372,104 +8411,11 @@ cat >>confdefs.h <<_ACEOF
+ #define int64_t $ac_cv_c_int64_t
+ _ACEOF
+ ;;
+-  esac
+-
+-{ $as_echo "$as_me:$LINENO: checking for ssize_t" >&5
+-$as_echo_n "checking for ssize_t... " >&6; }
+-if test "${ac_cv_type_ssize_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_type_ssize_t=no
+-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
+-int
+-main ()
+-{
+-if (sizeof (ssize_t))
+-       return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  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
+-int
+-main ()
+-{
+-if (sizeof ((ssize_t)))
+-	  return 0;
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+ esac
+-eval 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
+-
+-	ac_cv_type_ssize_t=yes
+-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
 +ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
 +if test "x$ac_cv_type_ssize_t" = x""yes; then :
-+
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define ssize_t int
-+_ACEOF
-+
-+fi
-+
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5
+-$as_echo "$ac_cv_type_ssize_t" >&6; }
+-if test "x$ac_cv_type_ssize_t" = x""yes; then
+-  :
+ else
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -13478,75 +8424,12 @@ _ACEOF
+ 
+ fi
+ 
+-
+-  { $as_echo "$as_me:$LINENO: checking for uint32_t" >&5
+-$as_echo_n "checking for uint32_t... " >&6; }
+-if test "${ac_cv_c_uint32_t+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_c_uint32_t=no
+-     for ac_type in 'uint32_t' 'unsigned int' 'unsigned long int' \
+-	 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
+-       cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
+-/* end confdefs.h.  */
+-$ac_includes_default
+-int
+-main ()
+-{
+-static int test_array [1 - 2 * !(($ac_type) -1 >> (32 - 1) == 1)];
+-test_array [0] = 0
+-
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-rm -f conftest.$ac_objext
+-if { (ac_try="$ac_compile"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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
+-  case $ac_type in
+-  uint32_t) ac_cv_c_uint32_t=yes ;;
+-  *) ac_cv_c_uint32_t=$ac_type ;;
+-esac
+-
+-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
+-       test "$ac_cv_c_uint32_t" != no && break
+-     done
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_uint32_t" >&5
+-$as_echo "$ac_cv_c_uint32_t" >&6; }
+-  case $ac_cv_c_uint32_t in #(
 +ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
 +case $ac_cv_c_uint32_t in #(
-+  no|yes) ;; #(
-+  *)
-+
+   no|yes) ;; #(
+   *)
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define _UINT32_T 1
+-_ACEOF
 +$as_echo "#define _UINT32_T 1" >>confdefs.h
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define uint32_t $ac_cv_c_uint32_t
-+_ACEOF
-+;;
-+  esac
-+
+ 
+ 
+ cat >>confdefs.h <<_ACEOF
+@@ -13555,16 +8438,12 @@ _ACEOF
+ ;;
+   esac
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
-+$as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+ $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
+-if test "${ac_cv_struct_tm+set}" = set; then
 +if test "${ac_cv_struct_tm+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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 <sys/types.h>
-+#include <time.h>
-+
-+int
-+main ()
-+{
-+struct tm tm;
-+				     int *p = &tm.tm_sec;
-+				     return !p;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ #include <time.h>
+@@ -13579,57 +8458,29 @@ struct tm tm;
+   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_struct_tm=time.h
-+else
+   ac_cv_struct_tm=time.h
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_struct_tm=sys/time.h
 +  ac_cv_struct_tm=sys/time.h
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_struct_tm" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_struct_tm" >&5
-+$as_echo "$ac_cv_struct_tm" >&6; }
-+if test $ac_cv_struct_tm = sys/time.h; then
-+
+ $as_echo "$ac_cv_struct_tm" >&6; }
+ if test $ac_cv_struct_tm = sys/time.h; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define TM_IN_SYS_TIME 1
+-_ACEOF
 +$as_echo "#define TM_IN_SYS_TIME 1" >>confdefs.h
-+
-+fi
-+
+ 
+ fi
+ 
+-
+- { $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; }
+ $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.
+   $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
-+	     #endif
-+	     typedef int dummy;
-+
-+_ACEOF
+ /* end confdefs.h.  */
+ #ifndef __APPLE_CC__
+ 	       not a universal capable compiler
+@@ -13637,46 +8488,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
+ 
+ 	# 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=
@@ -15985,11839 +13056,25735 @@ Patch that applies changes after `autoreconf -fi` is done.
 +	   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.
+ 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>
-+
-+int
-+main ()
-+{
-+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-+		     && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
-+		     && LITTLE_ENDIAN)
-+	      bogus endian macros
-+	     #endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ 	     #include <sys/param.h>
+@@ -13694,30 +8533,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.
+   # 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>
-+
-+int
-+main ()
-+{
-+#if BYTE_ORDER != BIG_ENDIAN
-+		 not big endian
-+		#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/types.h>
+ 		#include <sys/param.h>
+@@ -13733,49 +8551,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
+   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
-+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).
+ 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>
-+
-+int
-+main ()
-+{
-+#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
-+	      bogus endian macros
-+	     #endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <limits.h>
+ 
+@@ -13790,30 +8577,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.
+   # 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>
-+
-+int
-+main ()
-+{
-+#ifndef _BIG_ENDIAN
-+		 not big endian
-+		#endif
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <limits.h>
+ 
+@@ -13828,51 +8594,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
+   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
-+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.
+ 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.
+   # 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 };
-+		short int ascii_ii[] =
-+		  { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-+		int use_ascii (int i) {
-+		  return ascii_mm[i] + ascii_ii[i];
-+		}
-+		short int ebcdic_ii[] =
-+		  { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-+		short int ebcdic_mm[] =
-+		  { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-+		int use_ebcdic (int i) {
-+		  return ebcdic_mm[i] + ebcdic_ii[i];
-+		}
-+		extern int foo;
-+
-+int
-+main ()
-+{
-+return use_ascii (foo) == use_ebcdic (foo);
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ short int ascii_mm[] =
+ 		  { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
+@@ -13898,24 +8633,7 @@ return use_ascii (foo) == use_ebcdic (foo);
+   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
-+	    if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
-+	      if test "$ac_cv_c_bigendian" = unknown; then
-+		ac_cv_c_bigendian=no
-+	      else
-+		# finding both strings is unlikely to happen, but who knows?
-+		ac_cv_c_bigendian=unknown
-+	      fi
-+	    fi
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
+   if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+ 	      ac_cv_c_bigendian=yes
+ 	    fi
+@@ -13927,20 +8645,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
-+main ()
-+{
-+
-+	     /* Are we little or big endian?  From Harbison&Steele.  */
-+	     union
-+	     {
-+	       long int l;
-+	       char c[sizeof (long int)];
-+	     } u;
-+	     u.l = 1;
-+	     return u.c[sizeof (long int) - 1] == 1;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+@@ -13960,130 +8668,42 @@ 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
+   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
+ 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
+ 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)
+ $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)
-+
+ ;; #(
+    no)
+       ;; #(
+    universal)
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define AC_APPLE_UNIVERSAL_BUILD 1
+-_ACEOF
 +$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
-+
-+     ;; #(
-+   *)
-+     as_fn_error "unknown endianness
-+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
-+ esac
-+
-+
+ 
+      ;; #(
+    *)
+-     { { $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
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether LONG_MAX is declared" >&5
+-$as_echo_n "checking whether LONG_MAX is declared... " >&6; }
+-if test "${ac_cv_have_decl_LONG_MAX+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.  */
+-#include <limits.h>
+-
+-int
+-main ()
+-{
+-#ifndef LONG_MAX
+-  (void) LONG_MAX;
+-#endif
+-
+-  ;
+-  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_have_decl_LONG_MAX=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_have_decl_LONG_MAX=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_LONG_MAX" >&5
+-$as_echo "$ac_cv_have_decl_LONG_MAX" >&6; }
+-if test "x$ac_cv_have_decl_LONG_MAX" = x""yes; then
 +ac_fn_c_check_decl "$LINENO" "LONG_MAX" "ac_cv_have_decl_LONG_MAX" "#include <limits.h>
 +"
 +if test "x$ac_cv_have_decl_LONG_MAX" = x""yes; then :
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LONG_MAX 1
+-_ACEOF
 +$as_echo "#define HAVE_LONG_MAX 1" >>confdefs.h
-+
-+            have_long_max=1
-+
-+fi
-+
-+
-+
+ 
+             have_long_max=1
+ 
+@@ -14091,138 +8711,28 @@ fi
+ 
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether LLONG_MAX is declared" >&5
+-$as_echo_n "checking whether LLONG_MAX is declared... " >&6; }
+-if test "${ac_cv_have_decl_LLONG_MAX+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.  */
+-#include <limits.h>
+-
+-int
+-main ()
+-{
+-#ifndef LLONG_MAX
+-  (void) LLONG_MAX;
+-#endif
+-
+-  ;
+-  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_have_decl_LLONG_MAX=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_have_decl_LLONG_MAX=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_LLONG_MAX" >&5
+-$as_echo "$ac_cv_have_decl_LLONG_MAX" >&6; }
+-if test "x$ac_cv_have_decl_LLONG_MAX" = x""yes; then
 +ac_fn_c_check_decl "$LINENO" "LLONG_MAX" "ac_cv_have_decl_LLONG_MAX" "#include <limits.h>
 +"
 +if test "x$ac_cv_have_decl_LLONG_MAX" = x""yes; then :
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define MAXLLONG LLONG_MAX
+-_ACEOF
 +$as_echo "#define MAXLLONG LLONG_MAX" >>confdefs.h
-+
-+
-+else
-+
+ 
+ 
+ else
+ 
+-            { $as_echo "$as_me:$LINENO: checking whether __LONG_LONG_MAX__ is declared" >&5
+-$as_echo_n "checking whether __LONG_LONG_MAX__ is declared... " >&6; }
+-if test "${ac_cv_have_decl___LONG_LONG_MAX__+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.  */
+-#include <limits.h>
+-
+-int
+-main ()
+-{
+-#ifndef __LONG_LONG_MAX__
+-  (void) __LONG_LONG_MAX__;
+-#endif
+-
+-  ;
+-  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_have_decl___LONG_LONG_MAX__=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_have_decl___LONG_LONG_MAX__=no
+-fi
+-
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl___LONG_LONG_MAX__" >&5
+-$as_echo "$ac_cv_have_decl___LONG_LONG_MAX__" >&6; }
+-if test "x$ac_cv_have_decl___LONG_LONG_MAX__" = x""yes; then
 +            ac_fn_c_check_decl "$LINENO" "__LONG_LONG_MAX__" "ac_cv_have_decl___LONG_LONG_MAX__" "#include <limits.h>
 +"
 +if test "x$ac_cv_have_decl___LONG_LONG_MAX__" = x""yes; then :
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define MAXLLONG __LONG_LONG_MAX__
+-_ACEOF
 +$as_echo "#define MAXLLONG __LONG_LONG_MAX__" >>confdefs.h
-+
-+else
-+
-+                    if test "$have_long_max" -eq 1; then
-+
+ 
+ else
+ 
+                     if test "$have_long_max" -eq 1; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define MAXLLONG LONG_MAX
+-_ACEOF
 +$as_echo "#define MAXLLONG LONG_MAX" >>confdefs.h
-+
-+                    fi
-+
-+fi
-+
-+
-+
-+fi
-+
-+
-+# Check whether --enable-rpl-malloc was given.
+ 
+                     fi
+ 
+@@ -14234,16 +8744,16 @@ fi
+ 
+ 
+ # Check whether --enable-rpl-malloc was given.
+-if test "${enable_rpl_malloc+set}" = set; then
 +if test "${enable_rpl_malloc+set}" = set; then :
-+  enableval=$enable_rpl_malloc;
-+            if test "x$enableval" = xno; then
-+                ac_cv_func_malloc_0_nonnull=yes
-+                ac_cv_func_realloc_0_nonnull=yes
+   enableval=$enable_rpl_malloc;
+             if test "x$enableval" = xno; then
+                 ac_cv_func_malloc_0_nonnull=yes
+                 ac_cv_func_realloc_0_nonnull=yes
+-                { $as_echo "$as_me:$LINENO: Disabling redefinition of malloc to rpl_malloc" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling redefinition of malloc to rpl_malloc" >&5
-+$as_echo "$as_me: Disabling redefinition of malloc to rpl_malloc" >&6;}
+ $as_echo "$as_me: Disabling redefinition of malloc to rpl_malloc" >&6;}
+-                { $as_echo "$as_me:$LINENO: Disabling redefinition of realloc to rpl_realloc" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: Disabling redefinition of realloc to rpl_realloc" >&5
-+$as_echo "$as_me: Disabling redefinition of realloc to rpl_realloc" >&6;}
+ $as_echo "$as_me: Disabling redefinition of realloc to rpl_realloc" >&6;}
+-                { $as_echo "$as_me:$LINENO: WARNING: Use this feature only if you are sure that you are building for GNU C!" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Use this feature only if you are sure that you are building for GNU C!" >&5
-+$as_echo "$as_me: WARNING: Use this feature only if you are sure that you are building for GNU C!" >&2;}
-+            fi
-+
-+
-+fi
-+
-+
-+
-+# Checks for library functions.
-+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-+# for constant arguments.  Useless!
+ $as_echo "$as_me: WARNING: Use this feature only if you are sure that you are building for GNU C!" >&2;}
+             fi
+ 
+@@ -14255,16 +8765,12 @@ fi
+ # Checks for library functions.
+ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
+ # for constant arguments.  Useless!
+-{ $as_echo "$as_me:$LINENO: checking for working alloca.h" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-+$as_echo_n "checking for working alloca.h... " >&6; }
+ $as_echo_n "checking for working alloca.h... " >&6; }
+-if test "${ac_cv_working_alloca_h+set}" = set; then
 +if test "${ac_cv_working_alloca_h+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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 <alloca.h>
-+int
-+main ()
-+{
-+char *p = (char *) alloca (2 * sizeof (int));
-+			  if (p) return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <alloca.h>
+ int
+@@ -14276,59 +8782,28 @@ char *p = (char *) alloca (2 * sizeof (int));
+   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_working_alloca_h=yes
-+else
+   ac_cv_working_alloca_h=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_working_alloca_h=no
 +  ac_cv_working_alloca_h=no
-+fi
+ 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
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-+$as_echo "$ac_cv_working_alloca_h" >&6; }
-+if test $ac_cv_working_alloca_h = yes; then
-+
+ $as_echo "$ac_cv_working_alloca_h" >&6; }
+ if test $ac_cv_working_alloca_h = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ALLOCA_H 1
+-_ACEOF
 +$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
-+
-+fi
-+
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for alloca" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-+$as_echo_n "checking for alloca... " >&6; }
+ $as_echo_n "checking for alloca... " >&6; }
+-if test "${ac_cv_func_alloca_works+set}" = set; then
 +if test "${ac_cv_func_alloca_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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.  */
-+#ifdef __GNUC__
-+# define alloca __builtin_alloca
-+#else
-+# ifdef _MSC_VER
-+#  include <malloc.h>
-+#  define alloca _alloca
-+# else
-+#  ifdef HAVE_ALLOCA_H
-+#   include <alloca.h>
-+#  else
-+#   ifdef _AIX
-+ #pragma alloca
-+#   else
-+#    ifndef alloca /* predefined by HP cc +Olibcalls */
-+char *alloca ();
-+#    endif
-+#   endif
-+#  endif
-+# endif
-+#endif
-+
-+int
-+main ()
-+{
-+char *p = (char *) alloca (1);
-+				    if (p) return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #ifdef __GNUC__
+ # define alloca __builtin_alloca
+@@ -14360,47 +8835,20 @@ char *p = (char *) alloca (1);
+   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_func_alloca_works=yes
-+else
+   ac_cv_func_alloca_works=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_alloca_works=no
 +  ac_cv_func_alloca_works=no
-+fi
+ 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
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_alloca_works" >&5
-+$as_echo "$ac_cv_func_alloca_works" >&6; }
-+
-+if test $ac_cv_func_alloca_works = yes; then
-+
+ $as_echo "$ac_cv_func_alloca_works" >&6; }
+ 
+ if test $ac_cv_func_alloca_works = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ALLOCA 1
+-_ACEOF
 +$as_echo "#define HAVE_ALLOCA 1" >>confdefs.h
-+
-+else
-+  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-+# that cause trouble.  Some versions do not even contain alloca or
-+# contain a buggy version.  If you still want to use their alloca,
-+# use ar to extract alloca.o from them instead of compiling alloca.c.
-+
-+ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-+
+ 
+ else
+   # The SVR3 libPW and SVR4 libucb both contain incompatible functions
+@@ -14410,21 +8858,15 @@ else
+ 
+ ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define C_ALLOCA 1
+-_ACEOF
 +$as_echo "#define C_ALLOCA 1" >>confdefs.h
-+
-+
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
-+$as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+ $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
+-if test "${ac_cv_os_cray+set}" = set; then
 +if test "${ac_cv_os_cray+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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.  */
-+#if defined CRAY && ! defined CRAY2
-+webecray
-+#else
-+wenotbecray
-+#endif
-+
-+_ACEOF
-+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ /* end confdefs.h.  */
+ #if defined CRAY && ! defined CRAY2
+ webecray
+@@ -14434,7 +8876,7 @@ wenotbecray
+ 
+ _ACEOF
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+-  $EGREP "webecray" >/dev/null 2>&1; then
 +  $EGREP "webecray" >/dev/null 2>&1; then :
-+  ac_cv_os_cray=yes
-+else
-+  ac_cv_os_cray=no
-+fi
-+rm -f conftest*
-+
-+fi
+   ac_cv_os_cray=yes
+ else
+   ac_cv_os_cray=no
+@@ -14442,101 +8884,13 @@ fi
+ rm -f conftest*
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_os_cray" >&5
-+$as_echo "$ac_cv_os_cray" >&6; }
-+if test $ac_cv_os_cray = yes; then
-+  for ac_func in _getb67 GETB67 getb67; do
-+    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ $as_echo "$ac_cv_os_cray" >&6; }
+ if test $ac_cv_os_cray = yes; then
+   for ac_func in _getb67 GETB67 getb67; do
+     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+
-+cat >>confdefs.h <<_ACEOF
-+#define CRAY_STACKSEG_END $ac_func
-+_ACEOF
-+
-+    break
-+fi
-+
-+  done
-+fi
-+
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+ 
+ cat >>confdefs.h <<_ACEOF
+ #define CRAY_STACKSEG_END $ac_func
+@@ -14548,19 +8902,15 @@ fi
+   done
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
-+$as_echo_n "checking stack direction for C alloca... " >&6; }
+ $as_echo_n "checking stack direction for C alloca... " >&6; }
+-if test "${ac_cv_c_stack_direction+set}" = set; then
 +if test "${ac_cv_c_stack_direction+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
 +  if test "$cross_compiling" = yes; then :
-+  ac_cv_c_stack_direction=0
-+else
+   ac_cv_c_stack_direction=0
+ 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
-+find_stack_direction ()
-+{
-+  static char *addr = 0;
-+  auto char dummy;
-+  if (addr == 0)
-+    {
-+      addr = &dummy;
-+      return find_stack_direction ();
-+    }
-+  else
-+    return (&dummy > addr) ? 1 : -1;
-+}
-+
-+int
-+main ()
-+{
-+  return find_stack_direction () < 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+@@ -14583,46 +8933,18 @@ main ()
+   return find_stack_direction () < 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_stack_direction=1
-+else
+   ac_cv_c_stack_direction=1
+ 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_stack_direction=-1
 +  ac_cv_c_stack_direction=-1
-+fi
+ 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
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_stack_direction" >&5
-+$as_echo "$ac_cv_c_stack_direction" >&6; }
-+cat >>confdefs.h <<_ACEOF
-+#define STACK_DIRECTION $ac_cv_c_stack_direction
-+_ACEOF
-+
-+
-+fi
-+
+ $as_echo "$ac_cv_c_stack_direction" >&6; }
+-
+ cat >>confdefs.h <<_ACEOF
+ #define STACK_DIRECTION $ac_cv_c_stack_direction
+ _ACEOF
+@@ -14630,19 +8952,15 @@ _ACEOF
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether closedir returns void" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether closedir returns void" >&5
-+$as_echo_n "checking whether closedir returns void... " >&6; }
+ $as_echo_n "checking whether closedir returns void... " >&6; }
+-if test "${ac_cv_func_closedir_void+set}" = set; then
 +if test "${ac_cv_func_closedir_void+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
 +  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_closedir_void=yes
-+else
+   ac_cv_func_closedir_void=yes
+ 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
-+#include <$ac_header_dirent>
-+#ifndef __cplusplus
-+int closedir ();
-+#endif
-+
-+int
-+main ()
-+{
-+return closedir (opendir (".")) != 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ #include <$ac_header_dirent>
+@@ -14658,63 +8976,30 @@ return closedir (opendir (".")) != 0;
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_func_closedir_void=no
-+else
+   ac_cv_func_closedir_void=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_func_closedir_void=yes
 +  ac_cv_func_closedir_void=yes
-+fi
+ 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
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_closedir_void" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_closedir_void" >&5
-+$as_echo "$ac_cv_func_closedir_void" >&6; }
-+if test $ac_cv_func_closedir_void = yes; then
-+
+ $as_echo "$ac_cv_func_closedir_void" >&6; }
+ if test $ac_cv_func_closedir_void = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define CLOSEDIR_VOID 1
+-_ACEOF
 +$as_echo "#define CLOSEDIR_VOID 1" >>confdefs.h
-+
-+fi
-+
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for error_at_line" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for error_at_line" >&5
-+$as_echo_n "checking for error_at_line... " >&6; }
+ $as_echo_n "checking for error_at_line... " >&6; }
+-if test "${ac_cv_lib_error_at_line+set}" = set; then
 +if test "${ac_cv_lib_error_at_line+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $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 <error.h>
-+int
-+main ()
-+{
-+error_at_line (0, 0, "", 0, "an error occurred");
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <error.h>
+ int
+@@ -14725,40 +9010,15 @@ error_at_line (0, 0, "", 0, "an error occurred");
+   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_error_at_line=yes
-+else
+   ac_cv_lib_error_at_line=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_error_at_line=no
 +  ac_cv_lib_error_at_line=no
-+fi
+ 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
-+fi
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_error_at_line" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_error_at_line" >&5
-+$as_echo "$ac_cv_lib_error_at_line" >&6; }
-+if test $ac_cv_lib_error_at_line = no; then
-+  case " $LIBOBJS " in
-+  *" error.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS error.$ac_objext"
-+ ;;
-+esac
-+
-+fi
-+
-+for ac_header in vfork.h
+ $as_echo "$ac_cv_lib_error_at_line" >&6; }
+ if test $ac_cv_lib_error_at_line = no; then
+   case " $LIBOBJS " in
+@@ -14769,252 +9029,23 @@ esac
+ 
+ fi
+ 
+-
+ for ac_header in vfork.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
 +if test "x$ac_cv_header_vfork_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_VFORK_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+for ac_func in fork vfork
+ _ACEOF
+ 
+ fi
+ 
+ done
+ 
+-
+-
+ for ac_func in fork vfork
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+done
-+
-+if test "x$ac_cv_func_fork" = xyes; then
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -15023,19 +9054,15 @@ fi
+ done
+ 
+ if test "x$ac_cv_func_fork" = xyes; then
+-  { $as_echo "$as_me:$LINENO: checking for working fork" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
-+$as_echo_n "checking for working fork... " >&6; }
+ $as_echo_n "checking for working fork... " >&6; }
+-if test "${ac_cv_func_fork_works+set}" = set; then
 +if test "${ac_cv_func_fork_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
 +  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_fork_works=cross
-+else
+   ac_cv_func_fork_works=cross
+ 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
-+main ()
-+{
-+
-+	  /* By Ruediger Kuhlmann. */
-+	  return fork () < 0;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+@@ -15049,44 +9076,17 @@ 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_func_fork_works=yes
-+else
+   ac_cv_func_fork_works=yes
+ 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_func_fork_works=no
 +  ac_cv_func_fork_works=no
-+fi
+ 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
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_fork_works" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_fork_works" >&5
-+$as_echo "$ac_cv_func_fork_works" >&6; }
-+
-+else
-+  ac_cv_func_fork_works=$ac_cv_func_fork
-+fi
-+if test "x$ac_cv_func_fork_works" = xcross; then
-+  case $host in
-+    *-*-amigaos* | *-*-msdosdjgpp*)
-+      # Override, as these systems have only a dummy fork() stub
-+      ac_cv_func_fork_works=no
-+      ;;
-+    *)
-+      ac_cv_func_fork_works=yes
-+      ;;
-+  esac
+ $as_echo "$ac_cv_func_fork_works" >&6; }
+ 
+ else
+@@ -15102,24 +9102,20 @@ if test "x$ac_cv_func_fork_works" = xcross; then
+       ac_cv_func_fork_works=yes
+       ;;
+   esac
+-  { $as_echo "$as_me:$LINENO: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&5
-+$as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
-+fi
-+ac_cv_func_vfork_works=$ac_cv_func_vfork
-+if test "x$ac_cv_func_vfork" = xyes; then
+ $as_echo "$as_me: WARNING: result $ac_cv_func_fork_works guessed because of cross compilation" >&2;}
+ fi
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ if test "x$ac_cv_func_vfork" = xyes; then
+-  { $as_echo "$as_me:$LINENO: checking for working vfork" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
-+$as_echo_n "checking for working vfork... " >&6; }
+ $as_echo_n "checking for working vfork... " >&6; }
+-if test "${ac_cv_func_vfork_works+set}" = set; then
 +if test "${ac_cv_func_vfork_works+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
 +  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_vfork_works=cross
-+else
+   ac_cv_func_vfork_works=cross
+ 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.  */
-+/* Thanks to Paul Eggert for this test.  */
-+$ac_includes_default
-+#include <sys/wait.h>
-+#ifdef HAVE_VFORK_H
-+# include <vfork.h>
-+#endif
-+/* On some sparc systems, changes by the child to local and incoming
-+   argument registers are propagated back to the parent.  The compiler
-+   is told about this with #include <vfork.h>, but some compilers
-+   (e.g. gcc -O) don't grok <vfork.h>.  Test for this by using a
-+   static variable whose address is put into a register that is
-+   clobbered by the vfork.  */
-+static void
-+#ifdef __cplusplus
-+sparc_address_test (int arg)
-+# else
-+sparc_address_test (arg) int arg;
-+#endif
-+{
-+  static pid_t child;
-+  if (!child) {
-+    child = vfork ();
-+    if (child < 0) {
-+      perror ("vfork");
-+      _exit(2);
-+    }
-+    if (!child) {
-+      arg = getpid();
-+      write(-1, "", 0);
-+      _exit (arg);
-+    }
-+  }
-+}
-+
-+int
-+main ()
-+{
-+  pid_t parent = getpid ();
-+  pid_t child;
-+
-+  sparc_address_test (0);
-+
-+  child = vfork ();
-+
-+  if (child == 0) {
-+    /* Here is another test for sparc vfork register problems.  This
-+       test uses lots of local variables, at least as many local
-+       variables as main has allocated so far including compiler
-+       temporaries.  4 locals are enough for gcc 1.40.3 on a Solaris
-+       4.1.3 sparc, but we use 8 to be safe.  A buggy compiler should
-+       reuse the register of parent for one of the local variables,
-+       since it will think that parent can't possibly be used any more
-+       in this routine.  Assigning to the local variable will thus
-+       munge parent in the parent process.  */
-+    pid_t
-+      p = getpid(), p1 = getpid(), p2 = getpid(), p3 = getpid(),
-+      p4 = getpid(), p5 = getpid(), p6 = getpid(), p7 = getpid();
-+    /* Convince the compiler that p..p7 are live; otherwise, it might
-+       use the same hardware register for all 8 local variables.  */
-+    if (p != p1 || p != p2 || p != p3 || p != p4
-+	|| p != p5 || p != p6 || p != p7)
-+      _exit(1);
-+
-+    /* On some systems (e.g. IRIX 3.3), vfork doesn't separate parent
-+       from child file descriptors.  If the child closes a descriptor
-+       before it execs or exits, this munges the parent's descriptor
-+       as well.  Test for this by closing stdout in the child.  */
-+    _exit(close(fileno(stdout)) != 0);
-+  } else {
-+    int status;
-+    struct stat st;
-+
-+    while (wait(&status) != child)
-+      ;
-+    return (
-+	 /* Was there some problem with vforking?  */
-+	 child < 0
-+
-+	 /* Did the child fail?  (This shouldn't happen.)  */
-+	 || status
-+
-+	 /* Did the vfork/compiler bug occur?  */
-+	 || parent != getpid()
-+
-+	 /* Did the file descriptor bug occur?  */
-+	 || fstat(fileno(stdout), &st) != 0
-+	 );
-+  }
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ /* Thanks to Paul Eggert for this test.  */
+ $ac_includes_default
+@@ -15211,238 +9207,62 @@ 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
 +if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_func_vfork_works=yes
-+else
+   ac_cv_func_vfork_works=yes
+ 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_func_vfork_works=no
 +  ac_cv_func_vfork_works=no
-+fi
+ 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
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_vfork_works" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_vfork_works" >&5
-+$as_echo "$ac_cv_func_vfork_works" >&6; }
-+
-+fi;
-+if test "x$ac_cv_func_fork_works" = xcross; then
-+  ac_cv_func_vfork_works=$ac_cv_func_vfork
+ $as_echo "$ac_cv_func_vfork_works" >&6; }
+ 
+ fi;
+ if test "x$ac_cv_func_fork_works" = xcross; then
+   ac_cv_func_vfork_works=$ac_cv_func_vfork
+-  { $as_echo "$as_me:$LINENO: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&5
-+$as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
-+fi
-+
-+if test "x$ac_cv_func_vfork_works" = xyes; then
-+
+ $as_echo "$as_me: WARNING: result $ac_cv_func_vfork_works guessed because of cross compilation" >&2;}
+ fi
+ 
+ if test "x$ac_cv_func_vfork_works" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_WORKING_VFORK 1
+-_ACEOF
 +$as_echo "#define HAVE_WORKING_VFORK 1" >>confdefs.h
-+
-+else
-+
+ 
+ else
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define vfork fork
+-_ACEOF
 +$as_echo "#define vfork fork" >>confdefs.h
-+
-+fi
-+if test "x$ac_cv_func_fork_works" = xyes; then
-+
+ 
+ fi
+ if test "x$ac_cv_func_fork_works" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_WORKING_FORK 1
+-_ACEOF
 +$as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h
-+
-+fi
-+
-+for ac_header in stdlib.h
+ 
+ fi
+ 
+-
+ for ac_header in stdlib.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
 +if test "x$ac_cv_header_stdlib_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_STDLIB_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
+ _ACEOF
+ 
+ fi
+ 
+ done
+ 
+-{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible malloc" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
-+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+ $as_echo_n "checking for GNU libc compatible malloc... " >&6; }
+-if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then
 +if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
 +  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_malloc_0_nonnull=no
-+else
+   ac_cv_func_malloc_0_nonnull=no
+ 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.  */
-+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-+# include <stdlib.h>
-+#else
-+char *malloc ();
-+#endif
-+
-+int
-+main ()
-+{
-+return ! malloc (0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+@@ -15458,55 +9278,24 @@ return ! malloc (0);
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_func_malloc_0_nonnull=yes
-+else
+   ac_cv_func_malloc_0_nonnull=yes
+ 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_func_malloc_0_nonnull=no
 +  ac_cv_func_malloc_0_nonnull=no
-+fi
+ 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
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_malloc_0_nonnull" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
-+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+ $as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
+-if test $ac_cv_func_malloc_0_nonnull = yes; then
 +if test $ac_cv_func_malloc_0_nonnull = yes; then :
-+
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MALLOC 1
+-_ACEOF
 +$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
-+
-+else
+ 
+ else
+-  cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MALLOC 0
+-_ACEOF
 +  $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
-+
-+   case " $LIBOBJS " in
-+  *" malloc.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
-+ ;;
-+esac
-+
-+
+ 
+    case " $LIBOBJS " in
+   *" malloc.$ac_objext "* ) ;;
+@@ -15515,27 +9304,20 @@ _ACEOF
+ esac
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define malloc rpl_malloc
+-_ACEOF
 +$as_echo "#define malloc rpl_malloc" >>confdefs.h
-+
-+fi
-+
-+
+ 
+ fi
+ 
+ 
+-
+-{ $as_echo "$as_me:$LINENO: checking for working memcmp" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5
-+$as_echo_n "checking for working memcmp... " >&6; }
+ $as_echo_n "checking for working memcmp... " >&6; }
+-if test "${ac_cv_func_memcmp_working+set}" = set; then
 +if test "${ac_cv_func_memcmp_working+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
 +  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_memcmp_working=no
-+else
+   ac_cv_func_memcmp_working=no
+ 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
-+main ()
-+{
-+
-+  /* Some versions of memcmp are not 8-bit clean.  */
-+  char c0 = '\100', c1 = '\200', c2 = '\201';
-+  if (memcmp(&c0, &c2, 1) >= 0 || memcmp(&c1, &c2, 1) >= 0)
-+    return 1;
-+
-+  /* The Next x86 OpenStep bug shows up only when comparing 16 bytes
-+     or more and with at least one buffer not starting on a 4-byte boundary.
-+     William Lewis provided this test program.   */
-+  {
-+    char foo[21];
-+    char bar[21];
-+    int i;
-+    for (i = 0; i < 4; i++)
-+      {
-+	char *a = foo + i;
-+	char *b = bar + i;
-+	strcpy (a, "--------01111111");
-+	strcpy (b, "--------10000000");
-+	if (memcmp (a, b, 16) >= 0)
-+	  return 1;
-+      }
-+    return 0;
-+  }
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+@@ -15570,44 +9352,17 @@ 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_func_memcmp_working=yes
-+else
+   ac_cv_func_memcmp_working=yes
+ 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_func_memcmp_working=no
 +  ac_cv_func_memcmp_working=no
-+fi
+ 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
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_memcmp_working" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_memcmp_working" >&5
-+$as_echo "$ac_cv_func_memcmp_working" >&6; }
-+test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
-+  *" memcmp.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS memcmp.$ac_objext"
-+ ;;
-+esac
-+
-+
-+for ac_header in stdlib.h
+ $as_echo "$ac_cv_func_memcmp_working" >&6; }
+ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
+   *" memcmp.$ac_objext "* ) ;;
+@@ -15616,170 +9371,27 @@ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in
+ esac
+ 
+ 
+-
+ for ac_header in stdlib.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
 +if test "x$ac_cv_header_stdlib_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_STDLIB_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
+ _ACEOF
+ 
+ fi
+ 
+ done
+ 
+-{ $as_echo "$as_me:$LINENO: checking for GNU libc compatible realloc" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
-+$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
+ $as_echo_n "checking for GNU libc compatible realloc... " >&6; }
+-if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then
 +if test "${ac_cv_func_realloc_0_nonnull+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
 +  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_realloc_0_nonnull=no
-+else
+   ac_cv_func_realloc_0_nonnull=no
+ 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.  */
-+#if defined STDC_HEADERS || defined HAVE_STDLIB_H
-+# include <stdlib.h>
-+#else
-+char *realloc ();
-+#endif
-+
-+int
-+main ()
-+{
-+return ! realloc (0, 0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #if defined STDC_HEADERS || defined HAVE_STDLIB_H
+ # include <stdlib.h>
+@@ -15795,55 +9407,24 @@ return ! realloc (0, 0);
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_func_realloc_0_nonnull=yes
-+else
+   ac_cv_func_realloc_0_nonnull=yes
+ 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_func_realloc_0_nonnull=no
 +  ac_cv_func_realloc_0_nonnull=no
-+fi
+ 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
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_realloc_0_nonnull" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
-+$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
+ $as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
+-if test $ac_cv_func_realloc_0_nonnull = yes; then
 +if test $ac_cv_func_realloc_0_nonnull = yes; then :
-+
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_REALLOC 1
+-_ACEOF
 +$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
-+
-+else
+ 
+ else
+-  cat >>confdefs.h <<\_ACEOF
+-#define HAVE_REALLOC 0
+-_ACEOF
 +  $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
-+
-+   case " $LIBOBJS " in
-+  *" realloc.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
-+ ;;
-+esac
-+
-+
+ 
+    case " $LIBOBJS " in
+   *" realloc.$ac_objext "* ) ;;
+@@ -15852,158 +9433,16 @@ _ACEOF
+ esac
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define realloc rpl_realloc
+-_ACEOF
 +$as_echo "#define realloc rpl_realloc" >>confdefs.h
-+
-+fi
-+
-+
-+for ac_header in sys/select.h sys/socket.h
+ 
+ fi
+ 
+ 
+-
+-
+-
+ for ac_header in sys/select.h sys/socket.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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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 :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$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
-+
-+fi
-+
-+done
-+
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -16012,19 +9451,15 @@ fi
+ 
+ done
+ 
+-{ $as_echo "$as_me:$LINENO: checking types of arguments for select" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5
-+$as_echo_n "checking types of arguments for select... " >&6; }
+ $as_echo_n "checking types of arguments for select... " >&6; }
+-if test "${ac_cv_func_select_args+set}" = set; then
 +if test "${ac_cv_func_select_args+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
-+ for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do
-+  for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do
+   $as_echo_n "(cached) " >&6
+ else
+   for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
+  for ac_arg1 in 'int' 'size_t' 'unsigned long int' 'unsigned int'; do
+   for ac_arg5 in 'struct timeval *' 'const struct timeval *'; do
+-   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
-+#ifdef HAVE_SYS_SELECT_H
-+# include <sys/select.h>
-+#endif
-+#ifdef HAVE_SYS_SOCKET_H
-+# include <sys/socket.h>
-+#endif
-+
-+int
-+main ()
-+{
-+extern int select ($ac_arg1,
-+					    $ac_arg234, $ac_arg234, $ac_arg234,
-+					    $ac_arg5);
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ #ifdef HAVE_SYS_SELECT_H
+@@ -16044,32 +9479,9 @@ extern int select ($ac_arg1,
+   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_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+  done
-+ done
-+done
-+# Provide a safe default value.
-+: ${ac_cv_func_select_args='int,int *,struct timeval *'}
-+
-+fi
+   ac_cv_func_select_args="$ac_arg1,$ac_arg234,$ac_arg5"; break 3
+-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
+   done
+  done
+@@ -16078,7 +9490,7 @@ done
+ : ${ac_cv_func_select_args='int,int *,struct timeval *'}
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_select_args" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5
-+$as_echo "$ac_cv_func_select_args" >&6; }
-+ac_save_IFS=$IFS; IFS=','
-+set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'`
-+IFS=$ac_save_IFS
-+shift
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SELECT_TYPE_ARG1 $1
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SELECT_TYPE_ARG234 ($2)
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SELECT_TYPE_ARG5 ($3)
-+_ACEOF
-+
-+rm -f conftest*
-+
+ $as_echo "$ac_cv_func_select_args" >&6; }
+ ac_save_IFS=$IFS; IFS=','
+ set dummy `echo "$ac_cv_func_select_args" | sed 's/\*/\*/g'`
+@@ -16101,29 +9513,25 @@ _ACEOF
+ 
+ rm -f conftest*
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether lstat dereferences a symlink specified with a trailing slash" >&5
+-$as_echo_n "checking whether lstat dereferences a symlink specified with a trailing slash... " >&6; }
+-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 +$as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
 +if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  rm -f conftest.sym conftest.file
-+echo >conftest.file
-+if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+   $as_echo_n "(cached) " >&6
+ else
+   rm -f conftest.sym conftest.file
+ echo >conftest.file
+ if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then
+-  if test "$cross_compiling" = yes; then
 +  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_lstat_dereferences_slashed_symlink=no
-+else
+   ac_cv_func_lstat_dereferences_slashed_symlink=no
+ 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
-+main ()
-+{
-+struct stat sbuf;
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+ main ()
+ {
+ struct stat sbuf;
+-     /* Linux will dereference the symlink and fail.
 +     /* Linux will dereference the symlink and fail, as required by POSIX.
-+	That is better in the sense that it means we will not
-+	have to compile and use the lstat wrapper.  */
-+     return lstat ("conftest.sym/", &sbuf) == 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ 	That is better in the sense that it means we will not
+ 	have to compile and use the lstat wrapper.  */
+      return lstat ("conftest.sym/", &sbuf) == 0;
+@@ -16131,42 +9539,15 @@ struct stat sbuf;
+   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_func_lstat_dereferences_slashed_symlink=yes
-+else
+   ac_cv_func_lstat_dereferences_slashed_symlink=yes
+ 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_func_lstat_dereferences_slashed_symlink=no
 +  ac_cv_func_lstat_dereferences_slashed_symlink=no
-+fi
+ 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
-+
-+else
-+  # If the `ln -s' command failed, then we probably don't even
-+  # have an lstat function.
-+  ac_cv_func_lstat_dereferences_slashed_symlink=no
-+fi
-+rm -f conftest.sym conftest.file
-+
-+fi
+ fi
+ 
+-
+ else
+   # If the `ln -s' command failed, then we probably don't even
+   # have an lstat function.
+@@ -16175,7 +9556,7 @@ fi
+ rm -f conftest.sym conftest.file
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_lstat_dereferences_slashed_symlink" >&5
-+$as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
-+
-+test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
-+
-+cat >>confdefs.h <<_ACEOF
-+#define LSTAT_FOLLOWS_SLASHED_SYMLINK 1
-+_ACEOF
-+
-+
+ $as_echo "$ac_cv_func_lstat_dereferences_slashed_symlink" >&6; }
+ 
+ test $ac_cv_func_lstat_dereferences_slashed_symlink = yes &&
+@@ -16185,7 +9566,7 @@ cat >>confdefs.h <<_ACEOF
+ _ACEOF
+ 
+ 
+-if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then
 +if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then
-+  case " $LIBOBJS " in
-+  *" lstat.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
-+ ;;
-+esac
-+
-+fi
-+
+   case " $LIBOBJS " in
+   *" lstat.$ac_objext "* ) ;;
+   *) LIBOBJS="$LIBOBJS lstat.$ac_objext"
+@@ -16194,19 +9575,15 @@ esac
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether stat accepts an empty string" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
-+$as_echo_n "checking whether stat accepts an empty string... " >&6; }
+ $as_echo_n "checking whether stat accepts an empty string... " >&6; }
+-if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then
 +if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
 +  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_stat_empty_string_bug=yes
-+else
+   ac_cv_func_stat_empty_string_bug=yes
+ 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
-+main ()
-+{
-+struct stat sbuf;
-+  return stat ("", &sbuf) == 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+@@ -16218,44 +9595,17 @@ struct stat sbuf;
+   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_func_stat_empty_string_bug=no
-+else
+   ac_cv_func_stat_empty_string_bug=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_func_stat_empty_string_bug=yes
 +  ac_cv_func_stat_empty_string_bug=yes
-+fi
+ 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
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_stat_empty_string_bug" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_stat_empty_string_bug" >&5
-+$as_echo "$ac_cv_func_stat_empty_string_bug" >&6; }
-+if test $ac_cv_func_stat_empty_string_bug = yes; then
-+  case " $LIBOBJS " in
-+  *" stat.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS stat.$ac_objext"
-+ ;;
-+esac
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define HAVE_STAT_EMPTY_STRING_BUG 1
-+_ACEOF
-+
-+fi
-+
+ $as_echo "$ac_cv_func_stat_empty_string_bug" >&6; }
+ if test $ac_cv_func_stat_empty_string_bug = yes; then
+   case " $LIBOBJS " in
+@@ -16271,19 +9621,15 @@ _ACEOF
+ 
+ fi
+ 
+-{ $as_echo "$as_me:$LINENO: checking for working strtod" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
-+$as_echo_n "checking for working strtod... " >&6; }
+ $as_echo_n "checking for working strtod... " >&6; }
+-if test "${ac_cv_func_strtod+set}" = set; then
 +if test "${ac_cv_func_strtod+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
+   $as_echo_n "(cached) " >&6
+ else
+-  if test "$cross_compiling" = yes; then
 +  if test "$cross_compiling" = yes; then :
-+  ac_cv_func_strtod=no
-+else
+   ac_cv_func_strtod=no
+ 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
-+#ifndef strtod
-+double strtod ();
-+#endif
-+int
-+main()
-+{
-+  {
-+    /* Some versions of Linux strtod mis-parse strings with leading '+'.  */
-+    char *string = " +69";
-+    char *term;
-+    double value;
-+    value = strtod (string, &term);
-+    if (value != 69 || term != (string + 4))
-+      return 1;
-+  }
-+
-+  {
-+    /* Under Solaris 2.4, strtod returns the wrong value for the
-+       terminating character under some conditions.  */
-+    char *string = "NaN";
-+    char *term;
-+    strtod (string, &term);
-+    if (term != string && *(term - 1) == 0)
-+      return 1;
-+  }
-+  return 0;
-+}
-+
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ $ac_includes_default
+@@ -16316,44 +9662,17 @@ 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
 +if ac_fn_c_try_run "$LINENO"; then :
-+  ac_cv_func_strtod=yes
-+else
+   ac_cv_func_strtod=yes
+ 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_func_strtod=no
 +  ac_cv_func_strtod=no
-+fi
+ 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
+ 
+-
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strtod" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strtod" >&5
-+$as_echo "$ac_cv_func_strtod" >&6; }
-+if test $ac_cv_func_strtod = no; then
-+  case " $LIBOBJS " in
-+  *" strtod.$ac_objext "* ) ;;
-+  *) LIBOBJS="$LIBOBJS strtod.$ac_objext"
-+ ;;
-+esac
-+
+ $as_echo "$ac_cv_func_strtod" >&6; }
+ if test $ac_cv_func_strtod = no; then
+   case " $LIBOBJS " in
+@@ -16362,105 +9681,20 @@ if test $ac_cv_func_strtod = no; then
+  ;;
+ esac
+ 
+-{ $as_echo "$as_me:$LINENO: checking for pow" >&5
+-$as_echo_n "checking for pow... " >&6; }
+-if test "${ac_cv_func_pow+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 pow to an innocuous variant, in case <limits.h> declares pow.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define pow innocuous_pow
 +ac_fn_c_check_func "$LINENO" "pow" "ac_cv_func_pow"
 +if test "x$ac_cv_func_pow" = x""yes; then :
-+
-+fi
-+
-+if test $ac_cv_func_pow = no; then
+ 
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char pow (); 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 pow
+-
+-/* 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 pow ();
+-/* 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_pow || defined __stub___pow
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return pow ();
+-  ;
+-  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_pow=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_pow=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_pow" >&5
+-$as_echo "$ac_cv_func_pow" >&6; }
+ 
+ if test $ac_cv_func_pow = no; then
+-  { $as_echo "$as_me:$LINENO: checking for pow in -lm" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
-+$as_echo_n "checking for pow in -lm... " >&6; }
+ $as_echo_n "checking for pow in -lm... " >&6; }
+-if test "${ac_cv_lib_m_pow+set}" = set; then
 +if test "${ac_cv_lib_m_pow+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lm  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lm  $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.
-+   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 pow ();
-+int
-+main ()
-+{
-+return pow ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -16478,46 +9712,21 @@ return pow ();
+   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_m_pow=yes
-+else
+   ac_cv_lib_m_pow=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_m_pow=no
 +  ac_cv_lib_m_pow=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_pow" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
-+$as_echo "$ac_cv_lib_m_pow" >&6; }
+ $as_echo "$ac_cv_lib_m_pow" >&6; }
+-if test "x$ac_cv_lib_m_pow" = x""yes; then
 +if test "x$ac_cv_lib_m_pow" = x""yes; then :
-+  POW_LIB=-lm
-+else
+   POW_LIB=-lm
+ else
+-  { $as_echo "$as_me:$LINENO: WARNING: cannot find library containing definition of pow" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
-+$as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
-+fi
-+
-+fi
-+
-+fi
-+
-+for ac_func in vprintf
+ $as_echo "$as_me: WARNING: cannot find library containing definition of pow" >&2;}
+ fi
+ 
+@@ -16525,194 +9734,18 @@ fi
+ 
+ fi
+ 
+-
+ for ac_func in vprintf
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
 +if test "x$ac_cv_func_vprintf" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_VPRINTF 1
-+_ACEOF
-+
+ _ACEOF
+ 
+-{ $as_echo "$as_me:$LINENO: checking for _doprnt" >&5
+-$as_echo_n "checking for _doprnt... " >&6; }
+-if test "${ac_cv_func__doprnt+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 _doprnt to an innocuous variant, in case <limits.h> declares _doprnt.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define _doprnt innocuous__doprnt
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char _doprnt (); 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 _doprnt
+-
+-/* 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 _doprnt ();
+-/* 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__doprnt || defined __stub____doprnt
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return _doprnt ();
+-  ;
+-  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__doprnt=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func__doprnt=no
+-fi
 +ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
 +if test "x$ac_cv_func__doprnt" = x""yes; then :
-+
+ 
+-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__doprnt" >&5
+-$as_echo "$ac_cv_func__doprnt" >&6; }
+-if test "x$ac_cv_func__doprnt" = x""yes; then
+-
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_DOPRNT 1
+-_ACEOF
 +$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
-+
-+fi
-+
-+fi
-+done
-+
-+
+ 
+ fi
+ 
+@@ -16720,189 +9753,37 @@ fi
+ done
+ 
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether strerror_r is declared" >&5
+-$as_echo_n "checking whether strerror_r is declared... " >&6; }
+-if test "${ac_cv_have_decl_strerror_r+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
+-int
+-main ()
+-{
+-#ifndef strerror_r
+-  (void) strerror_r;
+-#endif
+-
+-  ;
+-  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_have_decl_strerror_r=yes
 +ac_fn_c_check_decl "$LINENO" "strerror_r" "ac_cv_have_decl_strerror_r" "$ac_includes_default"
 +if test "x$ac_cv_have_decl_strerror_r" = x""yes; then :
 +  ac_have_decl=1
-+else
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_have_decl_strerror_r=no
 +  ac_have_decl=0
-+fi
-+
-+cat >>confdefs.h <<_ACEOF
+ fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_have_decl_strerror_r" >&5
+-$as_echo "$ac_cv_have_decl_strerror_r" >&6; }
+-if test "x$ac_cv_have_decl_strerror_r" = x""yes; then
+-
+ cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_STRERROR_R 1
 +#define HAVE_DECL_STRERROR_R $ac_have_decl
-+_ACEOF
-+
-+for ac_func in strerror_r
+ _ACEOF
+ 
+-
+-else
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_DECL_STRERROR_R 0
+-_ACEOF
+-
+-
+-fi
+-
+-
+-
+ for ac_func in strerror_r
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  ac_fn_c_check_func "$LINENO" "strerror_r" "ac_cv_func_strerror_r"
 +if test "x$ac_cv_func_strerror_r" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_STRERROR_R 1
-+_ACEOF
-+
-+fi
-+done
-+
+ _ACEOF
+ 
+ fi
+ done
+ 
+-{ $as_echo "$as_me:$LINENO: checking whether strerror_r returns char *" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strerror_r returns char *" >&5
-+$as_echo_n "checking whether strerror_r returns char *... " >&6; }
+ $as_echo_n "checking whether strerror_r returns char *... " >&6; }
+-if test "${ac_cv_func_strerror_r_char_p+set}" = set; then
 +if test "${ac_cv_func_strerror_r_char_p+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+
-+    ac_cv_func_strerror_r_char_p=no
-+    if test $ac_cv_have_decl_strerror_r = yes; then
+   $as_echo_n "(cached) " >&6
+ else
+ 
+     ac_cv_func_strerror_r_char_p=no
+     if test $ac_cv_have_decl_strerror_r = yes; then
+-      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
-+main ()
-+{
-+
-+	  char buf[100];
-+	  char x = *strerror_r (0, buf, sizeof buf);
-+	  char *p = strerror_r (0, buf, sizeof buf);
-+	  return !p || x;
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ int
+@@ -16918,32 +9799,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 :
-+  ac_cv_func_strerror_r_char_p=yes
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+    else
-+      # strerror_r is not declared.  Choose between
-+      # systems that have relatively inaccessible declarations for the
-+      # function.  BeOS and DEC UNIX 4.0 fall in this category, but the
-+      # former has a strerror_r that returns char*, while the latter
-+      # has a strerror_r that returns `int'.
-+      # This test should segfault on the DEC system.
+   ac_cv_func_strerror_r_char_p=yes
+-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
+       # strerror_r is not declared.  Choose between
+@@ -16952,14 +9810,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+       # former has a strerror_r that returns char*, while the latter
+       # has a strerror_r that returns `int'.
+       # This test should segfault on the DEC system.
+-      if test "$cross_compiling" = yes; then
 +      if test "$cross_compiling" = yes; then :
-+  :
-+else
+   :
+ 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
-+	extern char *strerror_r ();
-+int
-+main ()
-+{
-+char buf[100];
-+	  char x = *strerror_r (0, buf, sizeof buf);
-+	  return ! isalpha (x);
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+ 	extern char *strerror_r ();
+@@ -16973,165 +9827,42 @@ char buf[100];
+   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_func_strerror_r_char_p=yes
-+fi
+   ac_cv_func_strerror_r_char_p=yes
+-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
+-
+ 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
+ fi
+ 
+-
+     fi
+ 
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_func_strerror_r_char_p" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_strerror_r_char_p" >&5
-+$as_echo "$ac_cv_func_strerror_r_char_p" >&6; }
-+if test $ac_cv_func_strerror_r_char_p = yes; then
-+
+ $as_echo "$ac_cv_func_strerror_r_char_p" >&6; }
+ if test $ac_cv_func_strerror_r_char_p = yes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define STRERROR_R_CHAR_P 1
+-_ACEOF
 +$as_echo "#define STRERROR_R_CHAR_P 1" >>confdefs.h
-+
-+fi
-+
-+for ac_func in strftime
+ 
+ fi
+ 
+-
+ for ac_func in strftime
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  ac_fn_c_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
 +if test "x$ac_cv_func_strftime" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_STRFTIME 1
-+_ACEOF
-+
-+else
-+  # strftime is in -lintl on SCO UNIX.
+ _ACEOF
+ 
+ else
+   # strftime is in -lintl on SCO UNIX.
+-{ $as_echo "$as_me:$LINENO: checking for strftime in -lintl" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
-+$as_echo_n "checking for strftime in -lintl... " >&6; }
+ $as_echo_n "checking for strftime in -lintl... " >&6; }
+-if test "${ac_cv_lib_intl_strftime+set}" = set; then
 +if test "${ac_cv_lib_intl_strftime+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lintl  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lintl  $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.
-+   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 strftime ();
-+int
-+main ()
-+{
-+return strftime ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17149,46 +9880,19 @@ return strftime ();
+   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_intl_strftime=yes
-+else
+   ac_cv_lib_intl_strftime=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_intl_strftime=no
 +  ac_cv_lib_intl_strftime=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
-+$as_echo "$ac_cv_lib_intl_strftime" >&6; }
+ $as_echo "$ac_cv_lib_intl_strftime" >&6; }
+-if test "x$ac_cv_lib_intl_strftime" = x""yes; then
+-  cat >>confdefs.h <<\_ACEOF
+-#define HAVE_STRFTIME 1
+-_ACEOF
 +if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
 +  $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
-+
-+LIBS="-lintl $LIBS"
-+fi
-+
-+fi
-+done
-+
-+
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+
-+for ac_func in gethostname gettimeofday localtime_r memmove memset
+ 
+ LIBS="-lintl $LIBS"
+ fi
+@@ -17205,547 +9909,75 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+ 
+ 
+-
+-
+-
+-
+-
+ for ac_func in gethostname gettimeofday localtime_r memmove memset
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+  as_fn_error "required library function not found" "$LINENO" 5
-+fi
-+done
-+
-+for ac_func in regcomp select strcasecmp strchr strdup strerror strncasecmp
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required library function not found" >&5
+-$as_echo "$as_me: error: required library function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required library function not found" "$LINENO" 5
+ fi
+ done
+ 
+-
+-
+-
+-
+-
+-
+-
+ for ac_func in regcomp select strcasecmp strchr strdup strerror strncasecmp
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+  as_fn_error "required library function not found" "$LINENO" 5
-+fi
-+done
-+
-+for ac_func in strrchr strstr strtol strtoul uname
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required library function not found" >&5
+-$as_echo "$as_me: error: required library function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required library function not found" "$LINENO" 5
+ fi
+ done
+ 
+-
+-
+-
+-
+-
+ for ac_func in strrchr strstr strtol strtoul uname
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+  as_fn_error "required library function not found" "$LINENO" 5
-+fi
-+done
-+
-+
-+for ac_func in sigaction sigprocmask
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required library function not found" >&5
+-$as_echo "$as_me: error: required library function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required library function not found" "$LINENO" 5
+ fi
+ done
+ 
+ 
+-
+-
+ for ac_func in sigaction sigprocmask
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+  as_fn_error "required library function not found" "$LINENO" 5
-+fi
-+done
-+
-+
-+for ac_func in ioctl tolower toupper
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required library function not found" >&5
+-$as_echo "$as_me: error: required library function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required library function not found" "$LINENO" 5
+ fi
+ done
+ 
+ 
+-
+-
+-
+ for ac_func in ioctl tolower toupper
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 +ac_fn_cxx_check_func "$LINENO" "$ac_func" "$as_ac_var"
-+eval as_val=\$$as_ac_var
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+_ACEOF
-+
-+else
-+  as_fn_error "required library function not found" "$LINENO" 5
-+fi
-+done
-+
-+
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required library function not found" >&5
+-$as_echo "$as_me: error: required library function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required library function not found" "$LINENO" 5
+ fi
+ done
+ 
+@@ -17777,13 +10009,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_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
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
+       esac ;;
+     esac
+   done
+@@ -17791,8 +10023,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+   (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"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+@@ -17815,129 +10047,34 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ 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: 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
-+rm -f confcache
-+
-+for ac_func in inet_ntoa
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+ rm -f confcache
+ 
+-
+ for ac_func in inet_ntoa
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  ac_fn_cxx_check_func "$LINENO" "inet_ntoa" "ac_cv_func_inet_ntoa"
 +if test "x$ac_cv_func_inet_ntoa" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_INET_NTOA 1
-+_ACEOF
-+
-+else
-+
+ _ACEOF
+ 
+ else
+ 
+-
+-{ $as_echo "$as_me:$LINENO: checking for inet_ntoa in -lnsl" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inet_ntoa in -lnsl" >&5
-+$as_echo_n "checking for inet_ntoa in -lnsl... " >&6; }
+ $as_echo_n "checking for inet_ntoa in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then
 +if test "${ac_cv_lib_nsl_inet_ntoa+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* 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 inet_ntoa ();
-+int
-+main ()
-+{
-+return inet_ntoa ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -17955,43 +10092,18 @@ return inet_ntoa ();
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_nsl_inet_ntoa=yes
-+else
+   ac_cv_lib_nsl_inet_ntoa=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_nsl_inet_ntoa=no
 +  ac_cv_lib_nsl_inet_ntoa=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_inet_ntoa" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_inet_ntoa" >&5
-+$as_echo "$ac_cv_lib_nsl_inet_ntoa" >&6; }
+ $as_echo "$ac_cv_lib_nsl_inet_ntoa" >&6; }
+-if test "x$ac_cv_lib_nsl_inet_ntoa" = x""yes; then
 +if test "x$ac_cv_lib_nsl_inet_ntoa" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL 1
-+_ACEOF
-+
-+  LIBS="-lnsl $LIBS"
-+
-+else
-+
-+                                    as_fn_error "required library function not found" "$LINENO" 5
-+
-+fi
-+
-+
-+fi
-+done
-+
-+
-+for ac_func in socket
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNSL 1
+ _ACEOF
+@@ -18000,9 +10112,7 @@ _ACEOF
+ 
+ else
+ 
+-                                    { { $as_echo "$as_me:$LINENO: error: required library function not found" >&5
+-$as_echo "$as_me: error: required library function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++                                    as_fn_error $? "required library function not found" "$LINENO" 5
+ 
+ fi
+ 
+@@ -18011,118 +10121,23 @@ fi
+ done
+ 
+ 
+-
+ for ac_func in socket
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  ac_fn_cxx_check_func "$LINENO" "socket" "ac_cv_func_socket"
 +if test "x$ac_cv_func_socket" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_SOCKET 1
-+_ACEOF
-+
-+else
+ _ACEOF
+ 
+ else
+-
+-{ $as_echo "$as_me:$LINENO: checking for socket in -lsocket" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for socket in -lsocket" >&5
-+$as_echo_n "checking for socket in -lsocket... " >&6; }
+ $as_echo_n "checking for socket in -lsocket... " >&6; }
+-if test "${ac_cv_lib_socket_socket+set}" = set; then
 +if test "${ac_cv_lib_socket_socket+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsocket  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsocket  $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.
-+   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 socket ();
-+int
-+main ()
-+{
-+return socket ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -18140,43 +10155,18 @@ return socket ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_socket_socket=yes
-+else
+   ac_cv_lib_socket_socket=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_socket_socket=no
 +  ac_cv_lib_socket_socket=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_socket" >&5
-+$as_echo "$ac_cv_lib_socket_socket" >&6; }
+ $as_echo "$ac_cv_lib_socket_socket" >&6; }
+-if test "x$ac_cv_lib_socket_socket" = x""yes; then
 +if test "x$ac_cv_lib_socket_socket" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBSOCKET 1
-+_ACEOF
-+
-+  LIBS="-lsocket $LIBS"
-+
-+else
-+
-+                                    as_fn_error "required library function not found" "$LINENO" 5
-+
-+fi
-+
-+
-+fi
-+done
-+
-+
-+
-+
-+for ac_func in gethostbyname
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBSOCKET 1
+ _ACEOF
+@@ -18185,9 +10175,7 @@ _ACEOF
+ 
+ else
+ 
+-                                    { { $as_echo "$as_me:$LINENO: error: required library function not found" >&5
+-$as_echo "$as_me: error: required library function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++                                    as_fn_error $? "required library function not found" "$LINENO" 5
+ 
+ fi
+ 
+@@ -18198,119 +10186,24 @@ done
+ 
+ 
+ 
+-
+ for ac_func in gethostbyname
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  ac_fn_cxx_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname"
 +if test "x$ac_cv_func_gethostbyname" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_GETHOSTBYNAME 1
-+_ACEOF
-+
-+else
-+
+ _ACEOF
+ 
+ else
+ 
+-
+-{ $as_echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5
-+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+ $as_echo_n "checking for gethostbyname in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char gethostbyname ();
-+int
-+main ()
-+{
-+return gethostbyname ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -18328,43 +10221,18 @@ return gethostbyname ();
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_nsl_gethostbyname=yes
-+else
+   ac_cv_lib_nsl_gethostbyname=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_nsl_gethostbyname=no
 +  ac_cv_lib_nsl_gethostbyname=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5
-+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+ $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; }
+-if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then
 +if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL 1
-+_ACEOF
-+
-+  LIBS="-lnsl $LIBS"
-+
-+else
-+
-+                                    as_fn_error "required library function not found" "$LINENO" 5
-+
-+fi
-+
-+
-+fi
-+done
-+
-+
-+if test $DARWIN_OS -eq 1 ; then
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNSL 1
+ _ACEOF
+@@ -18373,9 +10241,7 @@ _ACEOF
+ 
+ else
+ 
+-                                    { { $as_echo "$as_me:$LINENO: error: required library function not found" >&5
+-$as_echo "$as_me: error: required library function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++                                    as_fn_error $? "required library function not found" "$LINENO" 5
+ 
+ fi
+ 
+@@ -18385,10 +10251,10 @@ done
+ 
+ 
+ if test $DARWIN_OS -eq 1 ; then
+-        { $as_echo "$as_me:$LINENO: You are running OSX, assuming threadsafe gethostbyname version" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: You are running OSX, assuming threadsafe gethostbyname version" >&5
-+$as_echo "$as_me: You are running OSX, assuming threadsafe gethostbyname version" >&6;}
-+elif test $CYGWIN_OS -eq 1; then
+ $as_echo "$as_me: You are running OSX, assuming threadsafe gethostbyname version" >&6;}
+ elif test $CYGWIN_OS -eq 1; then
+-        { $as_echo "$as_me:$LINENO: Your are building under Cygwin, assuming threadsafe gethostbyname implementation" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Your are building under Cygwin, assuming threadsafe gethostbyname implementation" >&5
-+$as_echo "$as_me: Your are building under Cygwin, assuming threadsafe gethostbyname implementation" >&6;}
-+fi
-+
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ $as_echo "$as_me: Your are building under Cygwin, assuming threadsafe gethostbyname implementation" >&6;}
+ fi
+ 
+@@ -18397,10 +10263,10 @@ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+-{ $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; }
-+if test -z "$CXXCPP"; then
+ $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+ if test -z "$CXXCPP"; then
+-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
 +  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+      # Double quotes because CXXCPP needs to be expanded
-+    for CXXCPP in "$CXX -E" "/lib/cpp"
-+    do
-+      ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
+   $as_echo_n "(cached) " >&6
+ else
+       # Double quotes because CXXCPP needs to be expanded
+@@ -18415,11 +10281,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>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -18428,78 +10290,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_cxx_preproc_warn_flag$ac_cxx_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_cxx_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.
+   # Broken: fails on valid input.
+ continue
+ fi
+-
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i 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
+ /* 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_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # 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
+   # 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
++rm -f conftest.err conftest.i 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
++rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
-+  break
-+fi
-+
-+    done
-+    ac_cv_prog_CXXCPP=$CXXCPP
-+
-+fi
-+  CXXCPP=$ac_cv_prog_CXXCPP
-+else
-+  ac_cv_prog_CXXCPP=$CXXCPP
-+fi
+   break
+ fi
+ 
+@@ -18511,7 +10329,7 @@ fi
+ else
+   ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $CXXCPP" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-+$as_echo "$CXXCPP" >&6; }
-+ac_preproc_ok=false
-+for ac_cxx_preproc_warn_flag in '' yes
-+do
-+  # Use a header file that comes with gcc, so configuring glibc
-+  # with a fresh cross-compiler works.
-+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-+  # <limits.h> exists even on freestanding compilers.
-+  # On the NeXT, cc -E runs the code through the compiler's parser,
-+  # not just through cpp. "Syntax error" is here to catch this case.
+ $as_echo "$CXXCPP" >&6; }
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -18522,11 +10340,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>
-+#else
-+# include <assert.h>
-+#endif
-+		     Syntax error
-+_ACEOF
+ /* end confdefs.h.  */
+ #ifdef __STDC__
+ # include <limits.h>
+@@ -18535,87 +10349,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_cxx_preproc_warn_flag$ac_cxx_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_cxx_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.
+   # Broken: fails on valid input.
+ continue
+ fi
+-
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i 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
+ /* 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_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       }; then
 +if ac_fn_cxx_try_cpp "$LINENO"; then :
-+  # Broken: success on invalid input.
-+continue
-+else
-+  # 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
+   # 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
++rm -f conftest.err conftest.i 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
+-  :
++rm -f conftest.i conftest.err conftest.$ac_ext
 +if $ac_preproc_ok; then :
 +
-+else
+ 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_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check
-+See \`config.log' for more details." "$LINENO" 5; }
-+fi
-+
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+for ac_func in gethostbyname_r
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ { $as_echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+-See \`config.log' for more details." >&5
+-$as_echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
+-See \`config.log' for more details." >&2;}
+-   { (exit 1); exit 1; }; }; }
++as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ 
+ ac_ext=cpp
+@@ -18625,265 +10392,32 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+ 
+-
+ for ac_func in gethostbyname_r
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  ac_fn_cxx_check_func "$LINENO" "gethostbyname_r" "ac_cv_func_gethostbyname_r"
 +if test "x$ac_cv_func_gethostbyname_r" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_GETHOSTBYNAME_R 1
-+_ACEOF
-+
-+else
-+
+ _ACEOF
+ 
+ else
+ 
+-
+-for ac_header in lwres/netdb.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_cxx_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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
 +            for ac_header in lwres/netdb.h
 +do :
 +  ac_fn_cxx_check_header_mongrel "$LINENO" "lwres/netdb.h" "ac_cv_header_lwres_netdb_h" "$ac_includes_default"
 +if test "x$ac_cv_header_lwres_netdb_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_LWRES_NETDB_H 1
-+_ACEOF
-+
+ _ACEOF
+ 
+-                    { $as_echo "$as_me:$LINENO: checking for lwres_gethostbyname_r in -llwres" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lwres_gethostbyname_r in -llwres" >&5
-+$as_echo_n "checking for lwres_gethostbyname_r in -llwres... " >&6; }
+ $as_echo_n "checking for lwres_gethostbyname_r in -llwres... " >&6; }
+-if test "${ac_cv_lib_lwres_lwres_gethostbyname_r+set}" = set; then
 +if test "${ac_cv_lib_lwres_lwres_gethostbyname_r+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-llwres  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-llwres  $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.
-+   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 lwres_gethostbyname_r ();
-+int
-+main ()
-+{
-+return lwres_gethostbyname_r ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -18901,65 +10435,34 @@ return lwres_gethostbyname_r ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_lwres_lwres_gethostbyname_r=yes
-+else
+   ac_cv_lib_lwres_lwres_gethostbyname_r=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_lwres_lwres_gethostbyname_r=no
 +  ac_cv_lib_lwres_lwres_gethostbyname_r=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_lwres_lwres_gethostbyname_r" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lwres_lwres_gethostbyname_r" >&5
-+$as_echo "$ac_cv_lib_lwres_lwres_gethostbyname_r" >&6; }
+ $as_echo "$ac_cv_lib_lwres_lwres_gethostbyname_r" >&6; }
+-if test "x$ac_cv_lib_lwres_lwres_gethostbyname_r" = x""yes; then
 +if test "x$ac_cv_lib_lwres_lwres_gethostbyname_r" = x""yes; then :
-+
-+                                    LWRES_LIBS="-llwres"
-+
+ 
+                                     LWRES_LIBS="-llwres"
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBLWRES 1
+-_ACEOF
 +$as_echo "#define HAVE_LIBLWRES 1" >>confdefs.h
-+
-+
-+
-+else
-+  as_fn_error "required library function not found" "$LINENO" 5
-+fi
-+
-+
-+else
-+
-+                    if ((test $DARWIN_OS -eq 0) && (test $CYGWIN_OS -eq 0) && (test $OPENBSD_OS -eq 0)) ; then
-+                        as_fn_error "required header not found" "$LINENO" 5
-+                    fi
-+
-+fi
-+
-+done
-+
-+
-+fi
-+done
-+
-+
-+for ac_func in if_nameindex
+ 
+ 
+ 
+ else
+-  { { $as_echo "$as_me:$LINENO: error: required library function not found" >&5
+-$as_echo "$as_me: error: required library function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "required library function not found" "$LINENO" 5
+ fi
+ 
+ 
+ else
+ 
+                     if ((test $DARWIN_OS -eq 0) && (test $CYGWIN_OS -eq 0) && (test $OPENBSD_OS -eq 0)) ; then
+-                        { { $as_echo "$as_me:$LINENO: error: required header not found" >&5
+-$as_echo "$as_me: error: required header not found" >&2;}
+-   { (exit 1); exit 1; }; }
++                        as_fn_error $? "required header not found" "$LINENO" 5
+                     fi
+ 
+ fi
+@@ -18971,118 +10474,24 @@ fi
+ done
+ 
+ 
+-
+ for ac_func in if_nameindex
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  ac_fn_cxx_check_func "$LINENO" "if_nameindex" "ac_cv_func_if_nameindex"
 +if test "x$ac_cv_func_if_nameindex" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_IF_NAMEINDEX 1
-+_ACEOF
-+
-+else
-+
+ _ACEOF
+ 
+ else
+ 
+-            { $as_echo "$as_me:$LINENO: checking for if_nameindex in -lnsl" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_nameindex in -lnsl" >&5
-+$as_echo_n "checking for if_nameindex in -lnsl... " >&6; }
+ $as_echo_n "checking for if_nameindex in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_if_nameindex+set}" = set; then
 +if test "${ac_cv_lib_nsl_if_nameindex+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* 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 if_nameindex ();
-+int
-+main ()
-+{
-+return if_nameindex ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -19100,43 +10509,18 @@ return if_nameindex ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_nsl_if_nameindex=yes
-+else
+   ac_cv_lib_nsl_if_nameindex=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_nsl_if_nameindex=no
 +  ac_cv_lib_nsl_if_nameindex=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_if_nameindex" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_if_nameindex" >&5
-+$as_echo "$ac_cv_lib_nsl_if_nameindex" >&6; }
+ $as_echo "$ac_cv_lib_nsl_if_nameindex" >&6; }
+-if test "x$ac_cv_lib_nsl_if_nameindex" = x""yes; then
 +if test "x$ac_cv_lib_nsl_if_nameindex" = x""yes; then :
-+
-+                    NSL_LIBS="-lnsl"
-+
-+
-+else
-+
-+                    if test $CYGWIN_OS -eq 0; then
-+                        as_fn_error "required library function not found" "$LINENO" 5
-+                    fi
-+
-+
-+fi
-+
-+
-+
-+fi
-+done
-+
-+
-+for ac_func in if_freenameindex
+ 
+                     NSL_LIBS="-lnsl"
+ 
+@@ -19144,9 +10528,7 @@ if test "x$ac_cv_lib_nsl_if_nameindex" = x""yes; then
+ else
+ 
+                     if test $CYGWIN_OS -eq 0; then
+-                        { { $as_echo "$as_me:$LINENO: error: required library function not found" >&5
+-$as_echo "$as_me: error: required library function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++                        as_fn_error $? "required library function not found" "$LINENO" 5
+                     fi
+ 
+ 
+@@ -19158,119 +10540,24 @@ fi
+ done
+ 
+ 
+-
+ for ac_func in if_freenameindex
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +do :
 +  ac_fn_cxx_check_func "$LINENO" "if_freenameindex" "ac_cv_func_if_freenameindex"
 +if test "x$ac_cv_func_if_freenameindex" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_IF_FREENAMEINDEX 1
-+_ACEOF
-+
-+else
-+
+ _ACEOF
+ 
+ else
+ 
+-
+-{ $as_echo "$as_me:$LINENO: checking for if_freenameindex in -lnsl" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for if_freenameindex in -lnsl" >&5
-+$as_echo_n "checking for if_freenameindex in -lnsl... " >&6; }
+ $as_echo_n "checking for if_freenameindex in -lnsl... " >&6; }
+-if test "${ac_cv_lib_nsl_if_freenameindex+set}" = set; then
 +if test "${ac_cv_lib_nsl_if_freenameindex+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnsl  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lnsl  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* 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 if_freenameindex ();
-+int
-+main ()
-+{
-+return if_freenameindex ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -19288,43 +10575,18 @@ return if_freenameindex ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_nsl_if_freenameindex=yes
-+else
+   ac_cv_lib_nsl_if_freenameindex=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_nsl_if_freenameindex=no
 +  ac_cv_lib_nsl_if_freenameindex=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_if_freenameindex" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_if_freenameindex" >&5
-+$as_echo "$ac_cv_lib_nsl_if_freenameindex" >&6; }
+ $as_echo "$ac_cv_lib_nsl_if_freenameindex" >&6; }
+-if test "x$ac_cv_lib_nsl_if_freenameindex" = x""yes; then
 +if test "x$ac_cv_lib_nsl_if_freenameindex" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBNSL 1
-+_ACEOF
-+
-+  LIBS="-lnsl $LIBS"
-+
-+else
-+
-+                    if ((test $CYGWIN_OS -eq 0) && (test $OPENBSD_OS -eq 0)); then
-+                        as_fn_error "required library function not found" "$LINENO" 5
-+                    fi
-+
-+
-+fi
-+
-+
-+
-+fi
-+done
-+
-+
-+
-+# this is not optional, we need the device and the internal webserver
-+
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBNSL 1
+ _ACEOF
+@@ -19334,9 +10596,7 @@ _ACEOF
+ else
+ 
+                     if ((test $CYGWIN_OS -eq 0) && (test $OPENBSD_OS -eq 0)); then
+-                        { { $as_echo "$as_me:$LINENO: error: required library function not found" >&5
+-$as_echo "$as_me: error: required library function not found" >&2;}
+-   { (exit 1); exit 1; }; }
++                        as_fn_error $? "required library function not found" "$LINENO" 5
+                     fi
+ 
+ 
+@@ -19351,14 +10611,10 @@ done
+ 
+ # this is not optional, we need the device and the internal webserver
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define UPNP_HAVE_DEVICE 1
+-_ACEOF
 +$as_echo "#define UPNP_HAVE_DEVICE 1" >>confdefs.h
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define UPNP_HAVE_WEBSERVER 1
+-_ACEOF
 +$as_echo "#define UPNP_HAVE_WEBSERVER 1" >>confdefs.h
-+
-+
-+
-+ADD_PTHREAD_CFLAGS=
-+
-+# see acinclude.m4 for the definition of ACX_PTHREAD
-+if test "x$PTHREAD_LIB_OPTION_ENABLED" = xyes; then
-+
-+
-+    mt_pthread_arg_default=yes
-+    mt_pthread_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-pthread-libs was given.
+ 
+ 
+ 
+@@ -19379,10 +10635,10 @@ if test "x$PTHREAD_LIB_OPTION_ENABLED" = xyes; then
+ 
+ 
+ # Check whether --with-pthread-libs was given.
+-if test "${with_pthread_libs+set}" = set; then
 +if test "${with_pthread_libs+set}" = set; then :
-+  withval=$with_pthread_libs;
-+            mt_pthread_search_libs="$withval"
+   withval=$with_pthread_libs;
+             mt_pthread_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for pthread libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for pthread libs in $withval" >&5
-+$as_echo "$as_me: Will search for pthread libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_pthread_search_libs" ; then
-+        unset ac_cv_lib_pthread_pthread_create
-+        LDFLAGS="$LDFLAGS -L$mt_pthread_search_libs"
+ $as_echo "$as_me: Will search for pthread libs in $withval" >&6;}
+ 
+ 
+@@ -19392,18 +10648,14 @@ fi
+     if test "$mt_pthread_search_libs" ; then
+         unset ac_cv_lib_pthread_pthread_create
+         LDFLAGS="$LDFLAGS -L$mt_pthread_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+ $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
 +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpthread  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pthread_create ();
-+int
-+main ()
-+{
-+return pthread_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -19421,43 +10673,18 @@ return pthread_create ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_pthread_pthread_create=yes
-+else
+   ac_cv_lib_pthread_pthread_create=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_pthread_pthread_create=no
 +  ac_cv_lib_pthread_pthread_create=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+ $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
 +if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
-+
-+                mt_pthread_libs="-lpthread"
-+                mt_pthread_ldflags="-L$mt_pthread_search_libs"
-+
-+else
-+
-+                mt_pthread_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_pthread_libs="-lpthread"
+                 mt_pthread_ldflags="-L$mt_pthread_search_libs"
+@@ -19466,12 +10693,10 @@ else
+ 
+                 mt_pthread_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: pthread library not found in requested location $mt_pthread_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: pthread library not found in requested location $mt_pthread_search_libs" >&5
-+$as_echo "$as_me: pthread library not found in requested location $mt_pthread_search_libs" >&6;}
-+                else
-+                    as_fn_error "pthread library not found in requested location $mt_pthread_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_pthread_pthread_create
+ $as_echo "$as_me: pthread library not found in requested location $mt_pthread_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: pthread library not found in requested location $mt_pthread_search_libs" >&5
+-$as_echo "$as_me: error: pthread library not found in requested location $mt_pthread_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "pthread library not found in requested location $mt_pthread_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -19479,18 +10704,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_pthread_pthread_create
+-        { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+ $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
 +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpthread  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pthread_create ();
-+int
-+main ()
-+{
-+return pthread_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -19508,43 +10729,18 @@ return pthread_create ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_pthread_pthread_create=yes
-+else
+   ac_cv_lib_pthread_pthread_create=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_pthread_pthread_create=no
 +  ac_cv_lib_pthread_pthread_create=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+ $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
 +if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
-+
-+                mt_pthread_libs="-lpthread"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_pthread_pthread_create
+ 
+                 mt_pthread_libs="-lpthread"
+ 
+@@ -19552,18 +10748,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_pthread_pthread_create
+-                { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
-+$as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+ $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
+-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
 +if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lpthread  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lpthread  $LIBS"
+-cat >conftest.$ac_ext <<_ACEOF
+-/* confdefs.h.  */
+-_ACEOF
+-cat confdefs.h >>conftest.$ac_ext
+-cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pthread_create ();
-+int
-+main ()
-+{
-+return pthread_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -19581,43 +10773,18 @@ return pthread_create ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_pthread_pthread_create=yes
-+else
+   ac_cv_lib_pthread_pthread_create=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_pthread_pthread_create=no
 +  ac_cv_lib_pthread_pthread_create=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
-+$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+ $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
+-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
 +if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
-+
-+                        mt_pthread_libs="-lpthread"
-+                        mt_pthread_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_pthread_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_pthread_library_status" != xyes; then
-+        mt_pthread_libs=""
-+        mt_pthread_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+
-+    PTHREAD_LIBS=${mt_pthread_libs}
-+    PTHREAD_LDFLAGS=${mt_pthread_ldflags}
-+    PTHREAD_STATUS=${mt_pthread_library_status}
-+
-+
-+
-+
-+
-+    if test "x$PTHREAD_STATUS" != xyes; then
-+        as_fn_error "pthread library not found, try running configure without the --enable-pthread-lib option" "$LINENO" 5
-+    fi
-+else
-+
-+
-+
-+ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+acx_pthread_ok=no
-+
-+# We used to check for pthread.h first, but this fails if pthread.h
-+# requires special compiler flags (e.g. on True64 or Sequent).
-+# It gets checked for in the link test anyway.
-+
-+# First of all, check if the user has set any of the PTHREAD_LIBS,
-+# etcetera environment variables, and if threads linking works using
-+# them:
-+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        save_LIBS="$LIBS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
+ 
+                         mt_pthread_libs="-lpthread"
+                         mt_pthread_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -19656,9 +10823,7 @@ fi
+ 
+ 
+     if test "x$PTHREAD_STATUS" != xyes; then
+-        { { $as_echo "$as_me:$LINENO: error: pthread library not found, try running configure without the --enable-pthread-lib option" >&5
+-$as_echo "$as_me: error: pthread library not found, try running configure without the --enable-pthread-lib option" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "pthread library not found, try running configure without the --enable-pthread-lib option" "$LINENO" 5
+     fi
+ else
+ 
+@@ -19684,13 +10849,9 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+         save_LIBS="$LIBS"
+         LIBS="$PTHREAD_LIBS $LIBS"
+-        { $as_echo "$as_me:$LINENO: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS" >&5
-+$as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; }
+ $as_echo_n "checking for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS... " >&6; }
+-        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.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char pthread_join ();
-+int
-+main ()
-+{
-+return pthread_join ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -19708,39 +10869,12 @@ return pthread_join ();
+   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 :
-+  acx_pthread_ok=yes
-+fi
+   acx_pthread_ok=yes
+-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
+-        { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5
-+$as_echo "$acx_pthread_ok" >&6; }
-+        if test x"$acx_pthread_ok" = xno; then
-+                PTHREAD_LIBS=""
-+                PTHREAD_CFLAGS=""
-+        fi
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+fi
-+
-+# We must check for the threads library under a number of different
-+# names; the ordering is very important because some systems
-+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
-+# libraries is broken (non-POSIX).
-+
-+# Create a list of thread flags to try.  Items starting with a "-" are
-+# C compiler flags, and other items are library names, except for "none"
-+# which indicates that we try without any flags at all, and "pthread-config"
-+# which is a program returning the flags for the Pth emulation library.
-+
-+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
-+
-+# The ordering *is* (sometimes) important.  Some notes on the
-+# individual items follow:
-+
-+# pthreads: AIX (must check this before -lpthread)
-+# none: in case threads are in libc; should be tried before -Kthread and
-+#       other compiler flags to prevent continual compiler warnings
-+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
-+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
-+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
-+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
-+# -pthreads: Solaris/gcc
-+# -mthreads: Mingw32/gcc, Lynx/gcc
-+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
-+#      doesn't hurt to check since this sometimes defines pthreads too;
-+#      also defines -D_REENTRANT)
-+#      ... -mt is also the pthreads flag for HP/aCC
-+# pthread: Linux, etcetera
-+# --thread-safe: KAI C++
-+# pthread-config: use pthread-config program (for GNU Pth library)
-+
-+case "${host_cpu}-${host_os}" in
-+        *solaris*)
-+
-+        # On Solaris (at least, for some versions), libc contains stubbed
-+        # (non-functional) versions of the pthreads routines, so link-based
-+        # tests will erroneously succeed.  (We need to link with -pthreads/-mt/
-+        # -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
-+        # a function called by this macro, so we could check for that, but
-+        # who knows whether they'll stub that too in a future libc.)  So,
-+        # we'll just look for -pthreads and -lpthread first:
-+
-+        acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
-+        ;;
-+esac
-+
-+if test x"$acx_pthread_ok" = xno; then
-+for flag in $acx_pthread_flags; do
-+
-+        case $flag in
-+                none)
+ $as_echo "$acx_pthread_ok" >&6; }
+         if test x"$acx_pthread_ok" = xno; then
+                 PTHREAD_LIBS=""
+@@ -19802,12 +10936,12 @@ for flag in $acx_pthread_flags; do
+ 
+         case $flag in
+                 none)
+-                { $as_echo "$as_me:$LINENO: checking whether pthreads work without any flags" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work without any flags" >&5
-+$as_echo_n "checking whether pthreads work without any flags... " >&6; }
-+                ;;
-+
-+                -*)
+ $as_echo_n "checking whether pthreads work without any flags... " >&6; }
+                 ;;
+ 
+                 -*)
+-                { $as_echo "$as_me:$LINENO: checking whether pthreads work with $flag" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether pthreads work with $flag" >&5
-+$as_echo_n "checking whether pthreads work with $flag... " >&6; }
-+                PTHREAD_CFLAGS="$flag"
-+                ;;
-+
-+                pthread-config)
-+                # Extract the first word of "pthread-config", so it can be a program name with args.
-+set dummy pthread-config; ac_word=$2
+ $as_echo_n "checking whether pthreads work with $flag... " >&6; }
+                 PTHREAD_CFLAGS="$flag"
+                 ;;
+@@ -19815,9 +10949,9 @@ $as_echo_n "checking whether pthreads work with $flag... " >&6; }
+                 pthread-config)
+                 # Extract the first word of "pthread-config", so it can be a program name with args.
+ set dummy pthread-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; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_acx_pthread_config+set}" = set; then
 +if test "${ac_cv_prog_acx_pthread_config+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$acx_pthread_config"; then
-+  ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$acx_pthread_config"; then
+@@ -19828,14 +10962,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_prog_acx_pthread_config="yes"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_acx_pthread_config="yes"
+-    $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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no"
-+fi
-+fi
-+acx_pthread_config=$ac_cv_prog_acx_pthread_config
-+if test -n "$acx_pthread_config"; then
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no"
+@@ -19843,10 +10977,10 @@ fi
+ fi
+ acx_pthread_config=$ac_cv_prog_acx_pthread_config
+ if test -n "$acx_pthread_config"; then
+-  { $as_echo "$as_me:$LINENO: result: $acx_pthread_config" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5
-+$as_echo "$acx_pthread_config" >&6; }
-+else
+ $as_echo "$acx_pthread_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
-+
-+
-+                if test x"$acx_pthread_config" = xno; then continue; fi
-+                PTHREAD_CFLAGS="`pthread-config --cflags`"
-+                PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
-+                ;;
-+
-+                *)
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -19857,7 +10991,7 @@ fi
+                 ;;
+ 
+                 *)
+-                { $as_echo "$as_me:$LINENO: checking for the pthreads library -l$flag" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5
-+$as_echo_n "checking for the pthreads library -l$flag... " >&6; }
-+                PTHREAD_LIBS="-l$flag"
-+                ;;
-+        esac
-+
-+        save_LIBS="$LIBS"
-+        save_CFLAGS="$CFLAGS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+
-+        # Check for various functions.  We must include pthread.h,
-+        # since some functions may be macros.  (On the Sequent, we
-+        # need a special flag -Kthread to make this header compile.)
-+        # We check for pthread_join because it is in -lpthread on IRIX
-+        # while pthread_create is in libc.  We check for pthread_attr_init
-+        # due to DEC craziness with -lpthreads.  We check for
-+        # pthread_cleanup_push because it is one of the few pthread
-+        # functions on Solaris that doesn't have a non-functional libc stub.
-+        # We try pthread_create on general principles.
+ $as_echo_n "checking for the pthreads library -l$flag... " >&6; }
+                 PTHREAD_LIBS="-l$flag"
+                 ;;
+@@ -19877,11 +11011,7 @@ $as_echo_n "checking for the pthreads library -l$flag... " >&6; }
+         # pthread_cleanup_push because it is one of the few pthread
+         # functions on Solaris that doesn't have a non-functional libc stub.
+         # We try pthread_create on general principles.
+-        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 <pthread.h>
-+int
-+main ()
-+{
-+pthread_t th; pthread_join(th, 0);
-+                     pthread_attr_init(0); pthread_cleanup_push(0, 0);
-+                     pthread_create(0,0,0,0); pthread_cleanup_pop(0);
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <pthread.h>
+ int
+@@ -19894,43 +11024,16 @@ pthread_t th; pthread_join(th, 0);
+   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 :
-+  acx_pthread_ok=yes
-+fi
+   acx_pthread_ok=yes
+-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
-+
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+
+ 
+         LIBS="$save_LIBS"
+         CFLAGS="$save_CFLAGS"
+ 
+-        { $as_echo "$as_me:$LINENO: result: $acx_pthread_ok" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5
-+$as_echo "$acx_pthread_ok" >&6; }
-+        if test "x$acx_pthread_ok" = xyes; then
-+                break;
-+        fi
-+
-+        PTHREAD_LIBS=""
-+        PTHREAD_CFLAGS=""
-+done
-+fi
-+
-+# Various other checks:
-+if test "x$acx_pthread_ok" = xyes; then
-+        save_LIBS="$LIBS"
-+        LIBS="$PTHREAD_LIBS $LIBS"
-+        save_CFLAGS="$CFLAGS"
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+
-+        # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+ $as_echo "$acx_pthread_ok" >&6; }
+         if test "x$acx_pthread_ok" = xyes; then
+                 break;
+@@ -19949,15 +11052,11 @@ if test "x$acx_pthread_ok" = xyes; then
+         CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ 
+         # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+-        { $as_echo "$as_me:$LINENO: checking for joinable pthread attribute" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5
-+$as_echo_n "checking for joinable pthread attribute... " >&6; }
-+        attr_name=unknown
-+        for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+ $as_echo_n "checking for joinable pthread attribute... " >&6; }
+         attr_name=unknown
+         for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+-            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 <pthread.h>
-+int
-+main ()
-+{
-+int attr=$attr; return attr;
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <pthread.h>
+ int
+@@ -19968,40 +11067,13 @@ int attr=$attr; return attr;
+   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 :
-+  attr_name=$attr; break
-+fi
+   attr_name=$attr; break
+-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
-+        done
+         done
+-        { $as_echo "$as_me:$LINENO: result: $attr_name" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5
-+$as_echo "$attr_name" >&6; }
-+        if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PTHREAD_CREATE_JOINABLE $attr_name
-+_ACEOF
-+
-+        fi
-+
+ $as_echo "$attr_name" >&6; }
+         if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+ 
+@@ -20011,14 +11083,14 @@ _ACEOF
+ 
+         fi
+ 
+-        { $as_echo "$as_me:$LINENO: checking if more special flags are required for pthreads" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5
-+$as_echo_n "checking if more special flags are required for pthreads... " >&6; }
-+        flag=no
-+        case "${host_cpu}-${host_os}" in
-+            *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
-+            *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
-+        esac
+ $as_echo_n "checking if more special flags are required for pthreads... " >&6; }
+         flag=no
+         case "${host_cpu}-${host_os}" in
+             *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+             *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+         esac
+-        { $as_echo "$as_me:$LINENO: result: ${flag}" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5
-+$as_echo "${flag}" >&6; }
-+        if test "x$flag" != xno; then
-+            PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
-+        fi
-+
-+        LIBS="$save_LIBS"
-+        CFLAGS="$save_CFLAGS"
-+
-+        # More AIX lossage: must compile with xlc_r or cc_r
-+        if test x"$GCC" != xyes; then
-+          for ac_prog in xlc_r cc_r
-+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 "${flag}" >&6; }
+         if test "x$flag" != xno; then
+             PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+@@ -20033,9 +11105,9 @@ $as_echo "${flag}" >&6; }
+ 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; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then
 +if test "${ac_cv_prog_PTHREAD_CC+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  if test -n "$PTHREAD_CC"; then
-+  ac_cv_prog_PTHREAD_CC="$PTHREAD_CC" # Let the user override the test.
-+else
-+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   if test -n "$PTHREAD_CC"; then
+@@ -20046,24 +11118,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_PTHREAD_CC="$ac_prog"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_prog_PTHREAD_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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+fi
-+fi
-+PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
-+if test -n "$PTHREAD_CC"; then
+ IFS=$as_save_IFS
+ 
+ fi
+ fi
+ PTHREAD_CC=$ac_cv_prog_PTHREAD_CC
+ if test -n "$PTHREAD_CC"; then
+-  { $as_echo "$as_me:$LINENO: result: $PTHREAD_CC" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_CC" >&5
-+$as_echo "$PTHREAD_CC" >&6; }
-+else
+ $as_echo "$PTHREAD_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
-+
-+
-+  test -n "$PTHREAD_CC" && break
-+done
-+test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}"
-+
-+        else
-+          PTHREAD_CC=$CC
-+        fi
-+else
-+        PTHREAD_CC="$CC"
-+fi
-+
-+
-+
-+
-+
-+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
-+if test x"$acx_pthread_ok" = xyes; then
-+
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -20086,16 +11158,12 @@ fi
+ # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+ if test x"$acx_pthread_ok" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_PTHREAD 1
+-_ACEOF
 +$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
-+
-+        :
-+else
-+        acx_pthread_ok=no
-+        as_fn_error "POSIX threads missing" "$LINENO" 5
-+fi
-+ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+
-+    if test $FREEBSD_OS -eq 1; then
-+        ADD_PTHREAD_CFLAGS="$PTHREAD_CFLAGS $PTHREAD_LIBS"
-+    fi
-+
-+    if test "x$STATIC_OPTION_ENABLED" = xyes; then
-+        CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-+        LIBS="$LIBS $PTHREAD_LIBS"
-+        CFLAGS_SAVE="$CFLAGS_SAVE $PTHREAD_CFLAGS"
-+        LIBS_SAVE="$LIBS_SAVE $PTHREAD_LIBS"
-+    fi
-+
-+
-+
-+fi
-+
-+unset LIBS
-+
-+# we might need librt for sqlite
-+
-+
-+    mt_rt_arg_default=yes
-+    mt_rt_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-rt-libs was given.
+ 
+         :
+ else
+         acx_pthread_ok=no
+-        { { $as_echo "$as_me:$LINENO: error: POSIX threads missing" >&5
+-$as_echo "$as_me: error: POSIX threads missing" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "POSIX threads missing" "$LINENO" 5
+ fi
+ ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -20136,10 +11204,10 @@ unset LIBS
+ 
+ 
+ # Check whether --with-rt-libs was given.
+-if test "${with_rt_libs+set}" = set; then
 +if test "${with_rt_libs+set}" = set; then :
-+  withval=$with_rt_libs;
-+            mt_rt_search_libs="$withval"
+   withval=$with_rt_libs;
+             mt_rt_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for rt libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for rt libs in $withval" >&5
-+$as_echo "$as_me: Will search for rt libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_rt_search_libs" ; then
-+        unset ac_cv_lib_rt_clock_gettime
-+        LDFLAGS="$LDFLAGS -L$mt_rt_search_libs"
+ $as_echo "$as_me: Will search for rt libs in $withval" >&6;}
+ 
+ 
+@@ -20149,18 +11217,14 @@ fi
+     if test "$mt_rt_search_libs" ; then
+         unset ac_cv_lib_rt_clock_gettime
+         LDFLAGS="$LDFLAGS -L$mt_rt_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-+$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
+ $as_echo_n "checking for clock_gettime in -lrt... " >&6; }
+-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
 +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrt  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $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.
-+   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 clock_gettime ();
-+int
-+main ()
-+{
-+return clock_gettime ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20178,43 +11242,18 @@ return clock_gettime ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_rt_clock_gettime=yes
-+else
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_rt_clock_gettime=no
 +  ac_cv_lib_rt_clock_gettime=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-+$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+ $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then
 +if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
-+
-+                mt_rt_libs="-lrt"
-+                mt_rt_ldflags="-L$mt_rt_search_libs"
-+
-+else
-+
-+                mt_rt_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_rt_libs="-lrt"
+                 mt_rt_ldflags="-L$mt_rt_search_libs"
+@@ -20223,12 +11262,10 @@ else
+ 
+                 mt_rt_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: rt library not found in requested location $mt_rt_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: rt library not found in requested location $mt_rt_search_libs" >&5
-+$as_echo "$as_me: rt library not found in requested location $mt_rt_search_libs" >&6;}
-+                else
-+                    as_fn_error "rt library not found in requested location $mt_rt_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_rt_clock_gettime
+ $as_echo "$as_me: rt library not found in requested location $mt_rt_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: rt library not found in requested location $mt_rt_search_libs" >&5
+-$as_echo "$as_me: error: rt library not found in requested location $mt_rt_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "rt library not found in requested location $mt_rt_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -20236,18 +11273,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_rt_clock_gettime
+-        { $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-+$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
+ $as_echo_n "checking for clock_gettime in -lrt... " >&6; }
+-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
 +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrt  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $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.
-+   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 clock_gettime ();
-+int
-+main ()
-+{
-+return clock_gettime ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20265,43 +11298,18 @@ return clock_gettime ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_rt_clock_gettime=yes
-+else
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_rt_clock_gettime=no
 +  ac_cv_lib_rt_clock_gettime=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-+$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+ $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then
 +if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
-+
-+                mt_rt_libs="-lrt"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_rt_clock_gettime
+ 
+                 mt_rt_libs="-lrt"
+ 
+@@ -20309,18 +11317,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_rt_clock_gettime
+-                { $as_echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-+$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
+ $as_echo_n "checking for clock_gettime in -lrt... " >&6; }
+-if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then
 +if test "${ac_cv_lib_rt_clock_gettime+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lrt  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lrt  $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.
-+   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 clock_gettime ();
-+int
-+main ()
-+{
-+return clock_gettime ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -20338,43 +11342,18 @@ return clock_gettime ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_rt_clock_gettime=yes
-+else
+   ac_cv_lib_rt_clock_gettime=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_rt_clock_gettime=no
 +  ac_cv_lib_rt_clock_gettime=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_rt_clock_gettime" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-+$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+ $as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
+-if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then
 +if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
-+
-+                        mt_rt_libs="-lrt"
-+                        mt_rt_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_rt_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_rt_library_status" != xyes; then
-+        mt_rt_libs=""
-+        mt_rt_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+
-+    RT_LIBS=${mt_rt_libs}
-+    RT_LDFLAGS=${mt_rt_ldflags}
-+    RT_STATUS=${mt_rt_library_status}
-+
-+
-+
-+
-+
-+
-+if test "x$RT_STATUS" != xyes; then
+ 
+                         mt_rt_libs="-lrt"
+                         mt_rt_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -20414,92 +11393,11 @@ fi
+ 
+ 
+ if test "x$RT_STATUS" != xyes; then
+-    { $as_echo "$as_me:$LINENO: checking for clock_gettime" >&5
+-$as_echo_n "checking for clock_gettime... " >&6; }
+-if test "${ac_cv_func_clock_gettime+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 clock_gettime to an innocuous variant, in case <limits.h> declares clock_gettime.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define clock_gettime innocuous_clock_gettime
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char clock_gettime (); 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
 +    ac_fn_cxx_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
 +if test "x$ac_cv_func_clock_gettime" = x""yes; then :
-+
-+fi
-+
-+fi
-+
-+############ zlib
-+
-+
-+    mt_zlib_status=yes
-+
-+
-+
-+    mt_zlib_option_enabled=
-+    mt_zlib_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_zlib_option_enabled=yes
-+    else
-+        mt_zlib_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-zlib was given.
+ 
+-#undef clock_gettime
+-
+-/* 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 clock_gettime ();
+-/* 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_clock_gettime || defined __stub___clock_gettime
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return clock_gettime ();
+-  ;
+-  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_cxx_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_clock_gettime=yes
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_func_clock_gettime=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_clock_gettime" >&5
+-$as_echo "$ac_cv_func_clock_gettime" >&6; }
+-
+ fi
+ 
+ ############ zlib
+@@ -20518,7 +11416,7 @@ fi
+     fi
+ 
+     # Check whether --enable-zlib was given.
+-if test "${enable_zlib+set}" = set; then
 +if test "${enable_zlib+set}" = set; then :
-+  enableval=$enable_zlib;
-+            mt_zlib_option_enabled=$enableval
-+            mt_zlib_option_requested=yes
-+
-+
-+fi
-+
-+
-+    ZLIB_OPTION_ENABLED=${mt_zlib_option_enabled}
-+    ZLIB_OPTION_REQUESTED=${mt_zlib_option_requested}
-+
-+
-+
-+
+   enableval=$enable_zlib;
+             mt_zlib_option_enabled=$enableval
+             mt_zlib_option_requested=yes
+@@ -20533,7 +11431,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_zlib_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+    if test "x${ZLIB_OPTION_ENABLED}" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_zlib_header_status=yes
-+
-+
-+# Check whether --with-zlib-h was given.
+ 
+     if test "x${ZLIB_OPTION_ENABLED}" = xyes; then
+ 
+@@ -20548,10 +11448,10 @@ fi
+ 
+ 
+ # Check whether --with-zlib-h was given.
+-if test "${with_zlib_h+set}" = set; then
 +if test "${with_zlib_h+set}" = set; then :
-+  withval=$with_zlib_h;
-+            mt_zlib_search_headers="$withval"
+   withval=$with_zlib_h;
+             mt_zlib_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for zlib headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for zlib headers in $withval" >&5
-+$as_echo "$as_me: Will search for zlib headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_zlib_search_headers" ; then
-+        unset ac_cv_header_zlib_h
-+        CFLAGS="$CFLAGS -I${mt_zlib_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_zlib_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_zlib_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_zlib_search_headers/zlib.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for zlib headers in $withval" >&6;}
+ 
+ 
+@@ -20564,145 +11464,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_zlib_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_zlib_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_zlib_search_headers/zlib.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_zlib_search_headers/zlib.h" >&5
+-$as_echo_n "checking for $mt_zlib_search_headers/zlib.h... " >&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 $mt_zlib_search_headers/zlib.h usability" >&5
+-$as_echo_n "checking $mt_zlib_search_headers/zlib.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 <$mt_zlib_search_headers/zlib.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_cxx_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 $mt_zlib_search_headers/zlib.h presence" >&5
+-$as_echo_n "checking $mt_zlib_search_headers/zlib.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 <$mt_zlib_search_headers/zlib.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_zlib_search_headers/zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_zlib_search_headers/zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_zlib_search_headers/zlib.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_zlib_search_headers/zlib.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_zlib_search_headers/zlib.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_zlib_search_headers/zlib.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_zlib_search_headers/zlib.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_zlib_search_headers/zlib.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_zlib_search_headers/zlib.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_zlib_search_headers/zlib.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_zlib_search_headers/zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_zlib_search_headers/zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_zlib_search_headers/zlib.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_zlib_search_headers/zlib.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_zlib_search_headers/zlib.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_zlib_search_headers/zlib.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_zlib_search_headers/zlib.h" >&5
+-$as_echo_n "checking for $mt_zlib_search_headers/zlib.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_zlib_search_headers/zlib.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_zlib_cxxflags="-I${mt_zlib_search_headers}"
-+
-+else
-+
-+                mt_zlib_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_zlib_cxxflags="-I${mt_zlib_search_headers}"
+ 
+@@ -20710,12 +11473,10 @@ else
+ 
+                 mt_zlib_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: zlib headers not found in requested location $mt_zlib_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: zlib headers not found in requested location $mt_zlib_search_headers" >&5
-+$as_echo "$as_me: zlib headers not found in requested location $mt_zlib_search_headers" >&6;}
-+                else
-+                    as_fn_error "zlib headers not found in requested location $mt_zlib_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_zlib_h
+ $as_echo "$as_me: zlib headers not found in requested location $mt_zlib_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: zlib headers not found in requested location $mt_zlib_search_headers" >&5
+-$as_echo "$as_me: error: zlib headers not found in requested location $mt_zlib_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "zlib headers not found in requested location $mt_zlib_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -20724,140 +11485,9 @@ fi
+ 
+     else
+         unset ac_cv_header_zlib_h
+-        if test "${ac_cv_header_zlib_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
+-$as_echo_n "checking for zlib.h... " >&6; }
+-if test "${ac_cv_header_zlib_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+-$as_echo "$ac_cv_header_zlib_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking zlib.h usability" >&5
+-$as_echo_n "checking zlib.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 <zlib.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_cxx_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
 +        ac_fn_cxx_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
 +if test "x$ac_cv_header_zlib_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_zlib_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/zlib.h" | $as_tr_sh`
+ 
+-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 zlib.h presence" >&5
+-$as_echo_n "checking zlib.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 <zlib.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: zlib.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for zlib.h" >&5
+-$as_echo_n "checking for zlib.h... " >&6; }
+-if test "${ac_cv_header_zlib_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_zlib_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5
+-$as_echo "$ac_cv_header_zlib_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_zlib_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -20865,145 +11495,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_zlib_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/zlib.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/zlib.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/zlib.h... " >&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 $MT_SEARCHPATH_HEADERS/zlib.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/zlib.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 <$MT_SEARCHPATH_HEADERS/zlib.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_cxx_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 $MT_SEARCHPATH_HEADERS/zlib.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/zlib.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 <$MT_SEARCHPATH_HEADERS/zlib.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/zlib.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/zlib.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/zlib.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/zlib.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_zlib_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_zlib_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_zlib_header_status" != xyes; then
-+        mt_zlib_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_zlib_package_status=${mt_zlib_header_status}
-+
-+    if test "x$mt_zlib_package_status" = xyes; then
-+
-+    mt_zlib_arg_default=yes
-+    mt_zlib_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-zlib-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_zlib_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -21047,10 +11540,10 @@ fi
+ 
+ 
+ # Check whether --with-zlib-libs was given.
+-if test "${with_zlib_libs+set}" = set; then
 +if test "${with_zlib_libs+set}" = set; then :
-+  withval=$with_zlib_libs;
-+            mt_zlib_search_libs="$withval"
+   withval=$with_zlib_libs;
+             mt_zlib_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for zlib libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for zlib libs in $withval" >&5
-+$as_echo "$as_me: Will search for zlib libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_zlib_search_libs" ; then
-+        unset ac_cv_lib_z_uncompress
-+        LDFLAGS="$LDFLAGS -L$mt_zlib_search_libs"
+ $as_echo "$as_me: Will search for zlib libs in $withval" >&6;}
+ 
+ 
+@@ -21060,18 +11553,14 @@ fi
+     if test "$mt_zlib_search_libs" ; then
+         unset ac_cv_lib_z_uncompress
+         LDFLAGS="$LDFLAGS -L$mt_zlib_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uncompress in -lz" >&5
-+$as_echo_n "checking for uncompress in -lz... " >&6; }
+ $as_echo_n "checking for uncompress in -lz... " >&6; }
+-if test "${ac_cv_lib_z_uncompress+set}" = set; then
 +if test "${ac_cv_lib_z_uncompress+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lz  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lz  $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.
-+   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 uncompress ();
-+int
-+main ()
-+{
-+return uncompress ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -21089,43 +11578,18 @@ return uncompress ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_z_uncompress=yes
-+else
+   ac_cv_lib_z_uncompress=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_z_uncompress=no
 +  ac_cv_lib_z_uncompress=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_uncompress" >&5
-+$as_echo "$ac_cv_lib_z_uncompress" >&6; }
+ $as_echo "$ac_cv_lib_z_uncompress" >&6; }
+-if test "x$ac_cv_lib_z_uncompress" = x""yes; then
 +if test "x$ac_cv_lib_z_uncompress" = x""yes; then :
-+
-+                mt_zlib_libs="-lz"
-+                mt_zlib_ldflags="-L$mt_zlib_search_libs"
-+
-+else
-+
-+                mt_zlib_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_zlib_libs="-lz"
+                 mt_zlib_ldflags="-L$mt_zlib_search_libs"
+@@ -21134,12 +11598,10 @@ else
+ 
+                 mt_zlib_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: zlib library not found in requested location $mt_zlib_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: zlib library not found in requested location $mt_zlib_search_libs" >&5
-+$as_echo "$as_me: zlib library not found in requested location $mt_zlib_search_libs" >&6;}
-+                else
-+                    as_fn_error "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_z_uncompress
+ $as_echo "$as_me: zlib library not found in requested location $mt_zlib_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: zlib library not found in requested location $mt_zlib_search_libs" >&5
+-$as_echo "$as_me: error: zlib library not found in requested location $mt_zlib_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -21147,18 +11609,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_z_uncompress
+-        { $as_echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uncompress in -lz" >&5
-+$as_echo_n "checking for uncompress in -lz... " >&6; }
+ $as_echo_n "checking for uncompress in -lz... " >&6; }
+-if test "${ac_cv_lib_z_uncompress+set}" = set; then
 +if test "${ac_cv_lib_z_uncompress+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lz  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lz  $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.
-+   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 uncompress ();
-+int
-+main ()
-+{
-+return uncompress ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -21176,43 +11634,18 @@ return uncompress ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_z_uncompress=yes
-+else
+   ac_cv_lib_z_uncompress=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_z_uncompress=no
 +  ac_cv_lib_z_uncompress=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_uncompress" >&5
-+$as_echo "$ac_cv_lib_z_uncompress" >&6; }
+ $as_echo "$ac_cv_lib_z_uncompress" >&6; }
+-if test "x$ac_cv_lib_z_uncompress" = x""yes; then
 +if test "x$ac_cv_lib_z_uncompress" = x""yes; then :
-+
-+                mt_zlib_libs="-lz"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_z_uncompress
+ 
+                 mt_zlib_libs="-lz"
+ 
+@@ -21220,18 +11653,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_z_uncompress
+-                { $as_echo "$as_me:$LINENO: checking for uncompress in -lz" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uncompress in -lz" >&5
-+$as_echo_n "checking for uncompress in -lz... " >&6; }
+ $as_echo_n "checking for uncompress in -lz... " >&6; }
+-if test "${ac_cv_lib_z_uncompress+set}" = set; then
 +if test "${ac_cv_lib_z_uncompress+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lz  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lz  $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.
-+   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 uncompress ();
-+int
-+main ()
-+{
-+return uncompress ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -21249,43 +11678,18 @@ return uncompress ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_z_uncompress=yes
-+else
+   ac_cv_lib_z_uncompress=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_z_uncompress=no
 +  ac_cv_lib_z_uncompress=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_uncompress" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_uncompress" >&5
-+$as_echo "$ac_cv_lib_z_uncompress" >&6; }
+ $as_echo "$ac_cv_lib_z_uncompress" >&6; }
+-if test "x$ac_cv_lib_z_uncompress" = x""yes; then
 +if test "x$ac_cv_lib_z_uncompress" = x""yes; then :
-+
-+                        mt_zlib_libs="-lz"
-+                        mt_zlib_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_zlib_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_zlib_library_status" != xyes; then
-+        mt_zlib_libs=""
-+        mt_zlib_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_zlib_package_status=${mt_zlib_library_status}
-+    fi
-+
-+    if test "x$mt_zlib_package_status" = xyes; then
-+        ZLIB_CFLAGS=${mt_zlib_cxxflags}
-+        ZLIB_LIBS=${mt_zlib_libs}
-+        ZLIB_LDFLAGS=${mt_zlib_ldflags}
-+    fi
-+
-+        mt_zlib_status=${mt_zlib_package_status}
-+    else
-+        mt_zlib_status=disabled
-+    fi
-+
-+    if ((test "x${ZLIB_OPTION_ENABLED}" = xyes) &&
-+        (test "x${ZLIB_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_zlib_status" != xyes) && (test "" != "pass")); then
-+        as_fn_error "unable to configure zlib support" "$LINENO" 5
-+    fi
-+
-+    if test "x$mt_zlib_status" = xyes; then
-+
+ 
+                         mt_zlib_libs="-lz"
+                         mt_zlib_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -21331,16 +11735,12 @@ fi
+     if ((test "x${ZLIB_OPTION_ENABLED}" = xyes) &&
+         (test "x${ZLIB_OPTION_REQUESTED}" = xyes) &&
+         (test "x$mt_zlib_status" != xyes) && (test "" != "pass")); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure zlib support" >&5
+-$as_echo "$as_me: error: unable to configure zlib support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure zlib support" "$LINENO" 5
+     fi
+ 
+     if test "x$mt_zlib_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ZLIB 1
+-_ACEOF
 +$as_echo "#define HAVE_ZLIB 1" >>confdefs.h
-+
-+    fi
-+
-+    ZLIB_STATUS=${mt_zlib_status}
-+
-+
-+
-+
-+
-+
-+
-+
-+if test "x$ZLIB_STATUS" = xyes; then
-+    if test "x$DB_AUTOCREATE_OPTION_ENABLED" = xyes; then
-+
+ 
+     fi
+ 
+@@ -21356,19 +11756,15 @@ _ACEOF
+ if test "x$ZLIB_STATUS" = xyes; then
+     if test "x$DB_AUTOCREATE_OPTION_ENABLED" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define AUTO_CREATE_DATABASE 1
+-_ACEOF
 +$as_echo "#define AUTO_CREATE_DATABASE 1" >>confdefs.h
-+
-+    fi
-+else
-+    if test "x$DB_AUTOCREATE_OPTION_ENABLED" = xyes; then
-+        if test "x$DB_AUTOCREATE_OPTION_REQUESTED" = xyes; then
-+            as_fn_error "Automatic database creation not possible due to missing zlib headers/libraries" "$LINENO" 5
-+        else
+ 
+     fi
+ else
+     if test "x$DB_AUTOCREATE_OPTION_ENABLED" = xyes; then
+         if test "x$DB_AUTOCREATE_OPTION_REQUESTED" = xyes; then
+-            { { $as_echo "$as_me:$LINENO: error: Automatic database creation not possible due to missing zlib headers/libraries" >&5
+-$as_echo "$as_me: error: Automatic database creation not possible due to missing zlib headers/libraries" >&2;}
+-   { (exit 1); exit 1; }; }
++            as_fn_error $? "Automatic database creation not possible due to missing zlib headers/libraries" "$LINENO" 5
+         else
+-            { $as_echo "$as_me:$LINENO: WARNING: Automatic database creation not possible due to missing zlib headers/libraries" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Automatic database creation not possible due to missing zlib headers/libraries" >&5
-+$as_echo "$as_me: WARNING: Automatic database creation not possible due to missing zlib headers/libraries" >&2;}
-+            DB_AUTOCREATE_OPTION_ENABLED=disabled
-+        fi
-+    fi
-+fi
-+
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
+ $as_echo "$as_me: WARNING: Automatic database creation not possible due to missing zlib headers/libraries" >&2;}
+             DB_AUTOCREATE_OPTION_ENABLED=disabled
+         fi
+@@ -21402,13 +11798,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_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
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
+       esac ;;
+     esac
+   done
+@@ -21416,8 +11812,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+   (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"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+@@ -21440,11 +11836,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ 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: 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
-+rm -f confcache
-+
-+######### SQLite3
-+
-+if test "x$RT_STATUS" = xyes; then
-+    LDFLAGS="$LDFLAGS $RT_LDFLAGS $RT_LIBS"
-+fi
-+
-+
-+    mt_sqlite3_status=yes
-+
-+
-+
-+    mt_sqlite3_option_enabled=
-+    mt_sqlite3_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_sqlite3_option_enabled=yes
-+    else
-+        mt_sqlite3_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-sqlite3 was given.
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+@@ -21470,7 +11866,7 @@ fi
+     fi
+ 
+     # Check whether --enable-sqlite3 was given.
+-if test "${enable_sqlite3+set}" = set; then
 +if test "${enable_sqlite3+set}" = set; then :
-+  enableval=$enable_sqlite3;
-+            mt_sqlite3_option_enabled=$enableval
-+            mt_sqlite3_option_requested=yes
-+
-+
-+fi
-+
-+
-+    SQLITE3_OPTION_ENABLED=${mt_sqlite3_option_enabled}
-+    SQLITE3_OPTION_REQUESTED=${mt_sqlite3_option_requested}
-+
-+
-+
-+
+   enableval=$enable_sqlite3;
+             mt_sqlite3_option_enabled=$enableval
+             mt_sqlite3_option_requested=yes
+@@ -21485,7 +11881,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_sqlite3_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+    if test "x${SQLITE3_OPTION_ENABLED}" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_sqlite3_header_status=yes
-+
-+
-+# Check whether --with-sqlite3-h was given.
+ 
+     if test "x${SQLITE3_OPTION_ENABLED}" = xyes; then
+ 
+@@ -21500,10 +11898,10 @@ fi
+ 
+ 
+ # Check whether --with-sqlite3-h was given.
+-if test "${with_sqlite3_h+set}" = set; then
 +if test "${with_sqlite3_h+set}" = set; then :
-+  withval=$with_sqlite3_h;
-+            mt_sqlite3_search_headers="$withval"
+   withval=$with_sqlite3_h;
+             mt_sqlite3_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for sqlite3 headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for sqlite3 headers in $withval" >&5
-+$as_echo "$as_me: Will search for sqlite3 headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_sqlite3_search_headers" ; then
-+        unset ac_cv_header_sqlite3_h
-+        CFLAGS="$CFLAGS -I${mt_sqlite3_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_sqlite3_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_sqlite3_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_sqlite3_search_headers/sqlite3.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for sqlite3 headers in $withval" >&6;}
+ 
+ 
+@@ -21516,145 +11914,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_sqlite3_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_sqlite3_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_sqlite3_search_headers/sqlite3.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_sqlite3_search_headers/sqlite3.h" >&5
+-$as_echo_n "checking for $mt_sqlite3_search_headers/sqlite3.h... " >&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 $mt_sqlite3_search_headers/sqlite3.h usability" >&5
+-$as_echo_n "checking $mt_sqlite3_search_headers/sqlite3.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 <$mt_sqlite3_search_headers/sqlite3.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_cxx_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 $mt_sqlite3_search_headers/sqlite3.h presence" >&5
+-$as_echo_n "checking $mt_sqlite3_search_headers/sqlite3.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 <$mt_sqlite3_search_headers/sqlite3.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_sqlite3_search_headers/sqlite3.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_sqlite3_search_headers/sqlite3.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_sqlite3_search_headers/sqlite3.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_sqlite3_search_headers/sqlite3.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_sqlite3_search_headers/sqlite3.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_sqlite3_search_headers/sqlite3.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_sqlite3_search_headers/sqlite3.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_sqlite3_search_headers/sqlite3.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_sqlite3_search_headers/sqlite3.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_sqlite3_search_headers/sqlite3.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_sqlite3_search_headers/sqlite3.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_sqlite3_search_headers/sqlite3.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_sqlite3_search_headers/sqlite3.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_sqlite3_search_headers/sqlite3.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_sqlite3_search_headers/sqlite3.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_sqlite3_search_headers/sqlite3.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_sqlite3_search_headers/sqlite3.h" >&5
+-$as_echo_n "checking for $mt_sqlite3_search_headers/sqlite3.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_sqlite3_search_headers/sqlite3.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_sqlite3_cxxflags="-I${mt_sqlite3_search_headers}"
-+
-+else
-+
-+                mt_sqlite3_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_sqlite3_cxxflags="-I${mt_sqlite3_search_headers}"
+ 
+@@ -21662,12 +11923,10 @@ else
+ 
+                 mt_sqlite3_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: sqlite3 headers not found in requested location $mt_sqlite3_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: sqlite3 headers not found in requested location $mt_sqlite3_search_headers" >&5
-+$as_echo "$as_me: sqlite3 headers not found in requested location $mt_sqlite3_search_headers" >&6;}
-+                else
-+                    as_fn_error "sqlite3 headers not found in requested location $mt_sqlite3_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_sqlite3_h
+ $as_echo "$as_me: sqlite3 headers not found in requested location $mt_sqlite3_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: sqlite3 headers not found in requested location $mt_sqlite3_search_headers" >&5
+-$as_echo "$as_me: error: sqlite3 headers not found in requested location $mt_sqlite3_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "sqlite3 headers not found in requested location $mt_sqlite3_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -21676,140 +11935,9 @@ fi
+ 
+     else
+         unset ac_cv_header_sqlite3_h
+-        if test "${ac_cv_header_sqlite3_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for sqlite3.h" >&5
+-$as_echo_n "checking for sqlite3.h... " >&6; }
+-if test "${ac_cv_header_sqlite3_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sqlite3_h" >&5
+-$as_echo "$ac_cv_header_sqlite3_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking sqlite3.h usability" >&5
+-$as_echo_n "checking sqlite3.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 <sqlite3.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_cxx_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 sqlite3.h presence" >&5
+-$as_echo_n "checking sqlite3.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 <sqlite3.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: sqlite3.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: sqlite3.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sqlite3.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: sqlite3.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: sqlite3.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: sqlite3.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sqlite3.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: sqlite3.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sqlite3.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: sqlite3.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sqlite3.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: sqlite3.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sqlite3.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: sqlite3.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sqlite3.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: sqlite3.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for sqlite3.h" >&5
+-$as_echo_n "checking for sqlite3.h... " >&6; }
+-if test "${ac_cv_header_sqlite3_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_sqlite3_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sqlite3_h" >&5
+-$as_echo "$ac_cv_header_sqlite3_h" >&6; }
 +        ac_fn_cxx_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
 +if test "x$ac_cv_header_sqlite3_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_sqlite3_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/sqlite3.h" | $as_tr_sh`
+ 
+-fi
+-if test "x$ac_cv_header_sqlite3_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -21817,145 +11945,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_sqlite3_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/sqlite3.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/sqlite3.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/sqlite3.h... " >&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 $MT_SEARCHPATH_HEADERS/sqlite3.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/sqlite3.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 <$MT_SEARCHPATH_HEADERS/sqlite3.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_cxx_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 $MT_SEARCHPATH_HEADERS/sqlite3.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/sqlite3.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 <$MT_SEARCHPATH_HEADERS/sqlite3.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sqlite3.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/sqlite3.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/sqlite3.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/sqlite3.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_sqlite3_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_sqlite3_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_sqlite3_header_status" != xyes; then
-+        mt_sqlite3_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_sqlite3_package_status=${mt_sqlite3_header_status}
-+
-+    if test "x$mt_sqlite3_package_status" = xyes; then
-+
-+    mt_sqlite3_arg_default=yes
-+    mt_sqlite3_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-sqlite3-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_sqlite3_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -21999,10 +11990,10 @@ fi
+ 
+ 
+ # Check whether --with-sqlite3-libs was given.
+-if test "${with_sqlite3_libs+set}" = set; then
 +if test "${with_sqlite3_libs+set}" = set; then :
-+  withval=$with_sqlite3_libs;
-+            mt_sqlite3_search_libs="$withval"
+   withval=$with_sqlite3_libs;
+             mt_sqlite3_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for sqlite3 libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for sqlite3 libs in $withval" >&5
-+$as_echo "$as_me: Will search for sqlite3 libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_sqlite3_search_libs" ; then
-+        unset ac_cv_lib_sqlite3_sqlite3_open
-+        LDFLAGS="$LDFLAGS -L$mt_sqlite3_search_libs"
+ $as_echo "$as_me: Will search for sqlite3 libs in $withval" >&6;}
+ 
+ 
+@@ -22012,18 +12003,14 @@ fi
+     if test "$mt_sqlite3_search_libs" ; then
+         unset ac_cv_lib_sqlite3_sqlite3_open
+         LDFLAGS="$LDFLAGS -L$mt_sqlite3_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5
-+$as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
+ $as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
+-if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then
 +if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsqlite3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsqlite3  $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.
-+   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 sqlite3_open ();
-+int
-+main ()
-+{
-+return sqlite3_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -22041,43 +12028,18 @@ return sqlite3_open ();
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_sqlite3_sqlite3_open=yes
-+else
+   ac_cv_lib_sqlite3_sqlite3_open=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_sqlite3_sqlite3_open=no
 +  ac_cv_lib_sqlite3_sqlite3_open=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
-+$as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+ $as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+-if test "x$ac_cv_lib_sqlite3_sqlite3_open" = x""yes; then
 +if test "x$ac_cv_lib_sqlite3_sqlite3_open" = x""yes; then :
-+
-+                mt_sqlite3_libs="-lsqlite3"
-+                mt_sqlite3_ldflags="-L$mt_sqlite3_search_libs"
-+
-+else
-+
-+                mt_sqlite3_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_sqlite3_libs="-lsqlite3"
+                 mt_sqlite3_ldflags="-L$mt_sqlite3_search_libs"
+@@ -22086,12 +12048,10 @@ else
+ 
+                 mt_sqlite3_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: sqlite3 library not found in requested location $mt_sqlite3_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: sqlite3 library not found in requested location $mt_sqlite3_search_libs" >&5
-+$as_echo "$as_me: sqlite3 library not found in requested location $mt_sqlite3_search_libs" >&6;}
-+                else
-+                    as_fn_error "sqlite3 library not found in requested location $mt_sqlite3_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_sqlite3_sqlite3_open
+ $as_echo "$as_me: sqlite3 library not found in requested location $mt_sqlite3_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: sqlite3 library not found in requested location $mt_sqlite3_search_libs" >&5
+-$as_echo "$as_me: error: sqlite3 library not found in requested location $mt_sqlite3_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "sqlite3 library not found in requested location $mt_sqlite3_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -22099,18 +12059,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_sqlite3_sqlite3_open
+-        { $as_echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5
-+$as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
+ $as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
+-if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then
 +if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsqlite3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsqlite3  $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.
-+   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 sqlite3_open ();
-+int
-+main ()
-+{
-+return sqlite3_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -22128,43 +12084,18 @@ return sqlite3_open ();
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_sqlite3_sqlite3_open=yes
-+else
+   ac_cv_lib_sqlite3_sqlite3_open=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_sqlite3_sqlite3_open=no
 +  ac_cv_lib_sqlite3_sqlite3_open=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
-+$as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+ $as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+-if test "x$ac_cv_lib_sqlite3_sqlite3_open" = x""yes; then
 +if test "x$ac_cv_lib_sqlite3_sqlite3_open" = x""yes; then :
-+
-+                mt_sqlite3_libs="-lsqlite3"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_sqlite3_sqlite3_open
+ 
+                 mt_sqlite3_libs="-lsqlite3"
+ 
+@@ -22172,18 +12103,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_sqlite3_sqlite3_open
+-                { $as_echo "$as_me:$LINENO: checking for sqlite3_open in -lsqlite3" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_open in -lsqlite3" >&5
-+$as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
+ $as_echo_n "checking for sqlite3_open in -lsqlite3... " >&6; }
+-if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then
 +if test "${ac_cv_lib_sqlite3_sqlite3_open+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsqlite3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsqlite3  $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.
-+   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 sqlite3_open ();
-+int
-+main ()
-+{
-+return sqlite3_open ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -22201,43 +12128,18 @@ return sqlite3_open ();
+   return 0;
+ }
+ _ACEOF
+-rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (ac_try="$ac_link"
+-case "(($ac_try" in
+-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+-  *) ac_try_echo=$ac_try;;
+-esac
+-eval 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_sqlite3_sqlite3_open=yes
-+else
+   ac_cv_lib_sqlite3_sqlite3_open=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_sqlite3_sqlite3_open=no
 +  ac_cv_lib_sqlite3_sqlite3_open=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_open" >&5
-+$as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+ $as_echo "$ac_cv_lib_sqlite3_sqlite3_open" >&6; }
+-if test "x$ac_cv_lib_sqlite3_sqlite3_open" = x""yes; then
 +if test "x$ac_cv_lib_sqlite3_sqlite3_open" = x""yes; then :
-+
-+                        mt_sqlite3_libs="-lsqlite3"
-+                        mt_sqlite3_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_sqlite3_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_sqlite3_library_status" != xyes; then
-+        mt_sqlite3_libs=""
-+        mt_sqlite3_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_sqlite3_package_status=${mt_sqlite3_library_status}
-+    fi
-+
-+    if test "x$mt_sqlite3_package_status" = xyes; then
-+        SQLITE3_CFLAGS=${mt_sqlite3_cxxflags}
-+        SQLITE3_LIBS=${mt_sqlite3_libs}
-+        SQLITE3_LDFLAGS=${mt_sqlite3_ldflags}
-+    fi
-+
-+        mt_sqlite3_status=${mt_sqlite3_package_status}
-+    else
-+        mt_sqlite3_status=disabled
-+    fi
-+
-+    if ((test "x${SQLITE3_OPTION_ENABLED}" = xyes) &&
-+        (test "x${SQLITE3_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_sqlite3_status" != xyes) && (test "" != "pass")); then
-+        as_fn_error "unable to configure sqlite3 support" "$LINENO" 5
-+    fi
-+
-+    if test "x$mt_sqlite3_status" = xyes; then
-+
+ 
+                         mt_sqlite3_libs="-lsqlite3"
+                         mt_sqlite3_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -22283,16 +12185,12 @@ fi
+     if ((test "x${SQLITE3_OPTION_ENABLED}" = xyes) &&
+         (test "x${SQLITE3_OPTION_REQUESTED}" = xyes) &&
+         (test "x$mt_sqlite3_status" != xyes) && (test "" != "pass")); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure sqlite3 support" >&5
+-$as_echo "$as_me: error: unable to configure sqlite3 support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure sqlite3 support" "$LINENO" 5
+     fi
+ 
+     if test "x$mt_sqlite3_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_SQLITE3 1
+-_ACEOF
 +$as_echo "#define HAVE_SQLITE3 1" >>confdefs.h
-+
-+    fi
-+
-+    SQLITE3_STATUS=${mt_sqlite3_status}
-+
-+
-+
-+
-+
-+
-+
-+if test "x$SQLITE3_STATUS" = xyes; then
-+    if test "x$RT_STATUS" = xyes; then
-+        SQLITE_LDFLAGS="$SQLITE_LDFLAGS $RT_LDFLAGS"
-+        SQLITE_LIBS="$SQLITE_LIBS $RT_LIBS"
-+    fi
-+
-+
-+
-+
-+    if test "x$SQLITE_BACKUP_OPTION_ENABLED" = xyes; then
-+
+ 
+     fi
+ 
+@@ -22315,17 +12213,13 @@ if test "x$SQLITE3_STATUS" = xyes; then
+ 
+     if test "x$SQLITE_BACKUP_OPTION_ENABLED" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define SQLITE_BACKUP_ENABLED 1
+-_ACEOF
 +$as_echo "#define SQLITE_BACKUP_ENABLED 1" >>confdefs.h
-+
-+    fi
-+else
-+    if (test "x$SQLITE_BACKUP_OPTION_ENABLED" = xyes) &&
-+       (test "x$SQLITE_BACKUP_OPTION_REQUESTED" = xyes); then
-+        as_fn_error "You specified the option to use sqlite backup settings but the sqlite support could not be configured" "$LINENO" 5
-+    fi
-+
-+fi
-+
-+LDFLAGS="$LDFLAGS_SAVE"
-+CPPFLAGS="$CPPFLAGS_SAVE"
-+CXXFLAGS="$CXXFLAGS_SAVE"
-+
-+########## MySQL
-+
-+
-+    mt_mysql_status=yes
-+    mt_mysql_requested=no
-+
-+
-+
-+    mt_mysql_option_enabled=
-+    mt_mysql_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_mysql_option_enabled=yes
-+    else
-+        mt_mysql_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-mysql was given.
+ 
+     fi
+ else
+     if (test "x$SQLITE_BACKUP_OPTION_ENABLED" = xyes) &&
+        (test "x$SQLITE_BACKUP_OPTION_REQUESTED" = xyes); then
+-        { { $as_echo "$as_me:$LINENO: error: You specified the option to use sqlite backup settings but the sqlite support could not be configured" >&5
+-$as_echo "$as_me: error: You specified the option to use sqlite backup settings but the sqlite support could not be configured" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "You specified the option to use sqlite backup settings but the sqlite support could not be configured" "$LINENO" 5
+     fi
+ 
+ fi
+@@ -22351,7 +12245,7 @@ CXXFLAGS="$CXXFLAGS_SAVE"
+     fi
+ 
+     # Check whether --enable-mysql was given.
+-if test "${enable_mysql+set}" = set; then
 +if test "${enable_mysql+set}" = set; then :
-+  enableval=$enable_mysql;
-+            mt_mysql_option_enabled=$enableval
-+            mt_mysql_option_requested=yes
-+
-+
-+fi
-+
-+
-+    MYSQL_OPTION_ENABLED=${mt_mysql_option_enabled}
-+    MYSQL_OPTION_REQUESTED=${mt_mysql_option_requested}
-+
-+
-+
-+
+   enableval=$enable_mysql;
+             mt_mysql_option_enabled=$enableval
+             mt_mysql_option_requested=yes
+@@ -22366,7 +12260,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_mysql_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+    if test "x${MYSQL_OPTION_ENABLED}" = xyes; then
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+    mt_mysql_config=none
-+    mt_mysql_package_status=yes
-+
-+
-+# Check whether --with-mysql-cfg was given.
+ 
+     if test "x${MYSQL_OPTION_ENABLED}" = xyes; then
+ 
+@@ -22382,10 +12278,10 @@ fi
+ 
+ 
+ # Check whether --with-mysql-cfg was given.
+-if test "${with_mysql_cfg+set}" = set; then
 +if test "${with_mysql_cfg+set}" = set; then :
-+  withval=$with_mysql_cfg;
-+            mt_mysql_search_config="$withval"
+   withval=$with_mysql_cfg;
+             mt_mysql_search_config="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for mysql config in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for mysql config in $withval" >&5
-+$as_echo "$as_me: Will search for mysql config in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test -n "$mt_mysql_search_config"; then
+ $as_echo "$as_me: Will search for mysql config in $withval" >&6;}
+ 
+ 
+@@ -22393,28 +12289,24 @@ fi
+ 
+ 
+     if test -n "$mt_mysql_search_config"; then
+-        { $as_echo "$as_me:$LINENO: You specified ${mt_mysql_search_config} for mysql_config" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: You specified ${mt_mysql_search_config} for mysql_config" >&5
-+$as_echo "$as_me: You specified ${mt_mysql_search_config} for mysql_config" >&6;}
-+        if test -f "$mt_mysql_search_config"; then
-+            mt_mysql_config=${mt_mysql_search_config}
-+        else
-+            as_fn_error "${mt_mysql_search_config} not found" "$LINENO" 5
-+        fi
-+
-+        mt_mysql_version=`${mt_mysql_config} --version 2>/dev/null`
-+        if test -z "$mt_mysql_version"; then
-+            as_fn_error "${mt_mysql_search_config} could not be executed or returned invalid values" "$LINENO" 5
-+        fi
-+    else
-+        # Extract the first word of "mysql_config", so it can be a program name with args.
-+set dummy mysql_config; ac_word=$2
+ $as_echo "$as_me: You specified ${mt_mysql_search_config} for mysql_config" >&6;}
+         if test -f "$mt_mysql_search_config"; then
+             mt_mysql_config=${mt_mysql_search_config}
+         else
+-            { { $as_echo "$as_me:$LINENO: error: ${mt_mysql_search_config} not found" >&5
+-$as_echo "$as_me: error: ${mt_mysql_search_config} not found" >&2;}
+-   { (exit 1); exit 1; }; }
++            as_fn_error $? "${mt_mysql_search_config} not found" "$LINENO" 5
+         fi
+ 
+         mt_mysql_version=`${mt_mysql_config} --version 2>/dev/null`
+         if test -z "$mt_mysql_version"; then
+-            { { $as_echo "$as_me:$LINENO: error: ${mt_mysql_search_config} could not be executed or returned invalid values" >&5
+-$as_echo "$as_me: error: ${mt_mysql_search_config} could not be executed or returned invalid values" >&2;}
+-   { (exit 1); exit 1; }; }
++            as_fn_error $? "${mt_mysql_search_config} could not be executed or returned invalid values" "$LINENO" 5
+         fi
+     else
+         # Extract the first word of "mysql_config", so it can be a program name with args.
+ set dummy mysql_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; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_mt_mysql_config+set}" = set; then
 +if test "${ac_cv_path_mt_mysql_config+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $mt_mysql_config in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_mt_mysql_config="$mt_mysql_config" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   case $mt_mysql_config in
+@@ -22427,14 +12319,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_mt_mysql_config="$as_dir/$ac_word$ac_exec_ext"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_mt_mysql_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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_mt_mysql_config" && ac_cv_path_mt_mysql_config="none"
-+  ;;
-+esac
-+fi
-+mt_mysql_config=$ac_cv_path_mt_mysql_config
-+if test -n "$mt_mysql_config"; then
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_mt_mysql_config" && ac_cv_path_mt_mysql_config="none"
+@@ -22443,10 +12335,10 @@ esac
+ fi
+ mt_mysql_config=$ac_cv_path_mt_mysql_config
+ if test -n "$mt_mysql_config"; then
+-  { $as_echo "$as_me:$LINENO: result: $mt_mysql_config" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_mysql_config" >&5
-+$as_echo "$mt_mysql_config" >&6; }
-+else
+ $as_echo "$mt_mysql_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
-+
-+
-+        if test "x$mt_mysql_config" = xnone; then
-+            unset ac_cv_path_mt_mysql_config
-+            # Extract the first word of "mysql_config", so it can be a program name with args.
-+set dummy mysql_config; ac_word=$2
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -22455,9 +12347,9 @@ fi
+             unset ac_cv_path_mt_mysql_config
+             # Extract the first word of "mysql_config", so it can be a program name with args.
+ set dummy mysql_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; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_mt_mysql_config+set}" = set; then
 +if test "${ac_cv_path_mt_mysql_config+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $mt_mysql_config in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_mt_mysql_config="$mt_mysql_config" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $MT_SEARCHPATH_PROGS
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   case $mt_mysql_config in
+@@ -22470,14 +12362,14 @@ for as_dir in $MT_SEARCHPATH_PROGS
+ 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_mt_mysql_config="$as_dir/$ac_word$ac_exec_ext"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_mt_mysql_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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_mt_mysql_config" && ac_cv_path_mt_mysql_config="none"
-+  ;;
-+esac
-+fi
-+mt_mysql_config=$ac_cv_path_mt_mysql_config
-+if test -n "$mt_mysql_config"; then
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_mt_mysql_config" && ac_cv_path_mt_mysql_config="none"
+@@ -22486,43 +12378,43 @@ esac
+ fi
+ mt_mysql_config=$ac_cv_path_mt_mysql_config
+ if test -n "$mt_mysql_config"; then
+-  { $as_echo "$as_me:$LINENO: result: $mt_mysql_config" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_mysql_config" >&5
-+$as_echo "$mt_mysql_config" >&6; }
-+else
+ $as_echo "$mt_mysql_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
-+
-+
-+            if test "x$mt_mysql_config" = xnone; then
-+                mt_mysql_package_status=missing
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+             if test "x$mt_mysql_config" = xnone; then
+                 mt_mysql_package_status=missing
+-                { $as_echo "$as_me:$LINENO: result: mysql_config not found, please install the mysql devel package" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: result: mysql_config not found, please install the mysql devel package" >&5
-+$as_echo "mysql_config not found, please install the mysql devel package" >&6; }
-+            fi
-+        fi
-+
-+        mt_mysql_version=`${mt_mysql_config} --version 2>/dev/null`
-+        if test -z "$mt_mysql_version"; then
+ $as_echo "mysql_config not found, please install the mysql devel package" >&6; }
+             fi
+         fi
+ 
+         mt_mysql_version=`${mt_mysql_config} --version 2>/dev/null`
+         if test -z "$mt_mysql_version"; then
+-            { $as_echo "$as_me:$LINENO: ${mt_mysql_config} could not be executed or returned invalid values" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: ${mt_mysql_config} could not be executed or returned invalid values" >&5
-+$as_echo "$as_me: ${mt_mysql_config} could not be executed or returned invalid values" >&6;}
-+            mt_mysql_package_status=missing
-+        fi
-+    fi
-+    if test "x$mt_mysql_package_status" = xyes; then
+ $as_echo "$as_me: ${mt_mysql_config} could not be executed or returned invalid values" >&6;}
+             mt_mysql_package_status=missing
+         fi
+     fi
+     if test "x$mt_mysql_package_status" = xyes; then
+-        { $as_echo "$as_me:$LINENO: checking mysql cflags" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking mysql cflags" >&5
-+$as_echo_n "checking mysql cflags... " >&6; }
-+        mt_mysql_cxxflags=`${mt_mysql_config} --cflags`
+ $as_echo_n "checking mysql cflags... " >&6; }
+         mt_mysql_cxxflags=`${mt_mysql_config} --cflags`
+-        { $as_echo "$as_me:$LINENO: result: $mt_mysql_cxxflags" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_mysql_cxxflags" >&5
-+$as_echo "$mt_mysql_cxxflags" >&6; }
-+        mt_mysql_libs=
+ $as_echo "$mt_mysql_cxxflags" >&6; }
+         mt_mysql_libs=
+-        { $as_echo "$as_me:$LINENO: checking mysql libs" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking mysql libs" >&5
-+$as_echo_n "checking mysql libs... " >&6; }
-+        if test -z "--libs_r";  then
-+            mt_mysql_libs=`${mt_mysql_config} --libs`
-+        else
-+            mt_mysql_libs=`${mt_mysql_config} --libs_r`
-+        fi
+ $as_echo_n "checking mysql libs... " >&6; }
+         if test -z "--libs_r";  then
+             mt_mysql_libs=`${mt_mysql_config} --libs`
+         else
+             mt_mysql_libs=`${mt_mysql_config} --libs_r`
+         fi
+-        { $as_echo "$as_me:$LINENO: result: $mt_mysql_libs" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_mysql_libs" >&5
-+$as_echo "$mt_mysql_libs" >&6; }
-+    fi
-+
-+    if test "x$mt_mysql_package_status" = xyes; then
-+        CPPFLAGS="$CPPFLAGS $mt_mysql_cxxflags"
-+        CXXFLAGS="$CXXFLAGS $mt_mysql_cxxflags"
-+        CFLAGS="$CFLAGS $mt_mysql_cxxflags"
-+        for mt_u_header in mysql_h; do
-+            unset ac_cv_header_${mt_u_header}
-+        done
+ $as_echo "$mt_mysql_libs" >&6; }
+     fi
+ 
+@@ -22533,151 +12425,12 @@ $as_echo "$mt_mysql_libs" >&6; }
+         for mt_u_header in mysql_h; do
+             unset ac_cv_header_${mt_u_header}
+         done
+-
+-for ac_header in mysql.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_cxx_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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
 +        for ac_header in mysql.h
 +do :
 +  ac_fn_cxx_check_header_mongrel "$LINENO" "mysql.h" "ac_cv_header_mysql_h" "$ac_includes_default"
 +if test "x$ac_cv_header_mysql_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_MYSQL_H 1
-+_ACEOF
-+
-+else
-+  mt_mysql_package_status=missing
-+fi
-+
-+done
-+
-+    fi
-+
-+    if test "x$mt_mysql_package_status" = xyes; then
-+        LIBS="$mt_mysql_libs $LIBS"
-+        if test -z ""; then
-+            unset ac_cv_func_mysql_init
+ _ACEOF
+ 
+ else
+@@ -22692,102 +12445,12 @@ done
+         LIBS="$mt_mysql_libs $LIBS"
+         if test -z ""; then
+             unset ac_cv_func_mysql_init
+-
+-for ac_func in mysql_init
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +            for ac_func in mysql_init
 +do :
 +  ac_fn_cxx_check_func "$LINENO" "mysql_init" "ac_cv_func_mysql_init"
 +if test "x$ac_cv_func_mysql_init" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_MYSQL_INIT 1
-+_ACEOF
-+
-+else
-+  mt_mysql_package_status=missing
-+fi
-+done
-+
-+        else
-+            unset ac_cv_lib__mysql_init
+ _ACEOF
+ 
+ else
+@@ -22797,19 +12460,14 @@ done
+ 
+         else
+             unset ac_cv_lib__mysql_init
+-
+-{ $as_echo "$as_me:$LINENO: checking for mysql_init in -l" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -l" >&5
-+$as_echo_n "checking for mysql_init in -l... " >&6; }
+ $as_echo_n "checking for mysql_init in -l... " >&6; }
+-if test "${ac_cv_lib__mysql_init+set}" = set; then
 +if test "${ac_cv_lib__mysql_init+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l  $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.
-+   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 mysql_init ();
-+int
-+main ()
-+{
-+return mysql_init ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -22827,43 +12485,18 @@ return mysql_init ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib__mysql_init=yes
-+else
+   ac_cv_lib__mysql_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib__mysql_init=no
 +  ac_cv_lib__mysql_init=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib__mysql_init" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib__mysql_init" >&5
-+$as_echo "$ac_cv_lib__mysql_init" >&6; }
+ $as_echo "$ac_cv_lib__mysql_init" >&6; }
+-if test "x$ac_cv_lib__mysql_init" = x""yes; then
 +if test "x$ac_cv_lib__mysql_init" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIB 1
-+_ACEOF
-+
-+  LIBS="-l $LIBS"
-+
-+else
-+  mt_mysql_package_status=missing
-+fi
-+
-+        fi
-+    fi
-+
-+    if test "x$mt_mysql_package_status" = xyes; then
-+        MYSQL_CFLAGS=${mt_mysql_cxxflags}
-+        MYSQL_LIBS=${mt_mysql_libs}
-+        MYSQL_VERSION=${mt_mysql_version}
-+    fi
-+
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_mysql_status=${mt_mysql_package_status}
-+    else
-+        mt_mysql_status=disabled
-+    fi
-+
-+    if ((test "x${MYSQL_OPTION_ENABLED}" = xyes) &&
-+        (test "x${MYSQL_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_mysql_status" != xyes)); then
-+        as_fn_error "unable to configure mysql support" "$LINENO" 5
-+    fi
-+
-+    if test "x$mt_mysql_status" = xyes; then
-+
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIB 1
+ _ACEOF
+@@ -22898,16 +12531,12 @@ fi
+     if ((test "x${MYSQL_OPTION_ENABLED}" = xyes) &&
+         (test "x${MYSQL_OPTION_REQUESTED}" = xyes) &&
+         (test "x$mt_mysql_status" != xyes)); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure mysql support" >&5
+-$as_echo "$as_me: error: unable to configure mysql support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure mysql support" "$LINENO" 5
+     fi
+ 
+     if test "x$mt_mysql_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MYSQL 1
+-_ACEOF
 +$as_echo "#define HAVE_MYSQL 1" >>confdefs.h
-+
-+    fi
-+
-+    MYSQL_STATUS=${mt_mysql_status}
-+
-+
-+
-+
-+
-+
-+
-+#    AS_IF([test x"$mt_mysql_status" = xyes], [--libs_r], [])[]dnl
-+
-+
-+if test "x$MYSQL_STATUS" = xyes; then
+ 
+     fi
+ 
+@@ -22923,18 +12552,18 @@ _ACEOF
+ 
+ 
+ if test "x$MYSQL_STATUS" = xyes; then
+-    { $as_echo "$as_me:$LINENO: checking mysql version" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking mysql version" >&5
-+$as_echo_n "checking mysql version... " >&6; }
-+    MYSQL_VERSION_MAJOR=`echo $MYSQL_VERSION | sed 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).\([0-9]\{1,\}\).*$/\1/'`
-+    MYSQL_VERSION_MINOR=`echo $MYSQL_VERSION | sed 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).\([0-9]\{1,\}\).*$/\2/'`
+ $as_echo_n "checking mysql version... " >&6; }
+     MYSQL_VERSION_MAJOR=`echo $MYSQL_VERSION | sed 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).\([0-9]\{1,\}\).*$/\1/'`
+     MYSQL_VERSION_MINOR=`echo $MYSQL_VERSION | sed 's/^\([0-9]\{1,\}\)\.\([0-9]\{1,\}\).\([0-9]\{1,\}\).*$/\2/'`
+-    { $as_echo "$as_me:$LINENO: result: $MYSQL_VERSION" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQL_VERSION" >&5
-+$as_echo "$MYSQL_VERSION" >&6; }
-+    if test -z $MYSQL_VERSION_MAJOR || test -z $MYSQL_VERSION_MINOR; then
+ $as_echo "$MYSQL_VERSION" >&6; }
+     if test -z $MYSQL_VERSION_MAJOR || test -z $MYSQL_VERSION_MINOR; then
+-        { $as_echo "$as_me:$LINENO: WARNING: could not parse mysql version string" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not parse mysql version string" >&5
-+$as_echo "$as_me: WARNING: could not parse mysql version string" >&2;}
-+        MYSQL_STATUS=missing
-+    elif test $MYSQL_VERSION_MAJOR -le 3 ; then
+ $as_echo "$as_me: WARNING: could not parse mysql version string" >&2;}
+         MYSQL_STATUS=missing
+     elif test $MYSQL_VERSION_MAJOR -le 3 ; then
+-       { $as_echo "$as_me:$LINENO: WARNING: MySQL version too old" >&5
 +       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MySQL version too old" >&5
-+$as_echo "$as_me: WARNING: MySQL version too old" >&2;}
-+       MYSQL_STATUS=missing
-+    fi
-+fi
-+
-+LDFLAGS="$LDFLAGS_SAVE"
-+LIBS="$LIBS $MYSQL_LIBS"
-+CFLAGS="$CFLAGS $MYSQL_CFLAGS"
-+CXXFLAGS="$CXXFLAGS $MYSQL_CFLAGS"
-+CPPFLAGS="$CFLAGS $MYSQL_CFLAGS"
-+
-+if test "x$MYSQL_STATUS" = xyes; then
-+
+ $as_echo "$as_me: WARNING: MySQL version too old" >&2;}
+        MYSQL_STATUS=missing
+     fi
+@@ -22948,121 +12577,25 @@ CPPFLAGS="$CFLAGS $MYSQL_CFLAGS"
+ 
+ if test "x$MYSQL_STATUS" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MYSQL 1
+-_ACEOF
+-
+-
+-
+-
+-for ac_func in mysql_stmt_init
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
 +$as_echo "#define HAVE_MYSQL 1" >>confdefs.h
-+
-+
-+
+ 
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +    for ac_func in mysql_stmt_init
 +do :
 +  ac_fn_cxx_check_func "$LINENO" "mysql_stmt_init" "ac_cv_func_mysql_stmt_init"
 +if test "x$ac_cv_func_mysql_stmt_init" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_MYSQL_STMT_INIT 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
+ _ACEOF
+ 
+ fi
+ done
+ 
+ 
+-    { $as_echo "$as_me:$LINENO: checking MYSQL_OPT_RECONNECT" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking MYSQL_OPT_RECONNECT" >&5
-+$as_echo_n "checking MYSQL_OPT_RECONNECT... " >&6; }
+ $as_echo_n "checking MYSQL_OPT_RECONNECT... " >&6; }
+-    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 <mysql.h>
-+
-+int
-+main ()
-+{
-+
-+                (int)mysql_options(0, MYSQL_OPT_RECONNECT, 0);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+                 #include <mysql.h>
+@@ -23078,44 +12611,21 @@ 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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+
+ 
+-            { $as_echo "$as_me:$LINENO: result: yes" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
+ $as_echo "yes" >&6; }
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MYSQL_OPT_RECONNECT 1
+-_ACEOF
 +$as_echo "#define HAVE_MYSQL_OPT_RECONNECT 1" >>confdefs.h
-+
-+
-+else
-+
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ 
+-            { $as_echo "$as_me:$LINENO: result: no" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
-+    MYSQL_CFLAGS=
-+    MYSQL_LIBS=
-+fi
-+
-+CPPFLAGS="$CPPFLAGS_SAVE"
-+CXXFLAGS="$CXXFLAGS_SAVE"
-+CFLAGS="$CFLAGS_SAVE"
-+LDFLAGS="$LDFLAGS_SAVE"
-+LIBS="$LIBS_SAVE"
-+
-+#########  check if at least one database available
-+
-+if ((test "x$SQLITE3_STATUS" != xyes) && (test "x$MYSQL_STATUS" != xyes)); then
-+    as_fn_error "Support of at least one of mysql or sqlite3 must be configured" "$LINENO" 5
-+fi
-+
-+######### javascript
-+
-+# Check whether --enable-libjs was given.
+ $as_echo "no" >&6; }
+ 
+ 
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
+     MYSQL_CFLAGS=
+@@ -23131,15 +12641,13 @@ LIBS="$LIBS_SAVE"
+ #########  check if at least one database available
+ 
+ if ((test "x$SQLITE3_STATUS" != xyes) && (test "x$MYSQL_STATUS" != xyes)); then
+-    { { $as_echo "$as_me:$LINENO: error: Support of at least one of mysql or sqlite3 must be configured" >&5
+-$as_echo "$as_me: error: Support of at least one of mysql or sqlite3 must be configured" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "Support of at least one of mysql or sqlite3 must be configured" "$LINENO" 5
+ fi
+ 
+ ######### javascript
+ 
+ # Check whether --enable-libjs was given.
+-if test "${enable_libjs+set}" = set; then
 +if test "${enable_libjs+set}" = set; then :
-+  enableval=$enable_libjs;
-+                JS_EN=$enableval
-+                if test "x$enableval" = xno; then
-+                    JS_OK=disabled
-+                else
-+                    JS_OK=yes
-+                fi
-+
-+else
-+
-+                JS_OK=yes
-+
-+
-+fi
-+
-+
-+XP_ADD=""
-+
-+if test "x$JS_OK" = xyes; then
-+        XP_ADD="-DXP_UNIX"
-+
-+    CXXFLAGS="$CXXFLAGS $XP_ADD"
-+    CPPFLAGS="$CPPFLAGS $XP_ADD"
-+
-+    if test -n "$JS_SEARCH_HEADERS" ; then
+   enableval=$enable_libjs;
+                 JS_EN=$enableval
+                 if test "x$enableval" = xno; then
+@@ -23165,156 +12673,17 @@ if test "x$JS_OK" = xyes; then
+     CPPFLAGS="$CPPFLAGS $XP_ADD"
+ 
+     if test -n "$JS_SEARCH_HEADERS" ; then
+-        { $as_echo "$as_me:$LINENO: Will search for js (spidermonkey) headers in $JS_SEARCH_HEADERS" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for js (spidermonkey) headers in $JS_SEARCH_HEADERS" >&5
-+$as_echo "$as_me: Will search for js (spidermonkey) headers in $JS_SEARCH_HEADERS" >&6;}
-+        as_ac_Header=`$as_echo "ac_cv_header_$JS_SEARCH_HEADERS/jsapi.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for js (spidermonkey) headers in $JS_SEARCH_HEADERS" >&6;}
+         as_ac_Header=`$as_echo "ac_cv_header_$JS_SEARCH_HEADERS/jsapi.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $JS_SEARCH_HEADERS/jsapi.h" >&5
+-$as_echo_n "checking for $JS_SEARCH_HEADERS/jsapi.h... " >&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 $JS_SEARCH_HEADERS/jsapi.h usability" >&5
+-$as_echo_n "checking $JS_SEARCH_HEADERS/jsapi.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 <$JS_SEARCH_HEADERS/jsapi.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_cxx_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 $JS_SEARCH_HEADERS/jsapi.h presence" >&5
+-$as_echo_n "checking $JS_SEARCH_HEADERS/jsapi.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 <$JS_SEARCH_HEADERS/jsapi.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $JS_SEARCH_HEADERS/jsapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $JS_SEARCH_HEADERS/jsapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $JS_SEARCH_HEADERS/jsapi.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $JS_SEARCH_HEADERS/jsapi.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $JS_SEARCH_HEADERS/jsapi.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $JS_SEARCH_HEADERS/jsapi.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $JS_SEARCH_HEADERS/jsapi.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $JS_SEARCH_HEADERS/jsapi.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $JS_SEARCH_HEADERS/jsapi.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $JS_SEARCH_HEADERS/jsapi.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $JS_SEARCH_HEADERS/jsapi.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $JS_SEARCH_HEADERS/jsapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $JS_SEARCH_HEADERS/jsapi.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $JS_SEARCH_HEADERS/jsapi.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $JS_SEARCH_HEADERS/jsapi.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $JS_SEARCH_HEADERS/jsapi.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $JS_SEARCH_HEADERS/jsapi.h" >&5
+-$as_echo_n "checking for $JS_SEARCH_HEADERS/jsapi.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$JS_SEARCH_HEADERS/jsapi.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                    JS_CXXFLAGS="-I$JS_SEARCH_HEADERS"
-+
-+else
-+
-+                    as_fn_error "jsapi.h not found in requested location $JS_SEARCH_HEADERS" "$LINENO" 5
-+
-+
-+fi
-+
-+
-+
-+    else
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                     JS_CXXFLAGS="-I$JS_SEARCH_HEADERS"
+ 
+ else
+ 
+-                    { { $as_echo "$as_me:$LINENO: error: jsapi.h not found in requested location $JS_SEARCH_HEADERS" >&5
+-$as_echo "$as_me: error: jsapi.h not found in requested location $JS_SEARCH_HEADERS" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "jsapi.h not found in requested location $JS_SEARCH_HEADERS" "$LINENO" 5
+ 
+ 
+ fi
+@@ -23322,140 +12691,9 @@ fi
+ 
+ 
+     else
+-    if test "${ac_cv_header_jsapi_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for jsapi.h" >&5
+-$as_echo_n "checking for jsapi.h... " >&6; }
+-if test "${ac_cv_header_jsapi_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jsapi_h" >&5
+-$as_echo "$ac_cv_header_jsapi_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking jsapi.h usability" >&5
+-$as_echo_n "checking jsapi.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 <jsapi.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_cxx_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
 +    ac_fn_cxx_check_header_mongrel "$LINENO" "jsapi.h" "ac_cv_header_jsapi_h" "$ac_includes_default"
 +if test "x$ac_cv_header_jsapi_h" = x""yes; then :
-+
-+else
-+
-+            for sm_path in $SEARCH_DIR_HEADERS \
-+                           /usr/include/js \
-+                           /usr/include/smjs \
-+                           /usr/include/mozjs \
-+                           /usr/local/include/js \
-+                           /usr/local/include/smjs \
-+                           /usr/local/include/mozjs \
-+                           /usr/include/spidermonkey \
-+                           /usr/local/include/spidermonkey \
-+                           $SEARCH_DIR_HEADERS/js \
-+                           $SEARCH_DIR_HEADERS/smjs \
-+                           $SEARCH_DIR_HEADERS/mozjs \
-+                           $SEARCH_DIR_HEADERS/spidermonkey; do
-+                if test "x$ac_cv_header_jsapi_h" != xyes ; then
+ 
+-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 jsapi.h presence" >&5
+-$as_echo_n "checking jsapi.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 <jsapi.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: jsapi.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: jsapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for jsapi.h" >&5
+-$as_echo_n "checking for jsapi.h... " >&6; }
+-if test "${ac_cv_header_jsapi_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_jsapi_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jsapi_h" >&5
+-$as_echo "$ac_cv_header_jsapi_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_jsapi_h" = x""yes; then
+-  :
+ else
+ 
+             for sm_path in $SEARCH_DIR_HEADERS \
+@@ -23472,147 +12710,16 @@ else
+                            $SEARCH_DIR_HEADERS/mozjs \
+                            $SEARCH_DIR_HEADERS/spidermonkey; do
+                 if test "x$ac_cv_header_jsapi_h" != xyes ; then
+-                    { $as_echo "$as_me:$LINENO: checking checking alternative libjs header location: $sm_path" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking checking alternative libjs header location: $sm_path" >&5
-+$as_echo_n "checking checking alternative libjs header location: $sm_path... " >&6; }
-+                    CXXFLAGS="$XP_ADD -I$sm_path"
-+                    CPPFLAGS="$XP_ADD -I$sm_path"
-+                    unset ac_cv_header_jsapi_h
+ $as_echo_n "checking checking alternative libjs header location: $sm_path... " >&6; }
+                     CXXFLAGS="$XP_ADD -I$sm_path"
+                     CPPFLAGS="$XP_ADD -I$sm_path"
+                     unset ac_cv_header_jsapi_h
+-                    if test "${ac_cv_header_jsapi_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for jsapi.h" >&5
+-$as_echo_n "checking for jsapi.h... " >&6; }
+-if test "${ac_cv_header_jsapi_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jsapi_h" >&5
+-$as_echo "$ac_cv_header_jsapi_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking jsapi.h usability" >&5
+-$as_echo_n "checking jsapi.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 <jsapi.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_cxx_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 jsapi.h presence" >&5
+-$as_echo_n "checking jsapi.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 <jsapi.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: jsapi.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: jsapi.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: jsapi.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: jsapi.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for jsapi.h" >&5
+-$as_echo_n "checking for jsapi.h... " >&6; }
+-if test "${ac_cv_header_jsapi_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_jsapi_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_jsapi_h" >&5
+-$as_echo "$ac_cv_header_jsapi_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_jsapi_h" = x""yes; then
 +                    ac_fn_cxx_check_header_mongrel "$LINENO" "jsapi.h" "ac_cv_header_jsapi_h" "$ac_includes_default"
 +if test "x$ac_cv_header_jsapi_h" = x""yes; then :
-+
-+                                        JS_CXXFLAGS="-I$sm_path"
+ 
+                                         JS_CXXFLAGS="-I$sm_path"
+-                                        { $as_echo "$as_me:$LINENO: result: jsapi.h found in $sm_path" >&5
 +                                        { $as_echo "$as_me:${as_lineno-$LINENO}: result: jsapi.h found in $sm_path" >&5
-+$as_echo "jsapi.h found in $sm_path" >&6; }
-+
-+fi
-+
-+
-+               fi
-+            done
-+
-+fi
-+
-+
-+
-+        if test "x$ac_cv_header_jsapi_h" != xyes ; then
-+                JS_OK=missing
+ $as_echo "jsapi.h found in $sm_path" >&6; }
+ 
+ fi
+@@ -23627,7 +12734,7 @@ fi
+ 
+         if test "x$ac_cv_header_jsapi_h" != xyes ; then
+                 JS_OK=missing
+-                { $as_echo "$as_me:$LINENO: result: not found, giving up" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found, giving up" >&5
-+$as_echo "not found, giving up" >&6; }
-+        fi
-+    fi
-+fi
-+
-+MOZLIB=
-+if test "x$JS_OK" = xyes; then
-+    if test -n "$JS_SEARCH_LIBS" ; then
+ $as_echo "not found, giving up" >&6; }
+         fi
+     fi
+@@ -23636,21 +12743,17 @@ fi
+ MOZLIB=
+ if test "x$JS_OK" = xyes; then
+     if test -n "$JS_SEARCH_LIBS" ; then
+-        { $as_echo "$as_me:$LINENO: Will search for js (spidermonkey) libraries in $JS_SEARCH_LIBS" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for js (spidermonkey) libraries in $JS_SEARCH_LIBS" >&5
-+$as_echo "$as_me: Will search for js (spidermonkey) libraries in $JS_SEARCH_LIBS" >&6;}
-+        LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -ljs $ADD_PTHREAD_CFLAGS"
+ $as_echo "$as_me: Will search for js (spidermonkey) libraries in $JS_SEARCH_LIBS" >&6;}
+         LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -ljs $ADD_PTHREAD_CFLAGS"
+-        { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -ljs" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_NewObject in -ljs" >&5
-+$as_echo_n "checking for JS_NewObject in -ljs... " >&6; }
+ $as_echo_n "checking for JS_NewObject in -ljs... " >&6; }
+-if test "${ac_cv_lib_js_JS_NewObject+set}" = set; then
 +if test "${ac_cv_lib_js_JS_NewObject+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ljs  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ljs  $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.
-+   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 JS_NewObject ();
-+int
-+main ()
-+{
-+return JS_NewObject ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -23668,43 +12771,18 @@ return JS_NewObject ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_js_JS_NewObject=yes
-+else
+   ac_cv_lib_js_JS_NewObject=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_js_JS_NewObject=no
 +  ac_cv_lib_js_JS_NewObject=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_js_JS_NewObject" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_js_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_js_JS_NewObject" >&6; }
+ $as_echo "$ac_cv_lib_js_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_js_JS_NewObject" = x""yes; then
 +if test "x$ac_cv_lib_js_JS_NewObject" = x""yes; then :
-+
-+                    JS_LIBS="-L$JS_SEARCH_LIBS -ljs"
-+                    MOZLIB=js
-+
-+else
-+
-+                    LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lsmjs $ADD_PTHREAD_CFLAGS"
+ 
+                     JS_LIBS="-L$JS_SEARCH_LIBS -ljs"
+                     MOZLIB=js
+@@ -23712,18 +12790,14 @@ if test "x$ac_cv_lib_js_JS_NewObject" = x""yes; then
+ else
+ 
+                     LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lsmjs $ADD_PTHREAD_CFLAGS"
+-                    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lsmjs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_NewObject in -lsmjs" >&5
-+$as_echo_n "checking for JS_NewObject in -lsmjs... " >&6; }
+ $as_echo_n "checking for JS_NewObject in -lsmjs... " >&6; }
+-if test "${ac_cv_lib_smjs_JS_NewObject+set}" = set; then
 +if test "${ac_cv_lib_smjs_JS_NewObject+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsmjs  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsmjs  $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.
-+   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 JS_NewObject ();
-+int
-+main ()
-+{
-+return JS_NewObject ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -23741,43 +12815,18 @@ return JS_NewObject ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_smjs_JS_NewObject=yes
-+else
+   ac_cv_lib_smjs_JS_NewObject=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_smjs_JS_NewObject=no
 +  ac_cv_lib_smjs_JS_NewObject=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_smjs_JS_NewObject" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smjs_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_smjs_JS_NewObject" >&6; }
+ $as_echo "$ac_cv_lib_smjs_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_smjs_JS_NewObject" = x""yes; then
 +if test "x$ac_cv_lib_smjs_JS_NewObject" = x""yes; then :
-+
-+                            JS_LIBS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lsmjs $ADD_PTHREAD_CFLAGS"
-+                            MOZLIB=smjs
-+
-+else
-+
-+                            LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS"
+ 
+                             JS_LIBS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lsmjs $ADD_PTHREAD_CFLAGS"
+                             MOZLIB=smjs
+@@ -23785,18 +12834,14 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" = x""yes; then
+ else
+ 
+                             LDFLAGS="-L$JS_SEARCH_LIBS $LDFLAGS_SAVE -lmozjs $ADD_PTHREAD_CFLAGS"
+-                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
 +                            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_NewObject in -lmozjs" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
+ $as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
+-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
 +if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmozjs  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmozjs  $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.
-+   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 JS_NewObject ();
-+int
-+main ()
-+{
-+return JS_NewObject ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -23814,52 +12859,25 @@ return JS_NewObject ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_mozjs_JS_NewObject=yes
-+else
+   ac_cv_lib_mozjs_JS_NewObject=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_mozjs_JS_NewObject=no
 +  ac_cv_lib_mozjs_JS_NewObject=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
+ $as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
 +if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then :
-+
-+                                    JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs"
-+                                    MOZLIB=mozjs
-+
-+else
-+
-+                                    as_fn_error "Spidermonkey not found in requested location $JS_SEARCH_LIBS" "$LINENO" 5
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    else
-+    LDFLAGS="$LDFLAGS_SAVE $ADD_PTHREAD_CFLAGS"
+ 
+                                     JS_LIBS="-L$JS_SEARCH_LIBS -lmozjs"
+                                     MOZLIB=mozjs
+ 
+ else
+ 
+-                                    { { $as_echo "$as_me:$LINENO: error: Spidermonkey not found in requested location $JS_SEARCH_LIBS" >&5
+-$as_echo "$as_me: error: Spidermonkey not found in requested location $JS_SEARCH_LIBS" >&2;}
+-   { (exit 1); exit 1; }; }
++                                    as_fn_error $? "Spidermonkey not found in requested location $JS_SEARCH_LIBS" "$LINENO" 5
+ 
+ 
+ fi
+@@ -23874,18 +12892,14 @@ fi
+ 
+     else
+     LDFLAGS="$LDFLAGS_SAVE $ADD_PTHREAD_CFLAGS"
+-    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -ljs" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_NewObject in -ljs" >&5
-+$as_echo_n "checking for JS_NewObject in -ljs... " >&6; }
+ $as_echo_n "checking for JS_NewObject in -ljs... " >&6; }
+-if test "${ac_cv_lib_js_JS_NewObject+set}" = set; then
 +if test "${ac_cv_lib_js_JS_NewObject+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ljs  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ljs  $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.
-+   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 JS_NewObject ();
-+int
-+main ()
-+{
-+return JS_NewObject ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -23903,43 +12917,18 @@ return JS_NewObject ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_js_JS_NewObject=yes
-+else
+   ac_cv_lib_js_JS_NewObject=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_js_JS_NewObject=no
 +  ac_cv_lib_js_JS_NewObject=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_js_JS_NewObject" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_js_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_js_JS_NewObject" >&6; }
+ $as_echo "$ac_cv_lib_js_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_js_JS_NewObject" = x""yes; then
 +if test "x$ac_cv_lib_js_JS_NewObject" = x""yes; then :
-+
-+            MOZLIB=js
-+            JS_LIBS="-ljs"
-+
-+else
-+
-+            unset ac_cv_lib_js_JS_NewObject
+ 
+             MOZLIB=js
+             JS_LIBS="-ljs"
+@@ -23947,18 +12936,14 @@ if test "x$ac_cv_lib_js_JS_NewObject" = x""yes; then
+ else
+ 
+             unset ac_cv_lib_js_JS_NewObject
+-            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lsmjs" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_NewObject in -lsmjs" >&5
-+$as_echo_n "checking for JS_NewObject in -lsmjs... " >&6; }
+ $as_echo_n "checking for JS_NewObject in -lsmjs... " >&6; }
+-if test "${ac_cv_lib_smjs_JS_NewObject+set}" = set; then
 +if test "${ac_cv_lib_smjs_JS_NewObject+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsmjs  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsmjs  $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.
-+   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 JS_NewObject ();
-+int
-+main ()
-+{
-+return JS_NewObject ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -23976,43 +12961,18 @@ return JS_NewObject ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_smjs_JS_NewObject=yes
-+else
+   ac_cv_lib_smjs_JS_NewObject=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_smjs_JS_NewObject=no
 +  ac_cv_lib_smjs_JS_NewObject=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_smjs_JS_NewObject" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smjs_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_smjs_JS_NewObject" >&6; }
+ $as_echo "$ac_cv_lib_smjs_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_smjs_JS_NewObject" = x""yes; then
 +if test "x$ac_cv_lib_smjs_JS_NewObject" = x""yes; then :
-+
-+                    JS_LIBS="-lsmjs"
-+                    MOZLIB=smjs
-+
-+else
-+
-+                    unset ac_cv_lib_smjs_JS_NewObject
+ 
+                     JS_LIBS="-lsmjs"
+                     MOZLIB=smjs
+@@ -24020,18 +12980,14 @@ if test "x$ac_cv_lib_smjs_JS_NewObject" = x""yes; then
+ else
+ 
+                     unset ac_cv_lib_smjs_JS_NewObject
+-                    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_NewObject in -lmozjs" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
+ $as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
+-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
 +if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmozjs  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmozjs  $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.
-+   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 JS_NewObject ();
-+int
-+main ()
-+{
-+return JS_NewObject ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -24049,43 +13005,18 @@ return JS_NewObject ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_mozjs_JS_NewObject=yes
-+else
+   ac_cv_lib_mozjs_JS_NewObject=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_mozjs_JS_NewObject=no
 +  ac_cv_lib_mozjs_JS_NewObject=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
+ $as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
 +if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then :
-+
-+                            MOZLIB=mozjs
-+                            JS_LIBS="-lmozjs"
-+
-+else
-+
-+                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE $ADD_PTHREAD_CFLAGS"
-+                            unset ac_cv_lib_js_JS_NewObject
+ 
+                             MOZLIB=mozjs
+                             JS_LIBS="-lmozjs"
+@@ -24094,18 +13025,14 @@ else
+ 
+                             LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE $ADD_PTHREAD_CFLAGS"
+                             unset ac_cv_lib_js_JS_NewObject
+-                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -ljs" >&5
 +                            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_NewObject in -ljs" >&5
-+$as_echo_n "checking for JS_NewObject in -ljs... " >&6; }
+ $as_echo_n "checking for JS_NewObject in -ljs... " >&6; }
+-if test "${ac_cv_lib_js_JS_NewObject+set}" = set; then
 +if test "${ac_cv_lib_js_JS_NewObject+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ljs  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ljs  $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.
-+   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 JS_NewObject ();
-+int
-+main ()
-+{
-+return JS_NewObject ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -24123,43 +13050,18 @@ return JS_NewObject ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_js_JS_NewObject=yes
-+else
+   ac_cv_lib_js_JS_NewObject=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_js_JS_NewObject=no
 +  ac_cv_lib_js_JS_NewObject=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_js_JS_NewObject" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_js_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_js_JS_NewObject" >&6; }
+ $as_echo "$ac_cv_lib_js_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_js_JS_NewObject" = x""yes; then
 +if test "x$ac_cv_lib_js_JS_NewObject" = x""yes; then :
-+
-+                                    JS_LIBS="-L$SEARCH_DIR_LIBS -ljs"
-+                                    MOZLIB=js
-+
-+else
-+
-+                                    unset ac_cv_lib_smjs_JS_NewObject
+ 
+                                     JS_LIBS="-L$SEARCH_DIR_LIBS -ljs"
+                                     MOZLIB=js
+@@ -24167,18 +13069,14 @@ if test "x$ac_cv_lib_js_JS_NewObject" = x""yes; then
+ else
+ 
+                                     unset ac_cv_lib_smjs_JS_NewObject
+-                                    { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lsmjs" >&5
 +                                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_NewObject in -lsmjs" >&5
-+$as_echo_n "checking for JS_NewObject in -lsmjs... " >&6; }
+ $as_echo_n "checking for JS_NewObject in -lsmjs... " >&6; }
+-if test "${ac_cv_lib_smjs_JS_NewObject+set}" = set; then
 +if test "${ac_cv_lib_smjs_JS_NewObject+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lsmjs  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lsmjs  $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.
-+   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 JS_NewObject ();
-+int
-+main ()
-+{
-+return JS_NewObject ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -24196,43 +13094,18 @@ return JS_NewObject ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_smjs_JS_NewObject=yes
-+else
+   ac_cv_lib_smjs_JS_NewObject=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_smjs_JS_NewObject=no
 +  ac_cv_lib_smjs_JS_NewObject=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_smjs_JS_NewObject" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_smjs_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_smjs_JS_NewObject" >&6; }
+ $as_echo "$ac_cv_lib_smjs_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_smjs_JS_NewObject" = x""yes; then
 +if test "x$ac_cv_lib_smjs_JS_NewObject" = x""yes; then :
-+
-+                                            JS_LIBS="-L$SEARCH_DIR_LIBS -lsmjs"
-+                                            MOZLIB=smjs
-+
-+else
-+
-+                                            LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
-+                                            unset ac_cv_lib_mozjs_JS_NewObject
+ 
+                                             JS_LIBS="-L$SEARCH_DIR_LIBS -lsmjs"
+                                             MOZLIB=smjs
+@@ -24241,18 +13114,14 @@ else
+ 
+                                             LDFLAGS="-L$SEARCH_DIR_LIBS $LDFLAGS_SAVE -lmozjs"
+                                             unset ac_cv_lib_mozjs_JS_NewObject
+-                                            { $as_echo "$as_me:$LINENO: checking for JS_NewObject in -lmozjs" >&5
 +                                            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_NewObject in -lmozjs" >&5
-+$as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
+ $as_echo_n "checking for JS_NewObject in -lmozjs... " >&6; }
+-if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then
 +if test "${ac_cv_lib_mozjs_JS_NewObject+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmozjs  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmozjs  $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.
-+   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 JS_NewObject ();
-+int
-+main ()
-+{
-+return JS_NewObject ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -24270,43 +13139,18 @@ return JS_NewObject ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_mozjs_JS_NewObject=yes
-+else
+   ac_cv_lib_mozjs_JS_NewObject=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_mozjs_JS_NewObject=no
 +  ac_cv_lib_mozjs_JS_NewObject=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mozjs_JS_NewObject" >&5
-+$as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
+ $as_echo "$ac_cv_lib_mozjs_JS_NewObject" >&6; }
+-if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
 +if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then :
-+
-+                                                    JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs"
-+                                                    MOZLIB=mozjs
-+
-+else
-+
-+                                                    JS_OK=missing
+ 
+                                                     JS_LIBS="-L$SEARCH_DIR_LIBS -lmozjs"
+                                                     MOZLIB=mozjs
+@@ -24314,7 +13158,7 @@ if test "x$ac_cv_lib_mozjs_JS_NewObject" = x""yes; then
+ else
+ 
+                                                     JS_OK=missing
+-                                                    { $as_echo "$as_me:$LINENO: result: libjs/libsmjs link failed" >&5
 +                                                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: libjs/libsmjs link failed" >&5
-+$as_echo "libjs/libsmjs link failed" >&6; }
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+fi
-+if test "x$JS_OK" = xyes; then
-+
+ $as_echo "libjs/libsmjs link failed" >&6; }
+ 
+ 
+@@ -24344,9 +13188,7 @@ fi
+ fi
+ if test "x$JS_OK" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_JS 1
+-_ACEOF
 +$as_echo "#define HAVE_JS 1" >>confdefs.h
-+
-+
-+
-+
-+    LDFLAGS="$LDFLAGS $JS_LIBS"
-+    CFLAGS="$CFLAGS $JS_CXXFLAGS"
-+    CXXFLAGS="$CXXFLAGS $JS_CXXFLAGS"
-+
-+    as_ac_Lib=`$as_echo "ac_cv_lib_$MOZLIB''_JS_ClearContextThread" | $as_tr_sh`
+ 
+ 
+ 
+@@ -24356,18 +13198,14 @@ _ACEOF
+     CXXFLAGS="$CXXFLAGS $JS_CXXFLAGS"
+ 
+     as_ac_Lib=`$as_echo "ac_cv_lib_$MOZLIB''_JS_ClearContextThread" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for JS_ClearContextThread in -l$MOZLIB" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JS_ClearContextThread in -l$MOZLIB" >&5
-+$as_echo_n "checking for JS_ClearContextThread in -l$MOZLIB... " >&6; }
-+if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-l$MOZLIB  $LIBS"
+ $as_echo_n "checking for JS_ClearContextThread in -l$MOZLIB... " >&6; }
+-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then
++if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-l$MOZLIB  $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.
-+   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 JS_ClearContextThread ();
-+int
-+main ()
-+{
-+return JS_ClearContextThread ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -24385,61 +13223,29 @@ return JS_ClearContextThread ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  eval "$as_ac_Lib=yes"
-+else
+   eval "$as_ac_Lib=yes"
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_Lib=no"
 +  eval "$as_ac_Lib=no"
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-ac_res=`eval 'as_val=${'$as_ac_Lib'}
+-		 $as_echo "$as_val"'`
+-	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 +eval ac_res=\$$as_ac_Lib
 +	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+eval as_val=\$$as_ac_Lib
-+   if test "x$as_val" = x""yes; then :
-+
-+
+ $as_echo "$ac_res" >&6; }
+-as_val=`eval 'as_val=${'$as_ac_Lib'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define JS_THREADSAFE 1
+-_ACEOF
 +$as_echo "#define JS_THREADSAFE 1" >>confdefs.h
-+
-+
-+fi
-+
-+else
-+    if test "x$JS_EN" = xyes; then
-+        as_fn_error "unable to configure libjs support" "$LINENO" 5
-+    fi
-+fi
-+
-+CXXFLAGS="$CXXFLAGS_SAVE"
-+CPPFLAGS="$CPPFLAGS_SAVE"
-+LDFLAGS="$LDFLAGS_SAVE"
-+
-+########### libmagic
-+
-+
-+    mt_libmagic_option_enabled=
-+    mt_libmagic_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_libmagic_option_enabled=yes
-+    else
-+        mt_libmagic_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-libmagic was given.
+ 
+ 
+ fi
+ 
+ else
+     if test "x$JS_EN" = xyes; then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure libjs support" >&5
+-$as_echo "$as_me: error: unable to configure libjs support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure libjs support" "$LINENO" 5
+     fi
+ fi
+ 
+@@ -24459,7 +13265,7 @@ LDFLAGS="$LDFLAGS_SAVE"
+     fi
+ 
+     # Check whether --enable-libmagic was given.
+-if test "${enable_libmagic+set}" = set; then
 +if test "${enable_libmagic+set}" = set; then :
-+  enableval=$enable_libmagic;
-+            mt_libmagic_option_enabled=$enableval
-+            mt_libmagic_option_requested=yes
-+
-+
-+fi
-+
-+
-+    LIBMAGIC_OPTION_ENABLED=${mt_libmagic_option_enabled}
-+    LIBMAGIC_OPTION_REQUESTED=${mt_libmagic_option_requested}
-+
-+
-+
-+
+   enableval=$enable_libmagic;
+             mt_libmagic_option_enabled=$enableval
+             mt_libmagic_option_requested=yes
+@@ -24474,7 +13280,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_libmagic_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+if test "x$LIBMAGIC_OPTION_ENABLED" = xyes; then
-+
-+    mt_libmagic_status=yes
-+
-+    if test "x$mt_libmagic_status" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_libmagic_header_status=yes
-+
-+
-+# Check whether --with-libmagic-h was given.
+ 
+ if test "x$LIBMAGIC_OPTION_ENABLED" = xyes; then
+ 
+@@ -24493,10 +13301,10 @@ if test "x$LIBMAGIC_OPTION_ENABLED" = xyes; then
+ 
+ 
+ # Check whether --with-libmagic-h was given.
+-if test "${with_libmagic_h+set}" = set; then
 +if test "${with_libmagic_h+set}" = set; then :
-+  withval=$with_libmagic_h;
-+            mt_libmagic_search_headers="$withval"
+   withval=$with_libmagic_h;
+             mt_libmagic_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libmagic headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libmagic headers in $withval" >&5
-+$as_echo "$as_me: Will search for libmagic headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libmagic_search_headers" ; then
-+        unset ac_cv_header_magic_h
-+        CFLAGS="$CFLAGS -I${mt_libmagic_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_libmagic_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_libmagic_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_libmagic_search_headers/magic.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for libmagic headers in $withval" >&6;}
+ 
+ 
+@@ -24509,145 +13317,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_libmagic_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_libmagic_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_libmagic_search_headers/magic.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_libmagic_search_headers/magic.h" >&5
+-$as_echo_n "checking for $mt_libmagic_search_headers/magic.h... " >&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 $mt_libmagic_search_headers/magic.h usability" >&5
+-$as_echo_n "checking $mt_libmagic_search_headers/magic.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 <$mt_libmagic_search_headers/magic.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_cxx_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 $mt_libmagic_search_headers/magic.h presence" >&5
+-$as_echo_n "checking $mt_libmagic_search_headers/magic.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 <$mt_libmagic_search_headers/magic.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_libmagic_search_headers/magic.h" >&5
+-$as_echo_n "checking for $mt_libmagic_search_headers/magic.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_libmagic_search_headers/magic.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_libmagic_cxxflags="-I${mt_libmagic_search_headers}"
-+
-+else
-+
-+                mt_libmagic_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_libmagic_cxxflags="-I${mt_libmagic_search_headers}"
+ 
+@@ -24655,12 +13326,10 @@ else
+ 
+                 mt_libmagic_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libmagic headers not found in requested location $mt_libmagic_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmagic headers not found in requested location $mt_libmagic_search_headers" >&5
-+$as_echo "$as_me: libmagic headers not found in requested location $mt_libmagic_search_headers" >&6;}
-+                else
-+                    as_fn_error "libmagic headers not found in requested location $mt_libmagic_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_magic_h
+ $as_echo "$as_me: libmagic headers not found in requested location $mt_libmagic_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libmagic headers not found in requested location $mt_libmagic_search_headers" >&5
+-$as_echo "$as_me: error: libmagic headers not found in requested location $mt_libmagic_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libmagic headers not found in requested location $mt_libmagic_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -24669,140 +13338,9 @@ fi
+ 
+     else
+         unset ac_cv_header_magic_h
+-        if test "${ac_cv_header_magic_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for magic.h" >&5
+-$as_echo_n "checking for magic.h... " >&6; }
+-if test "${ac_cv_header_magic_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_magic_h" >&5
+-$as_echo "$ac_cv_header_magic_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking magic.h usability" >&5
+-$as_echo_n "checking magic.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 <magic.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_cxx_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 magic.h presence" >&5
+-$as_echo_n "checking magic.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 <magic.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_cxx_preproc_warn_flag$ac_cxx_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_fn_cxx_check_header_mongrel "$LINENO" "magic.h" "ac_cv_header_magic_h" "$ac_includes_default"
 +if test "x$ac_cv_header_magic_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_magic_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/magic.h" | $as_tr_sh`
+ 
+-  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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: magic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: magic.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: magic.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: magic.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: magic.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: magic.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: magic.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: magic.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for magic.h" >&5
+-$as_echo_n "checking for magic.h... " >&6; }
+-if test "${ac_cv_header_magic_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_magic_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_magic_h" >&5
+-$as_echo "$ac_cv_header_magic_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_magic_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -24810,145 +13348,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_magic_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/magic.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/magic.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/magic.h... " >&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 $MT_SEARCHPATH_HEADERS/magic.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/magic.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 <$MT_SEARCHPATH_HEADERS/magic.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_cxx_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 $MT_SEARCHPATH_HEADERS/magic.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/magic.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 <$MT_SEARCHPATH_HEADERS/magic.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/magic.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/magic.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/magic.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_libmagic_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_libmagic_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_libmagic_header_status" != xyes; then
-+        mt_libmagic_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_libmagic_package_status=${mt_libmagic_header_status}
-+
-+    if test "x$mt_libmagic_package_status" = xyes; then
-+
-+    mt_libmagic_arg_default=yes
-+    mt_libmagic_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-libmagic-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_libmagic_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -24992,10 +13393,10 @@ fi
+ 
+ 
+ # Check whether --with-libmagic-libs was given.
+-if test "${with_libmagic_libs+set}" = set; then
 +if test "${with_libmagic_libs+set}" = set; then :
-+  withval=$with_libmagic_libs;
-+            mt_libmagic_search_libs="$withval"
+   withval=$with_libmagic_libs;
+             mt_libmagic_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libmagic libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libmagic libs in $withval" >&5
-+$as_echo "$as_me: Will search for libmagic libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libmagic_search_libs" ; then
-+        unset ac_cv_lib_magic_magic_load
-+        LDFLAGS="$LDFLAGS -L$mt_libmagic_search_libs"
+ $as_echo "$as_me: Will search for libmagic libs in $withval" >&6;}
+ 
+ 
+@@ -25005,18 +13406,14 @@ fi
+     if test "$mt_libmagic_search_libs" ; then
+         unset ac_cv_lib_magic_magic_load
+         LDFLAGS="$LDFLAGS -L$mt_libmagic_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for magic_load in -lmagic" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_load in -lmagic" >&5
-+$as_echo_n "checking for magic_load in -lmagic... " >&6; }
+ $as_echo_n "checking for magic_load in -lmagic... " >&6; }
+-if test "${ac_cv_lib_magic_magic_load+set}" = set; then
 +if test "${ac_cv_lib_magic_magic_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmagic  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmagic  $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.
-+   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 magic_load ();
-+int
-+main ()
-+{
-+return magic_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25034,43 +13431,18 @@ return magic_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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_magic_magic_load=yes
-+else
+   ac_cv_lib_magic_magic_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_magic_magic_load=no
 +  ac_cv_lib_magic_magic_load=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_load" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_load" >&5
-+$as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+ $as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+-if test "x$ac_cv_lib_magic_magic_load" = x""yes; then
 +if test "x$ac_cv_lib_magic_magic_load" = x""yes; then :
-+
-+                mt_libmagic_libs="-lmagic"
-+                mt_libmagic_ldflags="-L$mt_libmagic_search_libs"
-+
-+else
-+
-+                mt_libmagic_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_libmagic_libs="-lmagic"
+                 mt_libmagic_ldflags="-L$mt_libmagic_search_libs"
+@@ -25079,12 +13451,10 @@ else
+ 
+                 mt_libmagic_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
-+$as_echo "$as_me: libmagic library not found in requested location $mt_libmagic_search_libs" >&6;}
-+                else
-+                    as_fn_error "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_magic_magic_load
+ $as_echo "$as_me: libmagic library not found in requested location $mt_libmagic_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
+-$as_echo "$as_me: error: libmagic library not found in requested location $mt_libmagic_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -25092,18 +13462,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_magic_magic_load
+-        { $as_echo "$as_me:$LINENO: checking for magic_load in -lmagic" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_load in -lmagic" >&5
-+$as_echo_n "checking for magic_load in -lmagic... " >&6; }
+ $as_echo_n "checking for magic_load in -lmagic... " >&6; }
+-if test "${ac_cv_lib_magic_magic_load+set}" = set; then
 +if test "${ac_cv_lib_magic_magic_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmagic  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmagic  $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.
-+   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 magic_load ();
-+int
-+main ()
-+{
-+return magic_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25121,43 +13487,18 @@ return magic_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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_magic_magic_load=yes
-+else
+   ac_cv_lib_magic_magic_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_magic_magic_load=no
 +  ac_cv_lib_magic_magic_load=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_load" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_load" >&5
-+$as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+ $as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+-if test "x$ac_cv_lib_magic_magic_load" = x""yes; then
 +if test "x$ac_cv_lib_magic_magic_load" = x""yes; then :
-+
-+                mt_libmagic_libs="-lmagic"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_magic_magic_load
+ 
+                 mt_libmagic_libs="-lmagic"
+ 
+@@ -25165,18 +13506,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_magic_magic_load
+-                { $as_echo "$as_me:$LINENO: checking for magic_load in -lmagic" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_load in -lmagic" >&5
-+$as_echo_n "checking for magic_load in -lmagic... " >&6; }
+ $as_echo_n "checking for magic_load in -lmagic... " >&6; }
+-if test "${ac_cv_lib_magic_magic_load+set}" = set; then
 +if test "${ac_cv_lib_magic_magic_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmagic  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmagic  $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.
-+   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 magic_load ();
-+int
-+main ()
-+{
-+return magic_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25194,43 +13531,18 @@ return magic_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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_magic_magic_load=yes
-+else
+   ac_cv_lib_magic_magic_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_magic_magic_load=no
 +  ac_cv_lib_magic_magic_load=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_load" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_load" >&5
-+$as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+ $as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+-if test "x$ac_cv_lib_magic_magic_load" = x""yes; then
 +if test "x$ac_cv_lib_magic_magic_load" = x""yes; then :
-+
-+                        mt_libmagic_libs="-lmagic"
-+                        mt_libmagic_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_libmagic_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_libmagic_library_status" != xyes; then
-+        mt_libmagic_libs=""
-+        mt_libmagic_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_libmagic_package_status=${mt_libmagic_library_status}
-+    fi
-+
-+    if test "x$mt_libmagic_package_status" = xyes; then
-+        LIBMAGIC_CFLAGS=${mt_libmagic_cxxflags}
-+        LIBMAGIC_LIBS=${mt_libmagic_libs}
-+        LIBMAGIC_LDFLAGS=${mt_libmagic_ldflags}
-+    fi
-+
-+        mt_libmagic_status=${mt_libmagic_package_status}
-+    fi
-+
-+    if test "x$mt_libmagic_status" = xyes; then
-+
+ 
+                         mt_libmagic_libs="-lmagic"
+                         mt_libmagic_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -25273,9 +13585,7 @@ fi
+ 
+     if test "x$mt_libmagic_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBMAGIC 1
+-_ACEOF
 +$as_echo "#define HAVE_LIBMAGIC 1" >>confdefs.h
-+
-+    fi
-+
-+    LIBMAGIC_STATUS=${mt_libmagic_status}
-+
-+
-+
-+
-+
-+
-+
-+    if test "x$LIBMAGIC_STATUS" != xyes; then
-+        if test "x$ZLIB_STATUS" != xyes; then
-+
-+
-+    mt_zlib_arg_default=yes
-+    mt_zlib_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-zlib-libs was given.
+ 
+     fi
+ 
+@@ -25302,10 +13612,10 @@ _ACEOF
+ 
+ 
+ # Check whether --with-zlib-libs was given.
+-if test "${with_zlib_libs+set}" = set; then
 +if test "${with_zlib_libs+set}" = set; then :
-+  withval=$with_zlib_libs;
-+            mt_zlib_search_libs="$withval"
+   withval=$with_zlib_libs;
+             mt_zlib_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for zlib libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for zlib libs in $withval" >&5
-+$as_echo "$as_me: Will search for zlib libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_zlib_search_libs" ; then
-+        unset ac_cv_lib_z_compress
-+        LDFLAGS="$LDFLAGS -L$mt_zlib_search_libs"
+ $as_echo "$as_me: Will search for zlib libs in $withval" >&6;}
+ 
+ 
+@@ -25315,18 +13625,14 @@ fi
+     if test "$mt_zlib_search_libs" ; then
+         unset ac_cv_lib_z_compress
+         LDFLAGS="$LDFLAGS -L$mt_zlib_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for compress in -lz" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
-+$as_echo_n "checking for compress in -lz... " >&6; }
+ $as_echo_n "checking for compress in -lz... " >&6; }
+-if test "${ac_cv_lib_z_compress+set}" = set; then
 +if test "${ac_cv_lib_z_compress+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lz  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lz  $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.
-+   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 compress ();
-+int
-+main ()
-+{
-+return compress ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25344,43 +13650,18 @@ return compress ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_z_compress=yes
-+else
+   ac_cv_lib_z_compress=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_z_compress=no
 +  ac_cv_lib_z_compress=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
-+$as_echo "$ac_cv_lib_z_compress" >&6; }
+ $as_echo "$ac_cv_lib_z_compress" >&6; }
+-if test "x$ac_cv_lib_z_compress" = x""yes; then
 +if test "x$ac_cv_lib_z_compress" = x""yes; then :
-+
-+                mt_zlib_libs="-lz"
-+                mt_zlib_ldflags="-L$mt_zlib_search_libs"
-+
-+else
-+
-+                mt_zlib_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_zlib_libs="-lz"
+                 mt_zlib_ldflags="-L$mt_zlib_search_libs"
+@@ -25389,12 +13670,10 @@ else
+ 
+                 mt_zlib_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: zlib library not found in requested location $mt_zlib_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: zlib library not found in requested location $mt_zlib_search_libs" >&5
-+$as_echo "$as_me: zlib library not found in requested location $mt_zlib_search_libs" >&6;}
-+                else
-+                    as_fn_error "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_z_compress
+ $as_echo "$as_me: zlib library not found in requested location $mt_zlib_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: zlib library not found in requested location $mt_zlib_search_libs" >&5
+-$as_echo "$as_me: error: zlib library not found in requested location $mt_zlib_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -25402,18 +13681,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_z_compress
+-        { $as_echo "$as_me:$LINENO: checking for compress in -lz" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
-+$as_echo_n "checking for compress in -lz... " >&6; }
+ $as_echo_n "checking for compress in -lz... " >&6; }
+-if test "${ac_cv_lib_z_compress+set}" = set; then
 +if test "${ac_cv_lib_z_compress+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lz  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lz  $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.
-+   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 compress ();
-+int
-+main ()
-+{
-+return compress ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25431,43 +13706,18 @@ return compress ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_z_compress=yes
-+else
+   ac_cv_lib_z_compress=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_z_compress=no
 +  ac_cv_lib_z_compress=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
-+$as_echo "$ac_cv_lib_z_compress" >&6; }
+ $as_echo "$ac_cv_lib_z_compress" >&6; }
+-if test "x$ac_cv_lib_z_compress" = x""yes; then
 +if test "x$ac_cv_lib_z_compress" = x""yes; then :
-+
-+                mt_zlib_libs="-lz"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_z_compress
+ 
+                 mt_zlib_libs="-lz"
+ 
+@@ -25475,18 +13725,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_z_compress
+-                { $as_echo "$as_me:$LINENO: checking for compress in -lz" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
-+$as_echo_n "checking for compress in -lz... " >&6; }
+ $as_echo_n "checking for compress in -lz... " >&6; }
+-if test "${ac_cv_lib_z_compress+set}" = set; then
 +if test "${ac_cv_lib_z_compress+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lz  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lz  $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.
-+   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 compress ();
-+int
-+main ()
-+{
-+return compress ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -25504,43 +13750,18 @@ return compress ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_z_compress=yes
-+else
+   ac_cv_lib_z_compress=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_z_compress=no
 +  ac_cv_lib_z_compress=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
-+$as_echo "$ac_cv_lib_z_compress" >&6; }
+ $as_echo "$ac_cv_lib_z_compress" >&6; }
+-if test "x$ac_cv_lib_z_compress" = x""yes; then
 +if test "x$ac_cv_lib_z_compress" = x""yes; then :
-+
-+                        mt_zlib_libs="-lz"
-+                        mt_zlib_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_zlib_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_zlib_library_status" != xyes; then
-+        mt_zlib_libs=""
-+        mt_zlib_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+
-+    ZLIB_LIBS=${mt_zlib_libs}
-+    ZLIB_LDFLAGS=${mt_zlib_ldflags}
-+    ZLIB_STATUS=${mt_zlib_library_status}
-+
-+
-+
-+
-+
-+            LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS"
-+            LIBS="$LIBS $ZLIB_LIBS"
+ 
+                         mt_zlib_libs="-lz"
+                         mt_zlib_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -25580,7 +13801,7 @@ fi
+ 
+             LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS"
+             LIBS="$LIBS $ZLIB_LIBS"
+-            { $as_echo "$as_me:$LINENO: retrying libmagic check with zlib flags" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: retrying libmagic check with zlib flags" >&5
-+$as_echo "$as_me: retrying libmagic check with zlib flags" >&6;}
-+
-+    mt_libmagic_status=yes
-+
-+    if test "x$mt_libmagic_status" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_libmagic_header_status=yes
-+
-+
-+# Check whether --with-libmagic-h was given.
+ $as_echo "$as_me: retrying libmagic check with zlib flags" >&6;}
+ 
+     mt_libmagic_status=yes
+@@ -25598,10 +13819,10 @@ $as_echo "$as_me: retrying libmagic check with zlib flags" >&6;}
+ 
+ 
+ # Check whether --with-libmagic-h was given.
+-if test "${with_libmagic_h+set}" = set; then
 +if test "${with_libmagic_h+set}" = set; then :
-+  withval=$with_libmagic_h;
-+            mt_libmagic_search_headers="$withval"
+   withval=$with_libmagic_h;
+             mt_libmagic_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libmagic headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libmagic headers in $withval" >&5
-+$as_echo "$as_me: Will search for libmagic headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libmagic_search_headers" ; then
-+        unset ac_cv_header_magic_h
-+        CFLAGS="$CFLAGS -I${mt_libmagic_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_libmagic_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_libmagic_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_libmagic_search_headers/magic.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for libmagic headers in $withval" >&6;}
+ 
+ 
+@@ -25614,145 +13835,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_libmagic_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_libmagic_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_libmagic_search_headers/magic.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_libmagic_search_headers/magic.h" >&5
+-$as_echo_n "checking for $mt_libmagic_search_headers/magic.h... " >&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 $mt_libmagic_search_headers/magic.h usability" >&5
+-$as_echo_n "checking $mt_libmagic_search_headers/magic.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 <$mt_libmagic_search_headers/magic.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_cxx_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 $mt_libmagic_search_headers/magic.h presence" >&5
+-$as_echo_n "checking $mt_libmagic_search_headers/magic.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 <$mt_libmagic_search_headers/magic.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_libmagic_search_headers/magic.h" >&5
+-$as_echo_n "checking for $mt_libmagic_search_headers/magic.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_libmagic_search_headers/magic.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_libmagic_cxxflags="-I${mt_libmagic_search_headers}"
-+
-+else
-+
-+                mt_libmagic_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_libmagic_cxxflags="-I${mt_libmagic_search_headers}"
+ 
+@@ -25760,12 +13844,10 @@ else
+ 
+                 mt_libmagic_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libmagic headers not found in requested location $mt_libmagic_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmagic headers not found in requested location $mt_libmagic_search_headers" >&5
-+$as_echo "$as_me: libmagic headers not found in requested location $mt_libmagic_search_headers" >&6;}
-+                else
-+                    as_fn_error "libmagic headers not found in requested location $mt_libmagic_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_magic_h
+ $as_echo "$as_me: libmagic headers not found in requested location $mt_libmagic_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libmagic headers not found in requested location $mt_libmagic_search_headers" >&5
+-$as_echo "$as_me: error: libmagic headers not found in requested location $mt_libmagic_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libmagic headers not found in requested location $mt_libmagic_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -25774,140 +13856,9 @@ fi
+ 
+     else
+         unset ac_cv_header_magic_h
+-        if test "${ac_cv_header_magic_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for magic.h" >&5
+-$as_echo_n "checking for magic.h... " >&6; }
+-if test "${ac_cv_header_magic_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_magic_h" >&5
+-$as_echo "$ac_cv_header_magic_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking magic.h usability" >&5
+-$as_echo_n "checking magic.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 <magic.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_cxx_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 magic.h presence" >&5
+-$as_echo_n "checking magic.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 <magic.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: magic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: magic.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: magic.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: magic.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: magic.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: magic.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: magic.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: magic.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for magic.h" >&5
+-$as_echo_n "checking for magic.h... " >&6; }
+-if test "${ac_cv_header_magic_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_magic_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_magic_h" >&5
+-$as_echo "$ac_cv_header_magic_h" >&6; }
 +        ac_fn_cxx_check_header_mongrel "$LINENO" "magic.h" "ac_cv_header_magic_h" "$ac_includes_default"
 +if test "x$ac_cv_header_magic_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_magic_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/magic.h" | $as_tr_sh`
+ 
+-fi
+-if test "x$ac_cv_header_magic_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -25915,145 +13866,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_magic_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/magic.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/magic.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/magic.h... " >&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 $MT_SEARCHPATH_HEADERS/magic.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/magic.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 <$MT_SEARCHPATH_HEADERS/magic.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_cxx_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 $MT_SEARCHPATH_HEADERS/magic.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/magic.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 <$MT_SEARCHPATH_HEADERS/magic.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/magic.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/magic.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/magic.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_libmagic_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_libmagic_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_libmagic_header_status" != xyes; then
-+        mt_libmagic_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_libmagic_package_status=${mt_libmagic_header_status}
-+
-+    if test "x$mt_libmagic_package_status" = xyes; then
-+
-+    mt_libmagic_arg_default=yes
-+    mt_libmagic_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-libmagic-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_libmagic_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -26097,10 +13911,10 @@ fi
+ 
+ 
+ # Check whether --with-libmagic-libs was given.
+-if test "${with_libmagic_libs+set}" = set; then
 +if test "${with_libmagic_libs+set}" = set; then :
-+  withval=$with_libmagic_libs;
-+            mt_libmagic_search_libs="$withval"
+   withval=$with_libmagic_libs;
+             mt_libmagic_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libmagic libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libmagic libs in $withval" >&5
-+$as_echo "$as_me: Will search for libmagic libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libmagic_search_libs" ; then
-+        unset ac_cv_lib_magic_magic_load
-+        LDFLAGS="$LDFLAGS -L$mt_libmagic_search_libs"
+ $as_echo "$as_me: Will search for libmagic libs in $withval" >&6;}
+ 
+ 
+@@ -26110,18 +13924,14 @@ fi
+     if test "$mt_libmagic_search_libs" ; then
+         unset ac_cv_lib_magic_magic_load
+         LDFLAGS="$LDFLAGS -L$mt_libmagic_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for magic_load in -lmagic" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_load in -lmagic" >&5
-+$as_echo_n "checking for magic_load in -lmagic... " >&6; }
+ $as_echo_n "checking for magic_load in -lmagic... " >&6; }
+-if test "${ac_cv_lib_magic_magic_load+set}" = set; then
 +if test "${ac_cv_lib_magic_magic_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmagic  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmagic  $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.
-+   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 magic_load ();
-+int
-+main ()
-+{
-+return magic_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26139,43 +13949,18 @@ return magic_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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_magic_magic_load=yes
-+else
+   ac_cv_lib_magic_magic_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_magic_magic_load=no
 +  ac_cv_lib_magic_magic_load=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_load" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_load" >&5
-+$as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+ $as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+-if test "x$ac_cv_lib_magic_magic_load" = x""yes; then
 +if test "x$ac_cv_lib_magic_magic_load" = x""yes; then :
-+
-+                mt_libmagic_libs="-lmagic"
-+                mt_libmagic_ldflags="-L$mt_libmagic_search_libs"
-+
-+else
-+
-+                mt_libmagic_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_libmagic_libs="-lmagic"
+                 mt_libmagic_ldflags="-L$mt_libmagic_search_libs"
+@@ -26184,12 +13969,10 @@ else
+ 
+                 mt_libmagic_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
-+$as_echo "$as_me: libmagic library not found in requested location $mt_libmagic_search_libs" >&6;}
-+                else
-+                    as_fn_error "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_magic_magic_load
+ $as_echo "$as_me: libmagic library not found in requested location $mt_libmagic_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
+-$as_echo "$as_me: error: libmagic library not found in requested location $mt_libmagic_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -26197,18 +13980,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_magic_magic_load
+-        { $as_echo "$as_me:$LINENO: checking for magic_load in -lmagic" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_load in -lmagic" >&5
-+$as_echo_n "checking for magic_load in -lmagic... " >&6; }
+ $as_echo_n "checking for magic_load in -lmagic... " >&6; }
+-if test "${ac_cv_lib_magic_magic_load+set}" = set; then
 +if test "${ac_cv_lib_magic_magic_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmagic  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmagic  $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.
-+   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 magic_load ();
-+int
-+main ()
-+{
-+return magic_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26226,43 +14005,18 @@ return magic_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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_magic_magic_load=yes
-+else
+   ac_cv_lib_magic_magic_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_magic_magic_load=no
 +  ac_cv_lib_magic_magic_load=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_load" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_load" >&5
-+$as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+ $as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+-if test "x$ac_cv_lib_magic_magic_load" = x""yes; then
 +if test "x$ac_cv_lib_magic_magic_load" = x""yes; then :
-+
-+                mt_libmagic_libs="-lmagic"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_magic_magic_load
+ 
+                 mt_libmagic_libs="-lmagic"
+ 
+@@ -26270,18 +14024,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_magic_magic_load
+-                { $as_echo "$as_me:$LINENO: checking for magic_load in -lmagic" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_load in -lmagic" >&5
-+$as_echo_n "checking for magic_load in -lmagic... " >&6; }
+ $as_echo_n "checking for magic_load in -lmagic... " >&6; }
+-if test "${ac_cv_lib_magic_magic_load+set}" = set; then
 +if test "${ac_cv_lib_magic_magic_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmagic  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmagic  $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.
-+   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 magic_load ();
-+int
-+main ()
-+{
-+return magic_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26299,43 +14049,18 @@ return magic_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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_magic_magic_load=yes
-+else
+   ac_cv_lib_magic_magic_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_magic_magic_load=no
 +  ac_cv_lib_magic_magic_load=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_load" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_load" >&5
-+$as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+ $as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+-if test "x$ac_cv_lib_magic_magic_load" = x""yes; then
 +if test "x$ac_cv_lib_magic_magic_load" = x""yes; then :
-+
-+                        mt_libmagic_libs="-lmagic"
-+                        mt_libmagic_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_libmagic_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_libmagic_library_status" != xyes; then
-+        mt_libmagic_libs=""
-+        mt_libmagic_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_libmagic_package_status=${mt_libmagic_library_status}
-+    fi
-+
-+    if test "x$mt_libmagic_package_status" = xyes; then
-+        LIBMAGIC_CFLAGS=${mt_libmagic_cxxflags}
-+        LIBMAGIC_LIBS=${mt_libmagic_libs}
-+        LIBMAGIC_LDFLAGS=${mt_libmagic_ldflags}
-+    fi
-+
-+        mt_libmagic_status=${mt_libmagic_package_status}
-+    fi
-+
-+    if test "x$mt_libmagic_status" = xyes; then
-+
+ 
+                         mt_libmagic_libs="-lmagic"
+                         mt_libmagic_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -26378,9 +14103,7 @@ fi
+ 
+     if test "x$mt_libmagic_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBMAGIC 1
+-_ACEOF
 +$as_echo "#define HAVE_LIBMAGIC 1" >>confdefs.h
-+
-+    fi
-+
-+    LIBMAGIC_STATUS=${mt_libmagic_status}
-+
-+
-+
-+
-+
-+
-+            if test "x$LIBMAGIC_STATUS" = xyes; then
-+                LIBMAGIC_LIBS="$LIBMAGIC_LIBS $ZLIB_LIBS"
-+                LIBMAGIC_LDFLAGS="$LIBMAGIC_LDFLAGS $ZLIB_LDFLAGS"
-+            fi
-+        else
-+            LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS"
-+            LIBS="$LIBS $ZLIB_LIBS"
+ 
+     fi
+ 
+@@ -26398,7 +14121,7 @@ _ACEOF
+         else
+             LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS"
+             LIBS="$LIBS $ZLIB_LIBS"
+-            { $as_echo "$as_me:$LINENO: retrying libmagic check with zlib flags" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: retrying libmagic check with zlib flags" >&5
-+$as_echo "$as_me: retrying libmagic check with zlib flags" >&6;}
-+
-+    mt_libmagic_status=yes
-+
-+    if test "x$mt_libmagic_status" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_libmagic_header_status=yes
-+
-+
-+# Check whether --with-libmagic-h was given.
+ $as_echo "$as_me: retrying libmagic check with zlib flags" >&6;}
+ 
+     mt_libmagic_status=yes
+@@ -26416,10 +14139,10 @@ $as_echo "$as_me: retrying libmagic check with zlib flags" >&6;}
+ 
+ 
+ # Check whether --with-libmagic-h was given.
+-if test "${with_libmagic_h+set}" = set; then
 +if test "${with_libmagic_h+set}" = set; then :
-+  withval=$with_libmagic_h;
-+            mt_libmagic_search_headers="$withval"
+   withval=$with_libmagic_h;
+             mt_libmagic_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libmagic headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libmagic headers in $withval" >&5
-+$as_echo "$as_me: Will search for libmagic headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libmagic_search_headers" ; then
-+        unset ac_cv_header_magic_h
-+        CFLAGS="$CFLAGS -I${mt_libmagic_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_libmagic_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_libmagic_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_libmagic_search_headers/magic.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for libmagic headers in $withval" >&6;}
+ 
+ 
+@@ -26432,145 +14155,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_libmagic_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_libmagic_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_libmagic_search_headers/magic.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_libmagic_search_headers/magic.h" >&5
+-$as_echo_n "checking for $mt_libmagic_search_headers/magic.h... " >&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 $mt_libmagic_search_headers/magic.h usability" >&5
+-$as_echo_n "checking $mt_libmagic_search_headers/magic.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 <$mt_libmagic_search_headers/magic.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_cxx_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 $mt_libmagic_search_headers/magic.h presence" >&5
+-$as_echo_n "checking $mt_libmagic_search_headers/magic.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 <$mt_libmagic_search_headers/magic.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmagic_search_headers/magic.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_libmagic_search_headers/magic.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_libmagic_search_headers/magic.h" >&5
+-$as_echo_n "checking for $mt_libmagic_search_headers/magic.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_libmagic_search_headers/magic.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_libmagic_cxxflags="-I${mt_libmagic_search_headers}"
-+
-+else
-+
-+                mt_libmagic_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_libmagic_cxxflags="-I${mt_libmagic_search_headers}"
+ 
+@@ -26578,12 +14164,10 @@ else
+ 
+                 mt_libmagic_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libmagic headers not found in requested location $mt_libmagic_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmagic headers not found in requested location $mt_libmagic_search_headers" >&5
-+$as_echo "$as_me: libmagic headers not found in requested location $mt_libmagic_search_headers" >&6;}
-+                else
-+                    as_fn_error "libmagic headers not found in requested location $mt_libmagic_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_magic_h
+ $as_echo "$as_me: libmagic headers not found in requested location $mt_libmagic_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libmagic headers not found in requested location $mt_libmagic_search_headers" >&5
+-$as_echo "$as_me: error: libmagic headers not found in requested location $mt_libmagic_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libmagic headers not found in requested location $mt_libmagic_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -26592,140 +14176,9 @@ fi
+ 
+     else
+         unset ac_cv_header_magic_h
+-        if test "${ac_cv_header_magic_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for magic.h" >&5
+-$as_echo_n "checking for magic.h... " >&6; }
+-if test "${ac_cv_header_magic_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_magic_h" >&5
+-$as_echo "$ac_cv_header_magic_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking magic.h usability" >&5
+-$as_echo_n "checking magic.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 <magic.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_cxx_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; }
 +        ac_fn_cxx_check_header_mongrel "$LINENO" "magic.h" "ac_cv_header_magic_h" "$ac_includes_default"
 +if test "x$ac_cv_header_magic_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_magic_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/magic.h" | $as_tr_sh`
+ 
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking magic.h presence" >&5
+-$as_echo_n "checking magic.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 <magic.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: magic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: magic.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: magic.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: magic.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: magic.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: magic.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: magic.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: magic.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: magic.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for magic.h" >&5
+-$as_echo_n "checking for magic.h... " >&6; }
+-if test "${ac_cv_header_magic_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_magic_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_magic_h" >&5
+-$as_echo "$ac_cv_header_magic_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_magic_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -26733,145 +14186,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_magic_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/magic.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/magic.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/magic.h... " >&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 $MT_SEARCHPATH_HEADERS/magic.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/magic.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 <$MT_SEARCHPATH_HEADERS/magic.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_cxx_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 $MT_SEARCHPATH_HEADERS/magic.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/magic.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 <$MT_SEARCHPATH_HEADERS/magic.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/magic.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/magic.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/magic.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/magic.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_libmagic_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_libmagic_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_libmagic_header_status" != xyes; then
-+        mt_libmagic_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_libmagic_package_status=${mt_libmagic_header_status}
-+
-+    if test "x$mt_libmagic_package_status" = xyes; then
-+
-+    mt_libmagic_arg_default=yes
-+    mt_libmagic_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-libmagic-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_libmagic_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -26915,10 +14231,10 @@ fi
+ 
+ 
+ # Check whether --with-libmagic-libs was given.
+-if test "${with_libmagic_libs+set}" = set; then
 +if test "${with_libmagic_libs+set}" = set; then :
-+  withval=$with_libmagic_libs;
-+            mt_libmagic_search_libs="$withval"
+   withval=$with_libmagic_libs;
+             mt_libmagic_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libmagic libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libmagic libs in $withval" >&5
-+$as_echo "$as_me: Will search for libmagic libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libmagic_search_libs" ; then
-+        unset ac_cv_lib_magic_magic_load
-+        LDFLAGS="$LDFLAGS -L$mt_libmagic_search_libs"
+ $as_echo "$as_me: Will search for libmagic libs in $withval" >&6;}
+ 
+ 
+@@ -26928,18 +14244,14 @@ fi
+     if test "$mt_libmagic_search_libs" ; then
+         unset ac_cv_lib_magic_magic_load
+         LDFLAGS="$LDFLAGS -L$mt_libmagic_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for magic_load in -lmagic" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_load in -lmagic" >&5
-+$as_echo_n "checking for magic_load in -lmagic... " >&6; }
+ $as_echo_n "checking for magic_load in -lmagic... " >&6; }
+-if test "${ac_cv_lib_magic_magic_load+set}" = set; then
 +if test "${ac_cv_lib_magic_magic_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmagic  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmagic  $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.
-+   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 magic_load ();
-+int
-+main ()
-+{
-+return magic_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -26957,43 +14269,18 @@ return magic_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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_magic_magic_load=yes
-+else
+   ac_cv_lib_magic_magic_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_magic_magic_load=no
 +  ac_cv_lib_magic_magic_load=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_load" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_load" >&5
-+$as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+ $as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+-if test "x$ac_cv_lib_magic_magic_load" = x""yes; then
 +if test "x$ac_cv_lib_magic_magic_load" = x""yes; then :
-+
-+                mt_libmagic_libs="-lmagic"
-+                mt_libmagic_ldflags="-L$mt_libmagic_search_libs"
-+
-+else
-+
-+                mt_libmagic_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_libmagic_libs="-lmagic"
+                 mt_libmagic_ldflags="-L$mt_libmagic_search_libs"
+@@ -27002,12 +14289,10 @@ else
+ 
+                 mt_libmagic_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
-+$as_echo "$as_me: libmagic library not found in requested location $mt_libmagic_search_libs" >&6;}
-+                else
-+                    as_fn_error "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_magic_magic_load
+ $as_echo "$as_me: libmagic library not found in requested location $mt_libmagic_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libmagic library not found in requested location $mt_libmagic_search_libs" >&5
+-$as_echo "$as_me: error: libmagic library not found in requested location $mt_libmagic_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libmagic library not found in requested location $mt_libmagic_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -27015,18 +14300,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_magic_magic_load
+-        { $as_echo "$as_me:$LINENO: checking for magic_load in -lmagic" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_load in -lmagic" >&5
-+$as_echo_n "checking for magic_load in -lmagic... " >&6; }
+ $as_echo_n "checking for magic_load in -lmagic... " >&6; }
+-if test "${ac_cv_lib_magic_magic_load+set}" = set; then
 +if test "${ac_cv_lib_magic_magic_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmagic  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmagic  $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.
-+   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 magic_load ();
-+int
-+main ()
-+{
-+return magic_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -27044,43 +14325,18 @@ return magic_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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_magic_magic_load=yes
-+else
+   ac_cv_lib_magic_magic_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_magic_magic_load=no
 +  ac_cv_lib_magic_magic_load=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_load" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_load" >&5
-+$as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+ $as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+-if test "x$ac_cv_lib_magic_magic_load" = x""yes; then
 +if test "x$ac_cv_lib_magic_magic_load" = x""yes; then :
-+
-+                mt_libmagic_libs="-lmagic"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_magic_magic_load
+ 
+                 mt_libmagic_libs="-lmagic"
+ 
+@@ -27088,18 +14344,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_magic_magic_load
+-                { $as_echo "$as_me:$LINENO: checking for magic_load in -lmagic" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for magic_load in -lmagic" >&5
-+$as_echo_n "checking for magic_load in -lmagic... " >&6; }
+ $as_echo_n "checking for magic_load in -lmagic... " >&6; }
+-if test "${ac_cv_lib_magic_magic_load+set}" = set; then
 +if test "${ac_cv_lib_magic_magic_load+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmagic  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmagic  $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.
-+   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 magic_load ();
-+int
-+main ()
-+{
-+return magic_load ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -27117,43 +14369,18 @@ return magic_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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_magic_magic_load=yes
-+else
+   ac_cv_lib_magic_magic_load=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_magic_magic_load=no
 +  ac_cv_lib_magic_magic_load=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_magic_magic_load" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_magic_magic_load" >&5
-+$as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+ $as_echo "$ac_cv_lib_magic_magic_load" >&6; }
+-if test "x$ac_cv_lib_magic_magic_load" = x""yes; then
 +if test "x$ac_cv_lib_magic_magic_load" = x""yes; then :
-+
-+                        mt_libmagic_libs="-lmagic"
-+                        mt_libmagic_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_libmagic_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_libmagic_library_status" != xyes; then
-+        mt_libmagic_libs=""
-+        mt_libmagic_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_libmagic_package_status=${mt_libmagic_library_status}
-+    fi
-+
-+    if test "x$mt_libmagic_package_status" = xyes; then
-+        LIBMAGIC_CFLAGS=${mt_libmagic_cxxflags}
-+        LIBMAGIC_LIBS=${mt_libmagic_libs}
-+        LIBMAGIC_LDFLAGS=${mt_libmagic_ldflags}
-+    fi
-+
-+        mt_libmagic_status=${mt_libmagic_package_status}
-+    fi
-+
-+    if test "x$mt_libmagic_status" = xyes; then
-+
+ 
+                         mt_libmagic_libs="-lmagic"
+                         mt_libmagic_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -27196,9 +14423,7 @@ fi
+ 
+     if test "x$mt_libmagic_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBMAGIC 1
+-_ACEOF
 +$as_echo "#define HAVE_LIBMAGIC 1" >>confdefs.h
-+
-+    fi
-+
-+    LIBMAGIC_STATUS=${mt_libmagic_status}
-+
-+
-+
-+
-+
-+
-+            if test "x$LIBMAGIC_STATUS" = xyes; then
-+                LIBMAGIC_LIBS="$LIBMAGIC_LIBS $ZLIB_LIBS"
-+                LIBMAGIC_LDFLAGS="$LIBMAGIC_LDFLAGS $ZLIB_LDFLAGS"
-+            fi
-+        fi
-+
-+
-+
-+    fi
-+fi
-+
-+if test "x$LIBMAGIC_STATUS" = xyes; then
+ 
+     fi
+ 
+@@ -27221,7 +14446,7 @@ _ACEOF
+ fi
+ 
+ if test "x$LIBMAGIC_STATUS" = xyes; then
+-    { $as_echo "$as_me:$LINENO: checking if libmagic is broken (Slackware check)" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libmagic is broken (Slackware check)" >&5
-+$as_echo_n "checking if libmagic is broken (Slackware check)... " >&6; }
-+    CFLAGS="$CFLAGS $LIBMAGIC_CXXLAGS"
-+    CXXFLAGS="$CXXFLAGS $LIBMAGIC_CFLAGS"
-+    LDFLAGS="$LDFLAGS $LIBMAGIC_LDFLAGS $LIBMAGIC_LIBS"
-+
-+    ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
+ $as_echo_n "checking if libmagic is broken (Slackware check)... " >&6; }
+     CFLAGS="$CFLAGS $LIBMAGIC_CXXLAGS"
+     CXXFLAGS="$CXXFLAGS $LIBMAGIC_CFLAGS"
+@@ -27233,17 +14458,13 @@ 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
+ 
+-    if test "$cross_compiling" = yes; then
 +    if test "$cross_compiling" = yes; then :
-+
+ 
+-            { $as_echo "$as_me:$LINENO: result: passing for cross compiling" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: passing for cross compiling" >&5
-+$as_echo "passing for cross compiling" >&6; }
-+
-+else
+ $as_echo "passing for cross compiling" >&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 <magic.h>
-+int
-+main ()
-+{
-+
-+            struct magic_set *ms;
-+            ms = magic_open(MAGIC_MIME);
-+            if (ms == 0)
-+                return 0;
-+            magic_load(ms, 0);
-+            magic_close(ms);
-+            return 0;
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+  #include <magic.h>
+ int
+@@ -27263,52 +14484,25 @@ 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 :
-+
+ 
+-            { $as_echo "$as_me:$LINENO: result: no" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; };
-+
-+else
-+
+ $as_echo "no" >&6; };
+ 
+ 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 )
+-
+-            { $as_echo "$as_me:$LINENO: result: yes" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+            MAGIC_OK=broken
+ $as_echo "yes" >&6; }
+             MAGIC_OK=broken
+-            { $as_echo "$as_me:$LINENO: WARNING: your magic library is broken, if you are using Slackware install the 'file' package manually" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: your magic library is broken, if you are using Slackware install the 'file' package manually" >&5
-+$as_echo "$as_me: WARNING: your magic library is broken, if you are using Slackware install the 'file' package manually" >&2;}
-+
-+fi
+ $as_echo "$as_me: WARNING: your magic library is broken, if you are using Slackware install the 'file' package manually" >&2;}
+ 
+ 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
-+
-+
-+   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+fi
-+
-+if test "x$LIBMAGIC_STATUS" = xyes; then
-+
+ fi
+ 
+ 
+-
+    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+@@ -27319,16 +14513,12 @@ fi
+ 
+ if test "x$LIBMAGIC_STATUS" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MAGIC 1
+-_ACEOF
 +$as_echo "#define HAVE_MAGIC 1" >>confdefs.h
-+
-+else
-+    if (test "x$LIBMAGIC_OPTION_REQUESTED" = xyes) &&
-+       (test "x$LIBMAGIC_OPTION_ENABLED" = xyes); then
-+        as_fn_error "unable to configure libmagic support" "$LINENO" 5
-+    fi
-+fi
-+
-+CFLAGS="$CFLAGS_SAVE"
-+CXXFLAGS="$CXXFLAGS_SAVE"
-+CPPFLAFS="$CPPFLAFS_SAVE"
-+LDFLGAS="$LDFLAGS_SAVE"
-+
-+######### taglib or id3lib selection
-+
-+TAGLIB_STATUS=
-+ID3LIB_STATUS=
-+
-+
-+
-+    mt_id3lib_option_enabled=
-+    mt_id3lib_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_id3lib_option_enabled=yes
-+    else
-+        mt_id3lib_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-id3lib was given.
+ 
+ else
+     if (test "x$LIBMAGIC_OPTION_REQUESTED" = xyes) &&
+        (test "x$LIBMAGIC_OPTION_ENABLED" = xyes); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure libmagic support" >&5
+-$as_echo "$as_me: error: unable to configure libmagic support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure libmagic support" "$LINENO" 5
+     fi
+ fi
+ 
+@@ -27353,7 +14543,7 @@ ID3LIB_STATUS=
+     fi
+ 
+     # Check whether --enable-id3lib was given.
+-if test "${enable_id3lib+set}" = set; then
 +if test "${enable_id3lib+set}" = set; then :
-+  enableval=$enable_id3lib;
-+            mt_id3lib_option_enabled=$enableval
-+            mt_id3lib_option_requested=yes
-+
-+
-+fi
-+
-+
-+    ID3LIB_OPTION_ENABLED=${mt_id3lib_option_enabled}
-+    ID3LIB_OPTION_REQUESTED=${mt_id3lib_option_requested}
-+
-+
-+
-+
+   enableval=$enable_id3lib;
+             mt_id3lib_option_enabled=$enableval
+             mt_id3lib_option_requested=yes
+@@ -27368,7 +14558,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_id3lib_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+
-+
-+    mt_taglib_option_enabled=
-+    mt_taglib_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_taglib_option_enabled=yes
-+    else
-+        mt_taglib_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-taglib was given.
+ 
+ 
+ 
+@@ -27381,7 +14573,7 @@ fi
+     fi
+ 
+     # Check whether --enable-taglib was given.
+-if test "${enable_taglib+set}" = set; then
 +if test "${enable_taglib+set}" = set; then :
-+  enableval=$enable_taglib;
-+            mt_taglib_option_enabled=$enableval
-+            mt_taglib_option_requested=yes
-+
-+
-+fi
-+
-+
-+    TAGLIB_OPTION_ENABLED=${mt_taglib_option_enabled}
-+    TAGLIB_OPTION_REQUESTED=${mt_taglib_option_requested}
-+
-+
-+
-+
+   enableval=$enable_taglib;
+             mt_taglib_option_enabled=$enableval
+             mt_taglib_option_requested=yes
+@@ -27396,23 +14588,23 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_taglib_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+if ((test "x$TAGLIB_OPTION_ENABLED" = xno) && (test "x$ID3LIB_OPTION_ENABLED" = xyes)) ; then
-+    TAGLIB_STATUS=disabled
-+    TAGLIB_OPTION_ENABLED=no
+ 
+ if ((test "x$TAGLIB_OPTION_ENABLED" = xno) && (test "x$ID3LIB_OPTION_ENABLED" = xyes)) ; then
+     TAGLIB_STATUS=disabled
+     TAGLIB_OPTION_ENABLED=no
+-    { $as_echo "$as_me:$LINENO: WARNING: taglib disabled" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: taglib disabled" >&5
-+$as_echo "$as_me: WARNING: taglib disabled" >&2;}
-+elif ((test "x$TAGLIB_OPTION_ENABLED" = xyes) && (test "x$ID3LIB_OPTION_ENABLED" = xno)) ; then
-+    ID3LIB_STATUS=disabled
-+    ID3LIB_OPTION_ENABLED=no
+ $as_echo "$as_me: WARNING: taglib disabled" >&2;}
+ elif ((test "x$TAGLIB_OPTION_ENABLED" = xyes) && (test "x$ID3LIB_OPTION_ENABLED" = xno)) ; then
+     ID3LIB_STATUS=disabled
+     ID3LIB_OPTION_ENABLED=no
+-    { $as_echo "$as_me:$LINENO: WARNING: id3lib disabled" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: id3lib disabled" >&5
-+$as_echo "$as_me: WARNING: id3lib disabled" >&2;}
-+elif ((test "x$TAGLIB_OPTION_ENABLED" = xyes) && (test "x$ID3LIB_OPTION_ENABLED" = xyes)) ; then
-+    as_fn_error "Please select either taglib or id3lib, but not both." "$LINENO" 5
-+fi
-+
-+if test "x$TAGLIB_OPTION_ENABLED" = xyes; then
-+
-+    mt_taglib_status=yes
-+
-+    if test "x$mt_taglib_status" = xyes; then
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+    mt_taglib_config=none
-+    mt_taglib_package_status=yes
-+
-+
-+# Check whether --with-taglib-cfg was given.
+ $as_echo "$as_me: WARNING: id3lib disabled" >&2;}
+ elif ((test "x$TAGLIB_OPTION_ENABLED" = xyes) && (test "x$ID3LIB_OPTION_ENABLED" = xyes)) ; then
+     if ((test "x$TAGLIB_OPTION_REQUESTED" = xyes) && (test "x$ID3LIB_OPTION_REQUESTED" = xyes)); then
+-        { { $as_echo "$as_me:$LINENO: error: Please select either taglib or id3lib, but not both." >&5
+-$as_echo "$as_me: error: Please select either taglib or id3lib, but not both." >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "Please select either taglib or id3lib, but not both." "$LINENO" 5
+     elif ((test "x$TAGLIB_OPTION_REQUESTED" = xyes) && (test "x$ID3LIB_OPTION_REQUESTED" != xyes)); then
+         ID3LIB_OPTION_ENABLED=no
+     elif ((test "x$TAGLIB_OPTION_REQUESTED" != xyes) && (test "x$ID3LIB_OPTION_REQUESTED" = xyes)); then
+@@ -27438,10 +14630,10 @@ if test "x$TAGLIB_OPTION_ENABLED" = xyes; then
+ 
+ 
+ # Check whether --with-taglib-cfg was given.
+-if test "${with_taglib_cfg+set}" = set; then
 +if test "${with_taglib_cfg+set}" = set; then :
-+  withval=$with_taglib_cfg;
-+            mt_taglib_search_config="$withval"
+   withval=$with_taglib_cfg;
+             mt_taglib_search_config="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for taglib config in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for taglib config in $withval" >&5
-+$as_echo "$as_me: Will search for taglib config in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test -n "$mt_taglib_search_config"; then
+ $as_echo "$as_me: Will search for taglib config in $withval" >&6;}
+ 
+ 
+@@ -27449,28 +14641,24 @@ fi
+ 
+ 
+     if test -n "$mt_taglib_search_config"; then
+-        { $as_echo "$as_me:$LINENO: You specified ${mt_taglib_search_config} for taglib-config" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: You specified ${mt_taglib_search_config} for taglib-config" >&5
-+$as_echo "$as_me: You specified ${mt_taglib_search_config} for taglib-config" >&6;}
-+        if test -f "$mt_taglib_search_config"; then
-+            mt_taglib_config=${mt_taglib_search_config}
-+        else
-+            as_fn_error "${mt_taglib_search_config} not found" "$LINENO" 5
-+        fi
-+
-+        mt_taglib_version=`${mt_taglib_config} --version 2>/dev/null`
-+        if test -z "$mt_taglib_version"; then
-+            as_fn_error "${mt_taglib_search_config} could not be executed or returned invalid values" "$LINENO" 5
-+        fi
-+    else
-+        # Extract the first word of "taglib-config", so it can be a program name with args.
-+set dummy taglib-config; ac_word=$2
+ $as_echo "$as_me: You specified ${mt_taglib_search_config} for taglib-config" >&6;}
+         if test -f "$mt_taglib_search_config"; then
+             mt_taglib_config=${mt_taglib_search_config}
+         else
+-            { { $as_echo "$as_me:$LINENO: error: ${mt_taglib_search_config} not found" >&5
+-$as_echo "$as_me: error: ${mt_taglib_search_config} not found" >&2;}
+-   { (exit 1); exit 1; }; }
++            as_fn_error $? "${mt_taglib_search_config} not found" "$LINENO" 5
+         fi
+ 
+         mt_taglib_version=`${mt_taglib_config} --version 2>/dev/null`
+         if test -z "$mt_taglib_version"; then
+-            { { $as_echo "$as_me:$LINENO: error: ${mt_taglib_search_config} could not be executed or returned invalid values" >&5
+-$as_echo "$as_me: error: ${mt_taglib_search_config} could not be executed or returned invalid values" >&2;}
+-   { (exit 1); exit 1; }; }
++            as_fn_error $? "${mt_taglib_search_config} could not be executed or returned invalid values" "$LINENO" 5
+         fi
+     else
+         # Extract the first word of "taglib-config", so it can be a program name with args.
+ set dummy taglib-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; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_mt_taglib_config+set}" = set; then
 +if test "${ac_cv_path_mt_taglib_config+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $mt_taglib_config in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_mt_taglib_config="$mt_taglib_config" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   case $mt_taglib_config in
+@@ -27483,14 +14671,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_mt_taglib_config="$as_dir/$ac_word$ac_exec_ext"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_mt_taglib_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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_mt_taglib_config" && ac_cv_path_mt_taglib_config="none"
-+  ;;
-+esac
-+fi
-+mt_taglib_config=$ac_cv_path_mt_taglib_config
-+if test -n "$mt_taglib_config"; then
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_mt_taglib_config" && ac_cv_path_mt_taglib_config="none"
+@@ -27499,10 +14687,10 @@ esac
+ fi
+ mt_taglib_config=$ac_cv_path_mt_taglib_config
+ if test -n "$mt_taglib_config"; then
+-  { $as_echo "$as_me:$LINENO: result: $mt_taglib_config" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_taglib_config" >&5
-+$as_echo "$mt_taglib_config" >&6; }
-+else
+ $as_echo "$mt_taglib_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
-+
-+
-+        if test "x$mt_taglib_config" = xnone; then
-+            unset ac_cv_path_mt_taglib_config
-+            # Extract the first word of "taglib-config", so it can be a program name with args.
-+set dummy taglib-config; ac_word=$2
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -27511,9 +14699,9 @@ fi
+             unset ac_cv_path_mt_taglib_config
+             # Extract the first word of "taglib-config", so it can be a program name with args.
+ set dummy taglib-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; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_mt_taglib_config+set}" = set; then
 +if test "${ac_cv_path_mt_taglib_config+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $mt_taglib_config in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_mt_taglib_config="$mt_taglib_config" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $MT_SEARCHPATH_PROGS
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   case $mt_taglib_config in
+@@ -27526,14 +14714,14 @@ for as_dir in $MT_SEARCHPATH_PROGS
+ 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_mt_taglib_config="$as_dir/$ac_word$ac_exec_ext"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_mt_taglib_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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_mt_taglib_config" && ac_cv_path_mt_taglib_config="none"
-+  ;;
-+esac
-+fi
-+mt_taglib_config=$ac_cv_path_mt_taglib_config
-+if test -n "$mt_taglib_config"; then
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_mt_taglib_config" && ac_cv_path_mt_taglib_config="none"
+@@ -27542,43 +14730,43 @@ esac
+ fi
+ mt_taglib_config=$ac_cv_path_mt_taglib_config
+ if test -n "$mt_taglib_config"; then
+-  { $as_echo "$as_me:$LINENO: result: $mt_taglib_config" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_taglib_config" >&5
-+$as_echo "$mt_taglib_config" >&6; }
-+else
+ $as_echo "$mt_taglib_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
-+
-+
-+            if test "x$mt_taglib_config" = xnone; then
-+                mt_taglib_package_status=missing
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+             if test "x$mt_taglib_config" = xnone; then
+                 mt_taglib_package_status=missing
+-                { $as_echo "$as_me:$LINENO: result: taglib-config not found, please install the taglib devel package" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: result: taglib-config not found, please install the taglib devel package" >&5
-+$as_echo "taglib-config not found, please install the taglib devel package" >&6; }
-+            fi
-+        fi
-+
-+        mt_taglib_version=`${mt_taglib_config} --version 2>/dev/null`
-+        if test -z "$mt_taglib_version"; then
+ $as_echo "taglib-config not found, please install the taglib devel package" >&6; }
+             fi
+         fi
+ 
+         mt_taglib_version=`${mt_taglib_config} --version 2>/dev/null`
+         if test -z "$mt_taglib_version"; then
+-            { $as_echo "$as_me:$LINENO: ${mt_taglib_config} could not be executed or returned invalid values" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: ${mt_taglib_config} could not be executed or returned invalid values" >&5
-+$as_echo "$as_me: ${mt_taglib_config} could not be executed or returned invalid values" >&6;}
-+            mt_taglib_package_status=missing
-+        fi
-+    fi
-+    if test "x$mt_taglib_package_status" = xyes; then
+ $as_echo "$as_me: ${mt_taglib_config} could not be executed or returned invalid values" >&6;}
+             mt_taglib_package_status=missing
+         fi
+     fi
+     if test "x$mt_taglib_package_status" = xyes; then
+-        { $as_echo "$as_me:$LINENO: checking taglib cflags" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking taglib cflags" >&5
-+$as_echo_n "checking taglib cflags... " >&6; }
-+        mt_taglib_cxxflags=`${mt_taglib_config} --cflags`
+ $as_echo_n "checking taglib cflags... " >&6; }
+         mt_taglib_cxxflags=`${mt_taglib_config} --cflags`
+-        { $as_echo "$as_me:$LINENO: result: $mt_taglib_cxxflags" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_taglib_cxxflags" >&5
-+$as_echo "$mt_taglib_cxxflags" >&6; }
-+        mt_taglib_libs=
+ $as_echo "$mt_taglib_cxxflags" >&6; }
+         mt_taglib_libs=
+-        { $as_echo "$as_me:$LINENO: checking taglib libs" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking taglib libs" >&5
-+$as_echo_n "checking taglib libs... " >&6; }
-+        if test -z "";  then
-+            mt_taglib_libs=`${mt_taglib_config} --libs`
-+        else
-+            mt_taglib_libs=`${mt_taglib_config} `
-+        fi
+ $as_echo_n "checking taglib libs... " >&6; }
+         if test -z "";  then
+             mt_taglib_libs=`${mt_taglib_config} --libs`
+         else
+             mt_taglib_libs=`${mt_taglib_config} `
+         fi
+-        { $as_echo "$as_me:$LINENO: result: $mt_taglib_libs" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_taglib_libs" >&5
-+$as_echo "$mt_taglib_libs" >&6; }
-+    fi
-+
-+    if test "x$mt_taglib_package_status" = xyes; then
-+        CPPFLAGS="$CPPFLAGS $mt_taglib_cxxflags"
-+        CXXFLAGS="$CXXFLAGS $mt_taglib_cxxflags"
-+        CFLAGS="$CFLAGS $mt_taglib_cxxflags"
-+        for mt_u_header in taglib_h fileref_h tag_h audioproperties_h tstring_h textidentificationframe_h attachedpictureframe_h; do
-+            unset ac_cv_header_${mt_u_header}
-+        done
+ $as_echo "$mt_taglib_libs" >&6; }
+     fi
+ 
+@@ -27589,155 +14777,11 @@ $as_echo "$mt_taglib_libs" >&6; }
+         for mt_u_header in taglib_h fileref_h tag_h audioproperties_h tstring_h textidentificationframe_h attachedpictureframe_h; do
+             unset ac_cv_header_${mt_u_header}
+         done
+-
+-
+-
+-
+-
+-
+-
+-for ac_header in taglib.h fileref.h tag.h audioproperties.h tstring.h textidentificationframe.h attachedpictureframe.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_cxx_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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
 +        for ac_header in taglib.h fileref.h tag.h audioproperties.h tstring.h textidentificationframe.h attachedpictureframe.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_cxx_check_header_mongrel "$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
-+
-+else
-+  mt_taglib_package_status=missing
-+fi
-+
-+done
-+
-+    fi
-+
-+    if test "x$mt_taglib_package_status" = xyes; then
-+        LIBS="$mt_taglib_libs $LIBS"
-+        if test -z "tag"; then
-+            unset ac_cv_func_main
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -27754,102 +14798,12 @@ done
+         LIBS="$mt_taglib_libs $LIBS"
+         if test -z "tag"; then
+             unset ac_cv_func_main
+-
+-for ac_func in main
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +            for ac_func in main
 +do :
 +  ac_fn_cxx_check_func "$LINENO" "main" "ac_cv_func_main"
 +if test "x$ac_cv_func_main" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_MAIN 1
-+_ACEOF
-+
-+else
-+  mt_taglib_package_status=missing
-+fi
-+done
-+
-+        else
-+            unset ac_cv_lib_tag_main
+ _ACEOF
+ 
+ else
+@@ -27859,19 +14813,14 @@ done
+ 
+         else
+             unset ac_cv_lib_tag_main
+-
+-{ $as_echo "$as_me:$LINENO: checking for main in -ltag" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltag" >&5
-+$as_echo_n "checking for main in -ltag... " >&6; }
+ $as_echo_n "checking for main in -ltag... " >&6; }
+-if test "${ac_cv_lib_tag_main+set}" = set; then
 +if test "${ac_cv_lib_tag_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ltag  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-ltag  $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.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 
+@@ -27883,43 +14832,18 @@ return 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_tag_main=yes
-+else
+   ac_cv_lib_tag_main=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_tag_main=no
 +  ac_cv_lib_tag_main=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_tag_main" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tag_main" >&5
-+$as_echo "$ac_cv_lib_tag_main" >&6; }
+ $as_echo "$ac_cv_lib_tag_main" >&6; }
+-if test "x$ac_cv_lib_tag_main" = x""yes; then
 +if test "x$ac_cv_lib_tag_main" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBTAG 1
-+_ACEOF
-+
-+  LIBS="-ltag $LIBS"
-+
-+else
-+  mt_taglib_package_status=missing
-+fi
-+
-+        fi
-+    fi
-+
-+    if test "x$mt_taglib_package_status" = xyes; then
-+        TAGLIB_CFLAGS=${mt_taglib_cxxflags}
-+        TAGLIB_LIBS=${mt_taglib_libs}
-+        TAGLIB_VERSION=${mt_taglib_version}
-+    fi
-+
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_taglib_status=${mt_taglib_package_status}
-+    fi
-+
-+    if test "x$mt_taglib_status" = xyes; then
-+
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBTAG 1
+ _ACEOF
+@@ -27951,9 +14875,7 @@ fi
+ 
+     if test "x$mt_taglib_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_TAGLIB 1
+-_ACEOF
 +$as_echo "#define HAVE_TAGLIB 1" >>confdefs.h
-+
-+    fi
-+
-+    TAGLIB_STATUS=${mt_taglib_status}
-+
-+
-+
-+
-+
-+
-+else
-+    TAGLIB_STATUS=disabled
-+    if test "x$ID3_OPTION_REQUESTED" = no; then
-+        ID3_OPTION_ENABLED=yes
-+    fi
-+fi
-+
-+if test "x$TAGLIB_STATUS" = xyes; then
-+
+ 
+     fi
+ 
+@@ -27973,18 +14895,14 @@ fi
+ 
+ if test "x$TAGLIB_STATUS" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ID3_ALBUMART 1
+-_ACEOF
 +$as_echo "#define HAVE_ID3_ALBUMART 1" >>confdefs.h
-+
-+    ID3LIB_STATUS=disabled
-+    ID3LIB_OPTION_ENABLED=no
-+else
-+    if (test "x$TAGLIB_OPTION_REQUESTED" = xyes) &&
-+       (test "x$TAGLIB_OPTION_ENABLED" = xyes); then
-+        as_fn_error "unable to configure taglib support" "$LINENO" 5
-+    fi
-+fi
-+
-+######### id3lib
-+
-+if test "x$ID3LIB_OPTION_ENABLED" = xyes; then
-+
-+    mt_id3lib_status=yes
-+
-+    if test "x$mt_id3lib_status" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_id3lib_header_status=yes
-+
-+
-+# Check whether --with-id3lib-h was given.
+ 
+     ID3LIB_STATUS=disabled
+     ID3LIB_OPTION_ENABLED=no
+ else
+     if (test "x$TAGLIB_OPTION_REQUESTED" = xyes) &&
+        (test "x$TAGLIB_OPTION_ENABLED" = xyes); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure taglib support" >&5
+-$as_echo "$as_me: error: unable to configure taglib support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure taglib support" "$LINENO" 5
+     fi
+ fi
+ 
+@@ -28007,10 +14925,10 @@ if test "x$ID3LIB_OPTION_ENABLED" = xyes; then
+ 
+ 
+ # Check whether --with-id3lib-h was given.
+-if test "${with_id3lib_h+set}" = set; then
 +if test "${with_id3lib_h+set}" = set; then :
-+  withval=$with_id3lib_h;
-+            mt_id3lib_search_headers="$withval"
+   withval=$with_id3lib_h;
+             mt_id3lib_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for id3lib headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for id3lib headers in $withval" >&5
-+$as_echo "$as_me: Will search for id3lib headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_id3lib_search_headers" ; then
-+        unset ac_cv_header_id3_tag_h
-+        CFLAGS="$CFLAGS -I${mt_id3lib_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_id3lib_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_id3lib_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_id3lib_search_headers/id3/tag.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for id3lib headers in $withval" >&6;}
+ 
+ 
+@@ -28023,145 +14941,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_id3lib_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_id3lib_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_id3lib_search_headers/id3/tag.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_id3lib_search_headers/id3/tag.h" >&5
+-$as_echo_n "checking for $mt_id3lib_search_headers/id3/tag.h... " >&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 $mt_id3lib_search_headers/id3/tag.h usability" >&5
+-$as_echo_n "checking $mt_id3lib_search_headers/id3/tag.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 <$mt_id3lib_search_headers/id3/tag.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_cxx_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 $mt_id3lib_search_headers/id3/tag.h presence" >&5
+-$as_echo_n "checking $mt_id3lib_search_headers/id3/tag.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 <$mt_id3lib_search_headers/id3/tag.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_id3lib_search_headers/id3/tag.h" >&5
+-$as_echo_n "checking for $mt_id3lib_search_headers/id3/tag.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_id3lib_search_headers/id3/tag.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_id3lib_cxxflags="-I${mt_id3lib_search_headers}"
-+
-+else
-+
-+                mt_id3lib_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_id3lib_cxxflags="-I${mt_id3lib_search_headers}"
+ 
+@@ -28169,12 +14950,10 @@ else
+ 
+                 mt_id3lib_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: id3lib headers not found in requested location $mt_id3lib_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: id3lib headers not found in requested location $mt_id3lib_search_headers" >&5
-+$as_echo "$as_me: id3lib headers not found in requested location $mt_id3lib_search_headers" >&6;}
-+                else
-+                    as_fn_error "id3lib headers not found in requested location $mt_id3lib_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_id3_tag_h
+ $as_echo "$as_me: id3lib headers not found in requested location $mt_id3lib_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: id3lib headers not found in requested location $mt_id3lib_search_headers" >&5
+-$as_echo "$as_me: error: id3lib headers not found in requested location $mt_id3lib_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "id3lib headers not found in requested location $mt_id3lib_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -28183,140 +14962,9 @@ fi
+ 
+     else
+         unset ac_cv_header_id3_tag_h
+-        if test "${ac_cv_header_id3_tag_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for id3/tag.h" >&5
+-$as_echo_n "checking for id3/tag.h... " >&6; }
+-if test "${ac_cv_header_id3_tag_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_id3_tag_h" >&5
+-$as_echo "$ac_cv_header_id3_tag_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking id3/tag.h usability" >&5
+-$as_echo_n "checking id3/tag.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 <id3/tag.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_cxx_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_fn_cxx_check_header_mongrel "$LINENO" "id3/tag.h" "ac_cv_header_id3_tag_h" "$ac_includes_default"
 +if test "x$ac_cv_header_id3_tag_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_id3_tag_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/id3/tag.h" | $as_tr_sh`
+ 
+-	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 id3/tag.h presence" >&5
+-$as_echo_n "checking id3/tag.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 <id3/tag.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for id3/tag.h" >&5
+-$as_echo_n "checking for id3/tag.h... " >&6; }
+-if test "${ac_cv_header_id3_tag_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_id3_tag_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_id3_tag_h" >&5
+-$as_echo "$ac_cv_header_id3_tag_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_id3_tag_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -28324,145 +14972,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_id3_tag_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/id3/tag.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/id3/tag.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/id3/tag.h... " >&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 $MT_SEARCHPATH_HEADERS/id3/tag.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/id3/tag.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 <$MT_SEARCHPATH_HEADERS/id3/tag.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_cxx_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 $MT_SEARCHPATH_HEADERS/id3/tag.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/id3/tag.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 <$MT_SEARCHPATH_HEADERS/id3/tag.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/id3/tag.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/id3/tag.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/id3/tag.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_id3lib_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_id3lib_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_id3lib_header_status" != xyes; then
-+        mt_id3lib_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_id3lib_package_status=${mt_id3lib_header_status}
-+
-+    if test "x$mt_id3lib_package_status" = xyes; then
-+
-+    mt_id3lib_arg_default=yes
-+    mt_id3lib_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-id3lib-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_id3lib_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -28506,10 +15017,10 @@ fi
+ 
+ 
+ # Check whether --with-id3lib-libs was given.
+-if test "${with_id3lib_libs+set}" = set; then
 +if test "${with_id3lib_libs+set}" = set; then :
-+  withval=$with_id3lib_libs;
-+            mt_id3lib_search_libs="$withval"
+   withval=$with_id3lib_libs;
+             mt_id3lib_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for id3lib libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for id3lib libs in $withval" >&5
-+$as_echo "$as_me: Will search for id3lib libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_id3lib_search_libs" ; then
-+        unset ac_cv_lib_id3_main
-+        LDFLAGS="$LDFLAGS -L$mt_id3lib_search_libs"
+ $as_echo "$as_me: Will search for id3lib libs in $withval" >&6;}
+ 
+ 
+@@ -28519,18 +15030,14 @@ fi
+     if test "$mt_id3lib_search_libs" ; then
+         unset ac_cv_lib_id3_main
+         LDFLAGS="$LDFLAGS -L$mt_id3lib_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for main in -lid3" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lid3" >&5
-+$as_echo_n "checking for main in -lid3... " >&6; }
+ $as_echo_n "checking for main in -lid3... " >&6; }
+-if test "${ac_cv_lib_id3_main+set}" = set; then
 +if test "${ac_cv_lib_id3_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lid3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lid3  $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.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 
+@@ -28542,43 +15049,18 @@ return 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_id3_main=yes
-+else
+   ac_cv_lib_id3_main=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_id3_main=no
 +  ac_cv_lib_id3_main=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_id3_main" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3_main" >&5
-+$as_echo "$ac_cv_lib_id3_main" >&6; }
+ $as_echo "$ac_cv_lib_id3_main" >&6; }
+-if test "x$ac_cv_lib_id3_main" = x""yes; then
 +if test "x$ac_cv_lib_id3_main" = x""yes; then :
-+
-+                mt_id3lib_libs="-lid3"
-+                mt_id3lib_ldflags="-L$mt_id3lib_search_libs"
-+
-+else
-+
-+                mt_id3lib_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_id3lib_libs="-lid3"
+                 mt_id3lib_ldflags="-L$mt_id3lib_search_libs"
+@@ -28587,12 +15069,10 @@ else
+ 
+                 mt_id3lib_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
-+$as_echo "$as_me: id3lib library not found in requested location $mt_id3lib_search_libs" >&6;}
-+                else
-+                    as_fn_error "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_id3_main
+ $as_echo "$as_me: id3lib library not found in requested location $mt_id3lib_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
+-$as_echo "$as_me: error: id3lib library not found in requested location $mt_id3lib_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -28600,18 +15080,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_id3_main
+-        { $as_echo "$as_me:$LINENO: checking for main in -lid3" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lid3" >&5
-+$as_echo_n "checking for main in -lid3... " >&6; }
+ $as_echo_n "checking for main in -lid3... " >&6; }
+-if test "${ac_cv_lib_id3_main+set}" = set; then
 +if test "${ac_cv_lib_id3_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lid3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lid3  $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.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 
+@@ -28623,43 +15099,18 @@ return 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_id3_main=yes
-+else
+   ac_cv_lib_id3_main=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_id3_main=no
 +  ac_cv_lib_id3_main=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_id3_main" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3_main" >&5
-+$as_echo "$ac_cv_lib_id3_main" >&6; }
+ $as_echo "$ac_cv_lib_id3_main" >&6; }
+-if test "x$ac_cv_lib_id3_main" = x""yes; then
 +if test "x$ac_cv_lib_id3_main" = x""yes; then :
-+
-+                mt_id3lib_libs="-lid3"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_id3_main
+ 
+                 mt_id3lib_libs="-lid3"
+ 
+@@ -28667,18 +15118,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_id3_main
+-                { $as_echo "$as_me:$LINENO: checking for main in -lid3" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lid3" >&5
-+$as_echo_n "checking for main in -lid3... " >&6; }
+ $as_echo_n "checking for main in -lid3... " >&6; }
+-if test "${ac_cv_lib_id3_main+set}" = set; then
 +if test "${ac_cv_lib_id3_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lid3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lid3  $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.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 
+@@ -28690,43 +15137,18 @@ return 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_id3_main=yes
-+else
+   ac_cv_lib_id3_main=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_id3_main=no
 +  ac_cv_lib_id3_main=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_id3_main" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3_main" >&5
-+$as_echo "$ac_cv_lib_id3_main" >&6; }
+ $as_echo "$ac_cv_lib_id3_main" >&6; }
+-if test "x$ac_cv_lib_id3_main" = x""yes; then
 +if test "x$ac_cv_lib_id3_main" = x""yes; then :
-+
-+                        mt_id3lib_libs="-lid3"
-+                        mt_id3lib_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_id3lib_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_id3lib_library_status" != xyes; then
-+        mt_id3lib_libs=""
-+        mt_id3lib_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_id3lib_package_status=${mt_id3lib_library_status}
-+    fi
-+
-+    if test "x$mt_id3lib_package_status" = xyes; then
-+        ID3LIB_CFLAGS=${mt_id3lib_cxxflags}
-+        ID3LIB_LIBS=${mt_id3lib_libs}
-+        ID3LIB_LDFLAGS=${mt_id3lib_ldflags}
-+    fi
-+
-+        mt_id3lib_status=${mt_id3lib_package_status}
-+    fi
-+
-+    if test "x$mt_id3lib_status" = xyes; then
-+
+ 
+                         mt_id3lib_libs="-lid3"
+                         mt_id3lib_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -28769,9 +15191,7 @@ fi
+ 
+     if test "x$mt_id3lib_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ID3LIB 1
+-_ACEOF
 +$as_echo "#define HAVE_ID3LIB 1" >>confdefs.h
-+
-+    fi
-+
-+    ID3LIB_STATUS=${mt_id3lib_status}
-+
-+
-+
-+
-+
-+
-+
-+    if test "x$ID3LIB_STATUS" != xyes; then
-+        if test "x$ZLIB_STATUS" != xyes; then
-+
-+
-+    mt_zlib_arg_default=yes
-+    mt_zlib_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-zlib-libs was given.
+ 
+     fi
+ 
+@@ -28798,10 +15218,10 @@ _ACEOF
+ 
+ 
+ # Check whether --with-zlib-libs was given.
+-if test "${with_zlib_libs+set}" = set; then
 +if test "${with_zlib_libs+set}" = set; then :
-+  withval=$with_zlib_libs;
-+            mt_zlib_search_libs="$withval"
+   withval=$with_zlib_libs;
+             mt_zlib_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for zlib libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for zlib libs in $withval" >&5
-+$as_echo "$as_me: Will search for zlib libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_zlib_search_libs" ; then
-+        unset ac_cv_lib_z_compress
-+        LDFLAGS="$LDFLAGS -L$mt_zlib_search_libs"
+ $as_echo "$as_me: Will search for zlib libs in $withval" >&6;}
+ 
+ 
+@@ -28811,18 +15231,14 @@ fi
+     if test "$mt_zlib_search_libs" ; then
+         unset ac_cv_lib_z_compress
+         LDFLAGS="$LDFLAGS -L$mt_zlib_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for compress in -lz" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
-+$as_echo_n "checking for compress in -lz... " >&6; }
+ $as_echo_n "checking for compress in -lz... " >&6; }
+-if test "${ac_cv_lib_z_compress+set}" = set; then
 +if test "${ac_cv_lib_z_compress+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lz  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lz  $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.
-+   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 compress ();
-+int
-+main ()
-+{
-+return compress ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -28840,43 +15256,18 @@ return compress ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_z_compress=yes
-+else
+   ac_cv_lib_z_compress=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_z_compress=no
 +  ac_cv_lib_z_compress=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
-+$as_echo "$ac_cv_lib_z_compress" >&6; }
+ $as_echo "$ac_cv_lib_z_compress" >&6; }
+-if test "x$ac_cv_lib_z_compress" = x""yes; then
 +if test "x$ac_cv_lib_z_compress" = x""yes; then :
-+
-+                mt_zlib_libs="-lz"
-+                mt_zlib_ldflags="-L$mt_zlib_search_libs"
-+
-+else
-+
-+                mt_zlib_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_zlib_libs="-lz"
+                 mt_zlib_ldflags="-L$mt_zlib_search_libs"
+@@ -28885,12 +15276,10 @@ else
+ 
+                 mt_zlib_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: zlib library not found in requested location $mt_zlib_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: zlib library not found in requested location $mt_zlib_search_libs" >&5
-+$as_echo "$as_me: zlib library not found in requested location $mt_zlib_search_libs" >&6;}
-+                else
-+                    as_fn_error "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_z_compress
+ $as_echo "$as_me: zlib library not found in requested location $mt_zlib_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: zlib library not found in requested location $mt_zlib_search_libs" >&5
+-$as_echo "$as_me: error: zlib library not found in requested location $mt_zlib_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "zlib library not found in requested location $mt_zlib_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -28898,18 +15287,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_z_compress
+-        { $as_echo "$as_me:$LINENO: checking for compress in -lz" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
-+$as_echo_n "checking for compress in -lz... " >&6; }
+ $as_echo_n "checking for compress in -lz... " >&6; }
+-if test "${ac_cv_lib_z_compress+set}" = set; then
 +if test "${ac_cv_lib_z_compress+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lz  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lz  $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.
-+   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 compress ();
-+int
-+main ()
-+{
-+return compress ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -28927,43 +15312,18 @@ return compress ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_z_compress=yes
-+else
+   ac_cv_lib_z_compress=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_z_compress=no
 +  ac_cv_lib_z_compress=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
-+$as_echo "$ac_cv_lib_z_compress" >&6; }
+ $as_echo "$ac_cv_lib_z_compress" >&6; }
+-if test "x$ac_cv_lib_z_compress" = x""yes; then
 +if test "x$ac_cv_lib_z_compress" = x""yes; then :
-+
-+                mt_zlib_libs="-lz"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_z_compress
+ 
+                 mt_zlib_libs="-lz"
+ 
+@@ -28971,18 +15331,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_z_compress
+-                { $as_echo "$as_me:$LINENO: checking for compress in -lz" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
-+$as_echo_n "checking for compress in -lz... " >&6; }
+ $as_echo_n "checking for compress in -lz... " >&6; }
+-if test "${ac_cv_lib_z_compress+set}" = set; then
 +if test "${ac_cv_lib_z_compress+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lz  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lz  $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.
-+   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 compress ();
-+int
-+main ()
-+{
-+return compress ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -29000,43 +15356,18 @@ return compress ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_z_compress=yes
-+else
+   ac_cv_lib_z_compress=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_z_compress=no
 +  ac_cv_lib_z_compress=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_z_compress" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
-+$as_echo "$ac_cv_lib_z_compress" >&6; }
+ $as_echo "$ac_cv_lib_z_compress" >&6; }
+-if test "x$ac_cv_lib_z_compress" = x""yes; then
 +if test "x$ac_cv_lib_z_compress" = x""yes; then :
-+
-+                        mt_zlib_libs="-lz"
-+                        mt_zlib_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_zlib_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_zlib_library_status" != xyes; then
-+        mt_zlib_libs=""
-+        mt_zlib_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+
-+    ZLIB_LIBS=${mt_zlib_libs}
-+    ZLIB_LDFLAGS=${mt_zlib_ldflags}
-+    ZLIB_STATUS=${mt_zlib_library_status}
-+
-+
-+
-+
-+
-+            LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS"
-+            LIBS="$LIBS $ZLIB_LIBS"
+ 
+                         mt_zlib_libs="-lz"
+                         mt_zlib_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -29076,7 +15407,7 @@ fi
+ 
+             LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS"
+             LIBS="$LIBS $ZLIB_LIBS"
+-            { $as_echo "$as_me:$LINENO: retrying id3lib check with zlib flags" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: retrying id3lib check with zlib flags" >&5
-+$as_echo "$as_me: retrying id3lib check with zlib flags" >&6;}
-+
-+    mt_id3lib_status=yes
-+
-+    if test "x$mt_id3lib_status" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_id3lib_header_status=yes
-+
-+
-+# Check whether --with-id3lib-h was given.
+ $as_echo "$as_me: retrying id3lib check with zlib flags" >&6;}
+ 
+     mt_id3lib_status=yes
+@@ -29094,10 +15425,10 @@ $as_echo "$as_me: retrying id3lib check with zlib flags" >&6;}
+ 
+ 
+ # Check whether --with-id3lib-h was given.
+-if test "${with_id3lib_h+set}" = set; then
 +if test "${with_id3lib_h+set}" = set; then :
-+  withval=$with_id3lib_h;
-+            mt_id3lib_search_headers="$withval"
+   withval=$with_id3lib_h;
+             mt_id3lib_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for id3lib headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for id3lib headers in $withval" >&5
-+$as_echo "$as_me: Will search for id3lib headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_id3lib_search_headers" ; then
-+        unset ac_cv_header_id3_tag_h
-+        CFLAGS="$CFLAGS -I${mt_id3lib_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_id3lib_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_id3lib_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_id3lib_search_headers/id3/tag.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for id3lib headers in $withval" >&6;}
+ 
+ 
+@@ -29110,145 +15441,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_id3lib_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_id3lib_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_id3lib_search_headers/id3/tag.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_id3lib_search_headers/id3/tag.h" >&5
+-$as_echo_n "checking for $mt_id3lib_search_headers/id3/tag.h... " >&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 $mt_id3lib_search_headers/id3/tag.h usability" >&5
+-$as_echo_n "checking $mt_id3lib_search_headers/id3/tag.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 <$mt_id3lib_search_headers/id3/tag.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_cxx_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 $mt_id3lib_search_headers/id3/tag.h presence" >&5
+-$as_echo_n "checking $mt_id3lib_search_headers/id3/tag.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 <$mt_id3lib_search_headers/id3/tag.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_id3lib_search_headers/id3/tag.h" >&5
+-$as_echo_n "checking for $mt_id3lib_search_headers/id3/tag.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_id3lib_search_headers/id3/tag.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_id3lib_cxxflags="-I${mt_id3lib_search_headers}"
-+
-+else
-+
-+                mt_id3lib_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_id3lib_cxxflags="-I${mt_id3lib_search_headers}"
+ 
+@@ -29256,12 +15450,10 @@ else
+ 
+                 mt_id3lib_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: id3lib headers not found in requested location $mt_id3lib_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: id3lib headers not found in requested location $mt_id3lib_search_headers" >&5
-+$as_echo "$as_me: id3lib headers not found in requested location $mt_id3lib_search_headers" >&6;}
-+                else
-+                    as_fn_error "id3lib headers not found in requested location $mt_id3lib_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_id3_tag_h
+ $as_echo "$as_me: id3lib headers not found in requested location $mt_id3lib_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: id3lib headers not found in requested location $mt_id3lib_search_headers" >&5
+-$as_echo "$as_me: error: id3lib headers not found in requested location $mt_id3lib_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "id3lib headers not found in requested location $mt_id3lib_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -29270,140 +15462,9 @@ fi
+ 
+     else
+         unset ac_cv_header_id3_tag_h
+-        if test "${ac_cv_header_id3_tag_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for id3/tag.h" >&5
+-$as_echo_n "checking for id3/tag.h... " >&6; }
+-if test "${ac_cv_header_id3_tag_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_id3_tag_h" >&5
+-$as_echo "$ac_cv_header_id3_tag_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking id3/tag.h usability" >&5
+-$as_echo_n "checking id3/tag.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 <id3/tag.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_cxx_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 id3/tag.h presence" >&5
+-$as_echo_n "checking id3/tag.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 <id3/tag.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_cxx_preproc_warn_flag$ac_cxx_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; }
 +        ac_fn_cxx_check_header_mongrel "$LINENO" "id3/tag.h" "ac_cv_header_id3_tag_h" "$ac_includes_default"
 +if test "x$ac_cv_header_id3_tag_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_id3_tag_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/id3/tag.h" | $as_tr_sh`
+ 
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for id3/tag.h" >&5
+-$as_echo_n "checking for id3/tag.h... " >&6; }
+-if test "${ac_cv_header_id3_tag_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_id3_tag_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_id3_tag_h" >&5
+-$as_echo "$ac_cv_header_id3_tag_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_id3_tag_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -29411,145 +15472,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_id3_tag_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/id3/tag.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/id3/tag.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/id3/tag.h... " >&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 $MT_SEARCHPATH_HEADERS/id3/tag.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/id3/tag.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 <$MT_SEARCHPATH_HEADERS/id3/tag.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_cxx_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 $MT_SEARCHPATH_HEADERS/id3/tag.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/id3/tag.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 <$MT_SEARCHPATH_HEADERS/id3/tag.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/id3/tag.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/id3/tag.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/id3/tag.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_id3lib_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_id3lib_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_id3lib_header_status" != xyes; then
-+        mt_id3lib_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_id3lib_package_status=${mt_id3lib_header_status}
-+
-+    if test "x$mt_id3lib_package_status" = xyes; then
-+
-+    mt_id3lib_arg_default=yes
-+    mt_id3lib_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-id3lib-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_id3lib_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -29593,10 +15517,10 @@ fi
+ 
+ 
+ # Check whether --with-id3lib-libs was given.
+-if test "${with_id3lib_libs+set}" = set; then
 +if test "${with_id3lib_libs+set}" = set; then :
-+  withval=$with_id3lib_libs;
-+            mt_id3lib_search_libs="$withval"
+   withval=$with_id3lib_libs;
+             mt_id3lib_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for id3lib libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for id3lib libs in $withval" >&5
-+$as_echo "$as_me: Will search for id3lib libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_id3lib_search_libs" ; then
-+        unset ac_cv_lib_id3_main
-+        LDFLAGS="$LDFLAGS -L$mt_id3lib_search_libs"
+ $as_echo "$as_me: Will search for id3lib libs in $withval" >&6;}
+ 
+ 
+@@ -29606,18 +15530,14 @@ fi
+     if test "$mt_id3lib_search_libs" ; then
+         unset ac_cv_lib_id3_main
+         LDFLAGS="$LDFLAGS -L$mt_id3lib_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for main in -lid3" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lid3" >&5
-+$as_echo_n "checking for main in -lid3... " >&6; }
+ $as_echo_n "checking for main in -lid3... " >&6; }
+-if test "${ac_cv_lib_id3_main+set}" = set; then
 +if test "${ac_cv_lib_id3_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lid3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lid3  $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.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 
+@@ -29629,43 +15549,18 @@ return 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_id3_main=yes
-+else
+   ac_cv_lib_id3_main=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_id3_main=no
 +  ac_cv_lib_id3_main=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_id3_main" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3_main" >&5
-+$as_echo "$ac_cv_lib_id3_main" >&6; }
+ $as_echo "$ac_cv_lib_id3_main" >&6; }
+-if test "x$ac_cv_lib_id3_main" = x""yes; then
 +if test "x$ac_cv_lib_id3_main" = x""yes; then :
-+
-+                mt_id3lib_libs="-lid3"
-+                mt_id3lib_ldflags="-L$mt_id3lib_search_libs"
-+
-+else
-+
-+                mt_id3lib_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_id3lib_libs="-lid3"
+                 mt_id3lib_ldflags="-L$mt_id3lib_search_libs"
+@@ -29674,12 +15569,10 @@ else
+ 
+                 mt_id3lib_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
-+$as_echo "$as_me: id3lib library not found in requested location $mt_id3lib_search_libs" >&6;}
-+                else
-+                    as_fn_error "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_id3_main
+ $as_echo "$as_me: id3lib library not found in requested location $mt_id3lib_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
+-$as_echo "$as_me: error: id3lib library not found in requested location $mt_id3lib_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -29687,18 +15580,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_id3_main
+-        { $as_echo "$as_me:$LINENO: checking for main in -lid3" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lid3" >&5
-+$as_echo_n "checking for main in -lid3... " >&6; }
+ $as_echo_n "checking for main in -lid3... " >&6; }
+-if test "${ac_cv_lib_id3_main+set}" = set; then
 +if test "${ac_cv_lib_id3_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lid3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lid3  $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.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 
+@@ -29710,43 +15599,18 @@ return 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_id3_main=yes
-+else
+   ac_cv_lib_id3_main=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_id3_main=no
 +  ac_cv_lib_id3_main=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_id3_main" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3_main" >&5
-+$as_echo "$ac_cv_lib_id3_main" >&6; }
+ $as_echo "$ac_cv_lib_id3_main" >&6; }
+-if test "x$ac_cv_lib_id3_main" = x""yes; then
 +if test "x$ac_cv_lib_id3_main" = x""yes; then :
-+
-+                mt_id3lib_libs="-lid3"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_id3_main
+ 
+                 mt_id3lib_libs="-lid3"
+ 
+@@ -29754,18 +15618,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_id3_main
+-                { $as_echo "$as_me:$LINENO: checking for main in -lid3" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lid3" >&5
-+$as_echo_n "checking for main in -lid3... " >&6; }
+ $as_echo_n "checking for main in -lid3... " >&6; }
+-if test "${ac_cv_lib_id3_main+set}" = set; then
 +if test "${ac_cv_lib_id3_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lid3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lid3  $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.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 
+@@ -29777,43 +15637,18 @@ return 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_id3_main=yes
-+else
+   ac_cv_lib_id3_main=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_id3_main=no
 +  ac_cv_lib_id3_main=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_id3_main" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3_main" >&5
-+$as_echo "$ac_cv_lib_id3_main" >&6; }
+ $as_echo "$ac_cv_lib_id3_main" >&6; }
+-if test "x$ac_cv_lib_id3_main" = x""yes; then
 +if test "x$ac_cv_lib_id3_main" = x""yes; then :
-+
-+                        mt_id3lib_libs="-lid3"
-+                        mt_id3lib_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_id3lib_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_id3lib_library_status" != xyes; then
-+        mt_id3lib_libs=""
-+        mt_id3lib_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_id3lib_package_status=${mt_id3lib_library_status}
-+    fi
-+
-+    if test "x$mt_id3lib_package_status" = xyes; then
-+        ID3LIB_CFLAGS=${mt_id3lib_cxxflags}
-+        ID3LIB_LIBS=${mt_id3lib_libs}
-+        ID3LIB_LDFLAGS=${mt_id3lib_ldflags}
-+    fi
-+
-+        mt_id3lib_status=${mt_id3lib_package_status}
-+    fi
-+
-+    if test "x$mt_id3lib_status" = xyes; then
-+
+ 
+                         mt_id3lib_libs="-lid3"
+                         mt_id3lib_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -29856,9 +15691,7 @@ fi
+ 
+     if test "x$mt_id3lib_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ID3LIB 1
+-_ACEOF
 +$as_echo "#define HAVE_ID3LIB 1" >>confdefs.h
-+
-+    fi
-+
-+    ID3LIB_STATUS=${mt_id3lib_status}
-+
-+
-+
-+
-+
-+
-+            if test "x$ID3LIB_STATUS" = xyes; then
-+                ID3LIB_LIBS="$ID3LIB_LIBS $ZLIB_LIBS"
-+                ID3LIB_LDFLAGS="$ID3LIB_LDFLAGS $ZLIB_LDFLAGS"
-+            fi
-+        else
-+            LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS"
-+            LIBS="$LIBS $ZLIB_LIBS"
+ 
+     fi
+ 
+@@ -29876,7 +15709,7 @@ _ACEOF
+         else
+             LDFLAGS="$LDFLAGS $ZLIB_LDFLAGS"
+             LIBS="$LIBS $ZLIB_LIBS"
+-            { $as_echo "$as_me:$LINENO: retrying id3lib check with zlib flags" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: retrying id3lib check with zlib flags" >&5
-+$as_echo "$as_me: retrying id3lib check with zlib flags" >&6;}
-+
-+    mt_id3lib_status=yes
-+
-+    if test "x$mt_id3lib_status" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_id3lib_header_status=yes
-+
-+
-+# Check whether --with-id3lib-h was given.
+ $as_echo "$as_me: retrying id3lib check with zlib flags" >&6;}
+ 
+     mt_id3lib_status=yes
+@@ -29894,10 +15727,10 @@ $as_echo "$as_me: retrying id3lib check with zlib flags" >&6;}
+ 
+ 
+ # Check whether --with-id3lib-h was given.
+-if test "${with_id3lib_h+set}" = set; then
 +if test "${with_id3lib_h+set}" = set; then :
-+  withval=$with_id3lib_h;
-+            mt_id3lib_search_headers="$withval"
+   withval=$with_id3lib_h;
+             mt_id3lib_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for id3lib headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for id3lib headers in $withval" >&5
-+$as_echo "$as_me: Will search for id3lib headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_id3lib_search_headers" ; then
-+        unset ac_cv_header_id3_tag_h
-+        CFLAGS="$CFLAGS -I${mt_id3lib_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_id3lib_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_id3lib_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_id3lib_search_headers/id3/tag.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for id3lib headers in $withval" >&6;}
+ 
+ 
+@@ -29910,145 +15743,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_id3lib_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_id3lib_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_id3lib_search_headers/id3/tag.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_id3lib_search_headers/id3/tag.h" >&5
+-$as_echo_n "checking for $mt_id3lib_search_headers/id3/tag.h... " >&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 $mt_id3lib_search_headers/id3/tag.h usability" >&5
+-$as_echo_n "checking $mt_id3lib_search_headers/id3/tag.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 <$mt_id3lib_search_headers/id3/tag.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_cxx_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 $mt_id3lib_search_headers/id3/tag.h presence" >&5
+-$as_echo_n "checking $mt_id3lib_search_headers/id3/tag.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 <$mt_id3lib_search_headers/id3/tag.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_id3lib_search_headers/id3/tag.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_id3lib_search_headers/id3/tag.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_id3lib_search_headers/id3/tag.h" >&5
+-$as_echo_n "checking for $mt_id3lib_search_headers/id3/tag.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_id3lib_search_headers/id3/tag.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_id3lib_cxxflags="-I${mt_id3lib_search_headers}"
-+
-+else
-+
-+                mt_id3lib_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_id3lib_cxxflags="-I${mt_id3lib_search_headers}"
+ 
+@@ -30056,12 +15752,10 @@ else
+ 
+                 mt_id3lib_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: id3lib headers not found in requested location $mt_id3lib_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: id3lib headers not found in requested location $mt_id3lib_search_headers" >&5
-+$as_echo "$as_me: id3lib headers not found in requested location $mt_id3lib_search_headers" >&6;}
-+                else
-+                    as_fn_error "id3lib headers not found in requested location $mt_id3lib_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_id3_tag_h
+ $as_echo "$as_me: id3lib headers not found in requested location $mt_id3lib_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: id3lib headers not found in requested location $mt_id3lib_search_headers" >&5
+-$as_echo "$as_me: error: id3lib headers not found in requested location $mt_id3lib_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "id3lib headers not found in requested location $mt_id3lib_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -30070,140 +15764,9 @@ fi
+ 
+     else
+         unset ac_cv_header_id3_tag_h
+-        if test "${ac_cv_header_id3_tag_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for id3/tag.h" >&5
+-$as_echo_n "checking for id3/tag.h... " >&6; }
+-if test "${ac_cv_header_id3_tag_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_id3_tag_h" >&5
+-$as_echo "$ac_cv_header_id3_tag_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking id3/tag.h usability" >&5
+-$as_echo_n "checking id3/tag.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 <id3/tag.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_cxx_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 id3/tag.h presence" >&5
+-$as_echo_n "checking id3/tag.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 <id3/tag.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_cxx_preproc_warn_flag$ac_cxx_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_fn_cxx_check_header_mongrel "$LINENO" "id3/tag.h" "ac_cv_header_id3_tag_h" "$ac_includes_default"
 +if test "x$ac_cv_header_id3_tag_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_id3_tag_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/id3/tag.h" | $as_tr_sh`
+ 
+-  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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: id3/tag.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: id3/tag.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for id3/tag.h" >&5
+-$as_echo_n "checking for id3/tag.h... " >&6; }
+-if test "${ac_cv_header_id3_tag_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_id3_tag_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_id3_tag_h" >&5
+-$as_echo "$ac_cv_header_id3_tag_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_id3_tag_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -30211,145 +15774,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_id3_tag_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/id3/tag.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/id3/tag.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/id3/tag.h... " >&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 $MT_SEARCHPATH_HEADERS/id3/tag.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/id3/tag.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 <$MT_SEARCHPATH_HEADERS/id3/tag.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_cxx_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 $MT_SEARCHPATH_HEADERS/id3/tag.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/id3/tag.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 <$MT_SEARCHPATH_HEADERS/id3/tag.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/id3/tag.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/id3/tag.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/id3/tag.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/id3/tag.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_id3lib_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_id3lib_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_id3lib_header_status" != xyes; then
-+        mt_id3lib_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_id3lib_package_status=${mt_id3lib_header_status}
-+
-+    if test "x$mt_id3lib_package_status" = xyes; then
-+
-+    mt_id3lib_arg_default=yes
-+    mt_id3lib_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-id3lib-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_id3lib_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -30393,10 +15819,10 @@ fi
+ 
+ 
+ # Check whether --with-id3lib-libs was given.
+-if test "${with_id3lib_libs+set}" = set; then
 +if test "${with_id3lib_libs+set}" = set; then :
-+  withval=$with_id3lib_libs;
-+            mt_id3lib_search_libs="$withval"
+   withval=$with_id3lib_libs;
+             mt_id3lib_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for id3lib libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for id3lib libs in $withval" >&5
-+$as_echo "$as_me: Will search for id3lib libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_id3lib_search_libs" ; then
-+        unset ac_cv_lib_id3_main
-+        LDFLAGS="$LDFLAGS -L$mt_id3lib_search_libs"
+ $as_echo "$as_me: Will search for id3lib libs in $withval" >&6;}
+ 
+ 
+@@ -30406,18 +15832,14 @@ fi
+     if test "$mt_id3lib_search_libs" ; then
+         unset ac_cv_lib_id3_main
+         LDFLAGS="$LDFLAGS -L$mt_id3lib_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for main in -lid3" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lid3" >&5
-+$as_echo_n "checking for main in -lid3... " >&6; }
+ $as_echo_n "checking for main in -lid3... " >&6; }
+-if test "${ac_cv_lib_id3_main+set}" = set; then
 +if test "${ac_cv_lib_id3_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lid3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lid3  $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.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 
+@@ -30429,43 +15851,18 @@ return 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_id3_main=yes
-+else
+   ac_cv_lib_id3_main=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_id3_main=no
 +  ac_cv_lib_id3_main=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_id3_main" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3_main" >&5
-+$as_echo "$ac_cv_lib_id3_main" >&6; }
+ $as_echo "$ac_cv_lib_id3_main" >&6; }
+-if test "x$ac_cv_lib_id3_main" = x""yes; then
 +if test "x$ac_cv_lib_id3_main" = x""yes; then :
-+
-+                mt_id3lib_libs="-lid3"
-+                mt_id3lib_ldflags="-L$mt_id3lib_search_libs"
-+
-+else
-+
-+                mt_id3lib_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_id3lib_libs="-lid3"
+                 mt_id3lib_ldflags="-L$mt_id3lib_search_libs"
+@@ -30474,12 +15871,10 @@ else
+ 
+                 mt_id3lib_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
-+$as_echo "$as_me: id3lib library not found in requested location $mt_id3lib_search_libs" >&6;}
-+                else
-+                    as_fn_error "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_id3_main
+ $as_echo "$as_me: id3lib library not found in requested location $mt_id3lib_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: id3lib library not found in requested location $mt_id3lib_search_libs" >&5
+-$as_echo "$as_me: error: id3lib library not found in requested location $mt_id3lib_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "id3lib library not found in requested location $mt_id3lib_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -30487,18 +15882,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_id3_main
+-        { $as_echo "$as_me:$LINENO: checking for main in -lid3" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lid3" >&5
-+$as_echo_n "checking for main in -lid3... " >&6; }
+ $as_echo_n "checking for main in -lid3... " >&6; }
+-if test "${ac_cv_lib_id3_main+set}" = set; then
 +if test "${ac_cv_lib_id3_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lid3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lid3  $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.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 
+@@ -30510,43 +15901,18 @@ return 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_id3_main=yes
-+else
+   ac_cv_lib_id3_main=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_id3_main=no
 +  ac_cv_lib_id3_main=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_id3_main" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3_main" >&5
-+$as_echo "$ac_cv_lib_id3_main" >&6; }
+ $as_echo "$ac_cv_lib_id3_main" >&6; }
+-if test "x$ac_cv_lib_id3_main" = x""yes; then
 +if test "x$ac_cv_lib_id3_main" = x""yes; then :
-+
-+                mt_id3lib_libs="-lid3"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_id3_main
+ 
+                 mt_id3lib_libs="-lid3"
+ 
+@@ -30554,18 +15920,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_id3_main
+-                { $as_echo "$as_me:$LINENO: checking for main in -lid3" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lid3" >&5
-+$as_echo_n "checking for main in -lid3... " >&6; }
+ $as_echo_n "checking for main in -lid3... " >&6; }
+-if test "${ac_cv_lib_id3_main+set}" = set; then
 +if test "${ac_cv_lib_id3_main+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lid3  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lid3  $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.  */
-+
-+
-+int
-+main ()
-+{
-+return main ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ 
+@@ -30577,43 +15939,18 @@ return 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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_id3_main=yes
-+else
+   ac_cv_lib_id3_main=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_id3_main=no
 +  ac_cv_lib_id3_main=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_id3_main" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_id3_main" >&5
-+$as_echo "$ac_cv_lib_id3_main" >&6; }
+ $as_echo "$ac_cv_lib_id3_main" >&6; }
+-if test "x$ac_cv_lib_id3_main" = x""yes; then
 +if test "x$ac_cv_lib_id3_main" = x""yes; then :
-+
-+                        mt_id3lib_libs="-lid3"
-+                        mt_id3lib_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_id3lib_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_id3lib_library_status" != xyes; then
-+        mt_id3lib_libs=""
-+        mt_id3lib_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_id3lib_package_status=${mt_id3lib_library_status}
-+    fi
-+
-+    if test "x$mt_id3lib_package_status" = xyes; then
-+        ID3LIB_CFLAGS=${mt_id3lib_cxxflags}
-+        ID3LIB_LIBS=${mt_id3lib_libs}
-+        ID3LIB_LDFLAGS=${mt_id3lib_ldflags}
-+    fi
-+
-+        mt_id3lib_status=${mt_id3lib_package_status}
-+    fi
-+
-+    if test "x$mt_id3lib_status" = xyes; then
-+
+ 
+                         mt_id3lib_libs="-lid3"
+                         mt_id3lib_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -30656,9 +15993,7 @@ fi
+ 
+     if test "x$mt_id3lib_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ID3LIB 1
+-_ACEOF
 +$as_echo "#define HAVE_ID3LIB 1" >>confdefs.h
-+
-+    fi
-+
-+    ID3LIB_STATUS=${mt_id3lib_status}
-+
-+
-+
-+
-+
-+
-+            if test "x$ID3LIB_STATUS" = xyes; then
-+                ID3LIB_LIBS="$ID3LIB_LIBS $ZLIB_LIBS"
-+                ID3LIB_LDFLAGS="$ID3LIB_LDFLAGS $ZLIB_LDFLAGS"
-+            fi
-+        fi
-+
-+
-+
-+    fi
-+fi
-+
-+if test "x$ID3LIB_STATUS" = xyes; then
-+   CFLAGS="$CFLAGS $ID3_CFLAGS"
-+   CXXFLAGS="$CXXFLAGS $ID3_CFLAGS"
-+   LDFLAGS="$LDFLAGS $ID3LIB_LDFLAGS $ID3LIB_LIBS"
-+
-+   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
+ 
+     fi
+ 
+@@ -30691,13 +16026,9 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+-   { $as_echo "$as_me:$LINENO: checking for album art support in id3lib" >&5
 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for album art support in id3lib" >&5
-+$as_echo_n "checking for album art support in id3lib... " >&6; }
+ $as_echo_n "checking for album art support in id3lib... " >&6; }
+-   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 <id3/tag.h>
-+                #include <id3/misc_support.h>
-+
-+int
-+main ()
-+{
-+
-+                (void)ID3_HasPicture(0);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+                 #include <id3/tag.h>
+@@ -30714,43 +16045,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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+
+ 
+-            { $as_echo "$as_me:$LINENO: result: yes" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
+ $as_echo "yes" >&6; }
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_ID3_ALBUMART 1
+-_ACEOF
 +$as_echo "#define HAVE_ID3_ALBUMART 1" >>confdefs.h
-+
-+
-+else
-+
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ 
+-            { $as_echo "$as_me:$LINENO: result: no" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+else
-+    if (test "x$ID3LIB_OPTION_REQUESTED" = xyes) &&
-+       (test "x$ID3LIB_OPEION_ENABLED" = xyes); then
-+        if test "x$TAGLIB_STATUS" = xyes; then
-+            as_fn_error "Please select either taglib or id3lib, but not both." "$LINENO" 5
-+        else
-+            as_fn_error "unable to configure id3lib support" "$LINENO" 5
-+        fi
-+    else
-+        ID3LIB_STATUS=disabled
-+    fi
-+fi
-+
-+LDFLAGS="$LDFLAGS_SAVE"
-+LIBS="$LIBS_SAVE"
-+CXXFLAGS="$CXXFLAGS_SAVE"
-+CPPFLAGS="$CPPFLAGS_SAVE"
-+######## curl
-+
-+CURL_PROG_FOUND=0
-+CURL_LIBS=
-+CURL_CFLAGS=
-+CURL_OK=no
-+
-+if ((test "x$YOUTUBE_OPTION_ENABLED" = xyes) && (test "x$YOUTUBE_OPTION_REQUESTED" = xyes) && (test $USE_CURL -eq 0) && (test $CURL_REQUESTED -eq 1)); then
-+    as_fn_error "You enabled YouTube but disabled curl, however curl is required by the YouTube feature" "$LINENO" 5
-+fi
-+
-+if ((test "x$WEBORAMA_OPTION_ENABLED" = xyes) && (test "x$WEBORAMA_OPTION_REQUESTED" = xyes) && (test $USE_CURL -eq 0) && (test $CURL_REQUESTED -eq 1)); then
-+    as_fn_error "You enabled Weborama but disabled curl, however curl is required by the Weborama feature" "$LINENO" 5
-+fi
-+
-+if ((test "x$ATRAILERS_OPTION_ENABLED" = xyes) && (test "x$ATRAILERS_OPTION_REQUESTED" = xyes) && (test $USE_CURL -eq 0) && (test $CURL_REQUESTED -eq 1)); then
-+    as_fn_error "You enabled Apple Trailers but disabled curl, however curl is required by the Apple Trailers feature" "$LINENO" 5
-+fi
-+
-+if ((test "x$YOUTUBE_OPTION_ENABLED" != xyes) && (test "x$SOPCAST_OPTION_ENABLED" != xyes) && (test "x$EXTERNAL_TRANSCODING_OPTION" != xyes) && (test "x$ATRAILERS_OPTION_ENABLED" != xyes) && (test "x$WEBORAMA_OPTION_ENABLED" != xyes)); then
-+    if test $USE_CURL -eq 1; then
-+        if test $CURL_REQUESTED -eq 1; then
-+            as_fn_error "You enabled curl support but the external transcoding, YouTube and SopCast features are disabled - curl is not needed without it" "$LINENO" 5
-+        else
-+            CURL_OK=no
-+            USE_CURL=0
-+        fi
-+    fi
-+fi
-+
-+if (((test "x$YOUTUBE_OPTION_ENABLED" = xyes) || (test "x$SOPCAST_OPTION_ENABLED" = xyes) || (test "x$ATRAILERS_OPTION_ENABLED" = xyes) || (test "x$WEBORAMA_OPTION_ENABLED" = xyes) || (test "x$EXTERNAL_TRANSCODING_OPTION" = xyes)) && (test $USE_CURL -eq 1)); then
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for curl (needed for extended external transcoding/YouTube/SopCast support)" >&5
-+$as_echo "$as_me: Checking for curl (needed for extended external transcoding/YouTube/SopCast support)" >&6;}
-+    CURL_OK=yes
-+    if test -n "$CURL_SEARCH_CONFIG"; then
+ $as_echo "no" >&6; }
+ 
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+    ac_ext=cpp
+ ac_cpp='$CXXCPP $CPPFLAGS'
+@@ -30762,13 +16070,9 @@ else
+     if (test "x$ID3LIB_OPTION_REQUESTED" = xyes) &&
+        (test "x$ID3LIB_OPTION_ENABLED" = xyes); then
+         if test "x$TAGLIB_STATUS" = xyes; then
+-            { { $as_echo "$as_me:$LINENO: error: Please select either taglib or id3lib, but not both." >&5
+-$as_echo "$as_me: error: Please select either taglib or id3lib, but not both." >&2;}
+-   { (exit 1); exit 1; }; }
++            as_fn_error $? "Please select either taglib or id3lib, but not both." "$LINENO" 5
+         else
+-            { { $as_echo "$as_me:$LINENO: error: unable to configure id3lib support" >&5
+-$as_echo "$as_me: error: unable to configure id3lib support" >&2;}
+-   { (exit 1); exit 1; }; }
++            as_fn_error $? "unable to configure id3lib support" "$LINENO" 5
+         fi
+     else
+         ID3LIB_STATUS=disabled
+@@ -30787,29 +16091,21 @@ CURL_CFLAGS=
+ CURL_OK=no
+ 
+ if ((test "x$YOUTUBE_OPTION_ENABLED" = xyes) && (test "x$YOUTUBE_OPTION_REQUESTED" = xyes) && (test $USE_CURL -eq 0) && (test $CURL_REQUESTED -eq 1)); then
+-    { { $as_echo "$as_me:$LINENO: error: You enabled YouTube but disabled curl, however curl is required by the YouTube feature" >&5
+-$as_echo "$as_me: error: You enabled YouTube but disabled curl, however curl is required by the YouTube feature" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "You enabled YouTube but disabled curl, however curl is required by the YouTube feature" "$LINENO" 5
+ fi
+ 
+ if ((test "x$WEBORAMA_OPTION_ENABLED" = xyes) && (test "x$WEBORAMA_OPTION_REQUESTED" = xyes) && (test $USE_CURL -eq 0) && (test $CURL_REQUESTED -eq 1)); then
+-    { { $as_echo "$as_me:$LINENO: error: You enabled Weborama but disabled curl, however curl is required by the Weborama feature" >&5
+-$as_echo "$as_me: error: You enabled Weborama but disabled curl, however curl is required by the Weborama feature" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "You enabled Weborama but disabled curl, however curl is required by the Weborama feature" "$LINENO" 5
+ fi
+ 
+ if ((test "x$ATRAILERS_OPTION_ENABLED" = xyes) && (test "x$ATRAILERS_OPTION_REQUESTED" = xyes) && (test $USE_CURL -eq 0) && (test $CURL_REQUESTED -eq 1)); then
+-    { { $as_echo "$as_me:$LINENO: error: You enabled Apple Trailers but disabled curl, however curl is required by the Apple Trailers feature" >&5
+-$as_echo "$as_me: error: You enabled Apple Trailers but disabled curl, however curl is required by the Apple Trailers feature" >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "You enabled Apple Trailers but disabled curl, however curl is required by the Apple Trailers feature" "$LINENO" 5
+ fi
+ 
+ if ((test "x$YOUTUBE_OPTION_ENABLED" != xyes) && (test "x$SOPCAST_OPTION_ENABLED" != xyes) && (test "x$EXTERNAL_TRANSCODING_OPTION" != xyes) && (test "x$ATRAILERS_OPTION_ENABLED" != xyes) && (test "x$WEBORAMA_OPTION_ENABLED" != xyes)); then
+     if test $USE_CURL -eq 1; then
+         if test $CURL_REQUESTED -eq 1; then
+-            { { $as_echo "$as_me:$LINENO: error: You enabled curl support but the external transcoding, YouTube and SopCast features are disabled - curl is not needed without it" >&5
+-$as_echo "$as_me: error: You enabled curl support but the external transcoding, YouTube and SopCast features are disabled - curl is not needed without it" >&2;}
+-   { (exit 1); exit 1; }; }
++            as_fn_error $? "You enabled curl support but the external transcoding, YouTube and SopCast features are disabled - curl is not needed without it" "$LINENO" 5
+         else
+             CURL_OK=no
+             USE_CURL=0
+@@ -30818,11 +16114,11 @@ $as_echo "$as_me: error: You enabled curl support but the external transcoding,
+ fi
+ 
+ if (((test "x$YOUTUBE_OPTION_ENABLED" = xyes) || (test "x$SOPCAST_OPTION_ENABLED" = xyes) || (test "x$ATRAILERS_OPTION_ENABLED" = xyes) || (test "x$WEBORAMA_OPTION_ENABLED" = xyes) || (test "x$EXTERNAL_TRANSCODING_OPTION" = xyes)) && (test $USE_CURL -eq 1)); then
+-    { $as_echo "$as_me:$LINENO: Checking for curl (needed for extended external transcoding/YouTube support)" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: Checking for curl (needed for extended external transcoding/YouTube support)" >&5
+ $as_echo "$as_me: Checking for curl (needed for extended external transcoding/YouTube support)" >&6;}
+     CURL_OK=yes
+     if test -n "$CURL_SEARCH_CONFIG"; then
+-        { $as_echo "$as_me:$LINENO: You specified $CURL_SEARCH_CONFIG for curl-config" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: You specified $CURL_SEARCH_CONFIG for curl-config" >&5
-+$as_echo "$as_me: You specified $CURL_SEARCH_CONFIG for curl-config" >&6;}
-+
-+        if test -f "$CURL_SEARCH_CONFIG"; then
-+            curlconfig="$CURL_SEARCH_CONFIG"
-+        else
-+            curlconfig="no"
-+        fi
-+
-+        if test "x$curlconfig" = xno; then
-+            as_fn_error "$CURL_SEARCH_CONFIG not found" "$LINENO" 5
-+        else
-+            CURL_TEST=`${curlconfig} --version 2>/dev/null`
-+            if test -z "$CURL_TEST"; then
-+                as_fn_error "${curlconfig} could not be executed or returned invalid values" "$LINENO" 5
-+            fi
-+            CURL_PROG_FOUND=1
-+        fi
-+    else
-+        # Extract the first word of "curl-config", so it can be a program name with args.
-+set dummy curl-config; ac_word=$2
+ $as_echo "$as_me: You specified $CURL_SEARCH_CONFIG for curl-config" >&6;}
+ 
+         if test -f "$CURL_SEARCH_CONFIG"; then
+@@ -30832,24 +16128,20 @@ $as_echo "$as_me: You specified $CURL_SEARCH_CONFIG for curl-config" >&6;}
+         fi
+ 
+         if test "x$curlconfig" = xno; then
+-            { { $as_echo "$as_me:$LINENO: error: $CURL_SEARCH_CONFIG not found" >&5
+-$as_echo "$as_me: error: $CURL_SEARCH_CONFIG not found" >&2;}
+-   { (exit 1); exit 1; }; }
++            as_fn_error $? "$CURL_SEARCH_CONFIG not found" "$LINENO" 5
+         else
+             CURL_TEST=`${curlconfig} --version 2>/dev/null`
+             if test -z "$CURL_TEST"; then
+-                { { $as_echo "$as_me:$LINENO: error: ${curlconfig} could not be executed or returned invalid values" >&5
+-$as_echo "$as_me: error: ${curlconfig} could not be executed or returned invalid values" >&2;}
+-   { (exit 1); exit 1; }; }
++                as_fn_error $? "${curlconfig} could not be executed or returned invalid values" "$LINENO" 5
+             fi
+             CURL_PROG_FOUND=1
+         fi
+     else
+         # Extract the first word of "curl-config", so it can be a program name with args.
+ set dummy curl-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; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_curlconfig+set}" = set; then
 +if test "${ac_cv_path_curlconfig+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $curlconfig in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_curlconfig="$curlconfig" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   case $curlconfig in
+@@ -30862,14 +16154,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_curlconfig="$as_dir/$ac_word$ac_exec_ext"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_curlconfig="$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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_curlconfig" && ac_cv_path_curlconfig="no"
-+  ;;
-+esac
-+fi
-+curlconfig=$ac_cv_path_curlconfig
-+if test -n "$curlconfig"; then
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_curlconfig" && ac_cv_path_curlconfig="no"
+@@ -30878,10 +16170,10 @@ esac
+ fi
+ curlconfig=$ac_cv_path_curlconfig
+ if test -n "$curlconfig"; then
+-  { $as_echo "$as_me:$LINENO: result: $curlconfig" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $curlconfig" >&5
-+$as_echo "$curlconfig" >&6; }
-+else
+ $as_echo "$curlconfig" >&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
-+
-+
-+        if test "x$curlconfig" = xno; then
-+            unset ac_cv_path_curlconfig
-+            # Extract the first word of "curl-config", so it can be a program name with args.
-+set dummy curl-config; ac_word=$2
+ $as_echo "no" >&6; }
+ fi
+ 
+@@ -30890,9 +16182,9 @@ fi
+             unset ac_cv_path_curlconfig
+             # Extract the first word of "curl-config", so it can be a program name with args.
+ set dummy curl-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; }
+ $as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_curlconfig+set}" = set; then
 +if test "${ac_cv_path_curlconfig+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $curlconfig in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_curlconfig="$curlconfig" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $SEARCH_DIR_PROGS
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
+   $as_echo_n "(cached) " >&6
+ else
+   case $curlconfig in
+@@ -30905,14 +16197,14 @@ for as_dir in $SEARCH_DIR_PROGS
+ 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_curlconfig="$as_dir/$ac_word$ac_exec_ext"
+   if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+     ac_cv_path_curlconfig="$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
+     break 2
+   fi
+ done
+-done
 +  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_curlconfig" && ac_cv_path_curlconfig="no"
-+  ;;
-+esac
-+fi
-+curlconfig=$ac_cv_path_curlconfig
-+if test -n "$curlconfig"; then
+ IFS=$as_save_IFS
+ 
+   test -z "$ac_cv_path_curlconfig" && ac_cv_path_curlconfig="no"
+@@ -30921,17 +16213,17 @@ esac
+ fi
+ curlconfig=$ac_cv_path_curlconfig
+ if test -n "$curlconfig"; then
+-  { $as_echo "$as_me:$LINENO: result: $curlconfig" >&5
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $curlconfig" >&5
-+$as_echo "$curlconfig" >&6; }
-+else
+ $as_echo "$curlconfig" >&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
-+
-+
-+            if test "x$curlconfig" = xno; then
-+                CURL_OK=missing
+ $as_echo "no" >&6; }
+ fi
+ 
+ 
+             if test "x$curlconfig" = xno; then
+                 CURL_OK=missing
+-                { $as_echo "$as_me:$LINENO: result: curl-config not found, please install the curl-devel package" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: result: curl-config not found, please install the curl-devel package" >&5
-+$as_echo "curl-config not found, please install the curl-devel package" >&6; }
-+            else
-+                CURL_PROG_FOUND=1
-+            fi
-+        else
-+            CURL_PROG_FOUND=1
-+        fi
-+   fi
-+
-+   if test $CURL_PROG_FOUND -eq 1 ; then
+ $as_echo "curl-config not found, please install the curl-devel package" >&6; }
+             else
+                 CURL_PROG_FOUND=1
+@@ -30942,16 +16234,16 @@ $as_echo "curl-config not found, please install the curl-devel package" >&6; }
+    fi
+ 
+    if test $CURL_PROG_FOUND -eq 1 ; then
+-        { $as_echo "$as_me:$LINENO: checking curl cflags" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking curl cflags" >&5
-+$as_echo_n "checking curl cflags... " >&6; }
-+        CURL_CFLAGS=`${curlconfig} --cflags`
+ $as_echo_n "checking curl cflags... " >&6; }
+         CURL_CFLAGS=`${curlconfig} --cflags`
+-        { $as_echo "$as_me:$LINENO: result: $CURL_CFLAGS" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CFLAGS" >&5
-+$as_echo "$CURL_CFLAGS" >&6; }
-+
+ $as_echo "$CURL_CFLAGS" >&6; }
+ 
+-        { $as_echo "$as_me:$LINENO: checking curl libraries" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking curl libraries" >&5
-+$as_echo_n "checking curl libraries... " >&6; }
-+        CURL_LIBS=`${curlconfig} --libs`
+ $as_echo_n "checking curl libraries... " >&6; }
+         CURL_LIBS=`${curlconfig} --libs`
+-        { $as_echo "$as_me:$LINENO: result: $CURL_LIBS" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_LIBS" >&5
-+$as_echo "$CURL_LIBS" >&6; }
-+    fi
-+fi
-+
-+if test "x$CURL_OK" = xyes; then
-+    CPPFLAGS="$CPPFLAGS $CURL_CFLAGS"
-+    CXXFLAGS="$CXXFLAGS $CURL_CFLAGS"
+ $as_echo "$CURL_LIBS" >&6; }
+     fi
+ fi
+@@ -30959,151 +16251,12 @@ fi
+ if test "x$CURL_OK" = xyes; then
+     CPPFLAGS="$CPPFLAGS $CURL_CFLAGS"
+     CXXFLAGS="$CXXFLAGS $CURL_CFLAGS"
+-
+-for ac_header in curl/curl.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_cxx_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_cxx_preproc_warn_flag$ac_cxx_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_cxx_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 jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_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
 +    for ac_header in curl/curl.h
 +do :
 +  ac_fn_cxx_check_header_mongrel "$LINENO" "curl/curl.h" "ac_cv_header_curl_curl_h" "$ac_includes_default"
 +if test "x$ac_cv_header_curl_curl_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +#define HAVE_CURL_CURL_H 1
-+_ACEOF
-+
-+else
-+  CURL_OK=missing
-+
-+fi
-+
-+done
-+
-+fi
-+
-+if test "x$CURL_OK" = xyes; then
-+    LDFLAGS="$CURL_LIBS"
+ _ACEOF
+ 
+ else
+@@ -31117,19 +16270,14 @@ fi
+ 
+ if test "x$CURL_OK" = xyes; then
+     LDFLAGS="$CURL_LIBS"
+-
+-{ $as_echo "$as_me:$LINENO: checking for curl_easy_init in -lcurl" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_easy_init in -lcurl" >&5
-+$as_echo_n "checking for curl_easy_init in -lcurl... " >&6; }
+ $as_echo_n "checking for curl_easy_init in -lcurl... " >&6; }
+-if test "${ac_cv_lib_curl_curl_easy_init+set}" = set; then
 +if test "${ac_cv_lib_curl_curl_easy_init+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lcurl  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lcurl  $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.
-+   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 curl_easy_init ();
-+int
-+main ()
-+{
-+return curl_easy_init ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -31147,43 +16295,18 @@ return curl_easy_init ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_curl_curl_easy_init=yes
-+else
+   ac_cv_lib_curl_curl_easy_init=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_curl_curl_easy_init=no
 +  ac_cv_lib_curl_curl_easy_init=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_curl_curl_easy_init" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_easy_init" >&5
-+$as_echo "$ac_cv_lib_curl_curl_easy_init" >&6; }
+ $as_echo "$ac_cv_lib_curl_curl_easy_init" >&6; }
+-if test "x$ac_cv_lib_curl_curl_easy_init" = x""yes; then
 +if test "x$ac_cv_lib_curl_curl_easy_init" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBCURL 1
-+_ACEOF
-+
-+  LIBS="-lcurl $LIBS"
-+
-+else
-+  CURL_OK=missing
-+
-+fi
-+
-+fi
-+
-+if test "x$CURL_OK" = xyes; then
-+
+   cat >>confdefs.h <<_ACEOF
+ #define HAVE_LIBCURL 1
+ _ACEOF
+@@ -31199,71 +16322,59 @@ fi
+ 
+ if test "x$CURL_OK" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_CURL 1
+-_ACEOF
 +$as_echo "#define HAVE_CURL 1" >>confdefs.h
-+
-+
-+
-+else
-+    if (test "x$YOUTUBE_OPTION_ENABLED" = xyes) && (test "x$YOUTUBE_OPTION_REQUESTED" = xyes); then
-+        as_fn_error "unable to configure curl which is required for YouTube support!" "$LINENO" 5
-+    fi
-+
-+    if (test "x$YOUTUBE_OPTION_ENABLED" = xyes) && (test "x$YOUTUBE_OPTION_REQUESTED" != xyes); then
+ 
+ 
+ 
+ else
+     if (test "x$YOUTUBE_OPTION_ENABLED" = xyes) && (test "x$YOUTUBE_OPTION_REQUESTED" = xyes); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure curl which is required for YouTube support!" >&5
+-$as_echo "$as_me: error: unable to configure curl which is required for YouTube support!" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure curl which is required for YouTube support!" "$LINENO" 5
+     fi
+ 
+     if (test "x$YOUTUBE_OPTION_ENABLED" = xyes) && (test "x$YOUTUBE_OPTION_REQUESTED" != xyes); then
+-        { $as_echo "$as_me:$LINENO: WARNING: curl not found, disabling YouTube" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: curl not found, disabling YouTube" >&5
-+$as_echo "$as_me: WARNING: curl not found, disabling YouTube" >&2;}
-+        YOUTUBE_OPTION_ENABLED="missing"
-+    fi
-+
-+    if (test "x$WEBORAMA_OPTION_ENABLED" = xyes) && (test "x$WEBORAMA_OPTION_REQUESTED" = xyes); then
-+        as_fn_error "unable to configure curl which is required for Weborama support!" "$LINENO" 5
-+    fi
-+
-+    if (test "x$WEBORAMA_OPTION_ENABLED" = xyes) && (test "x$WEBORAMA_OPTION_REQUESTED" != xyes); then
+ $as_echo "$as_me: WARNING: curl not found, disabling YouTube" >&2;}
+         YOUTUBE_OPTION_ENABLED="missing"
+     fi
+ 
+     if (test "x$WEBORAMA_OPTION_ENABLED" = xyes) && (test "x$WEBORAMA_OPTION_REQUESTED" = xyes); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure curl which is required for Weborama support!" >&5
+-$as_echo "$as_me: error: unable to configure curl which is required for Weborama support!" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure curl which is required for Weborama support!" "$LINENO" 5
+     fi
+ 
+     if (test "x$WEBORAMA_OPTION_ENABLED" = xyes) && (test "x$WEBORAMA_OPTION_REQUESTED" != xyes); then
+-        { $as_echo "$as_me:$LINENO: WARNING: curl not found, disabling Weborama" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: curl not found, disabling Weborama" >&5
-+$as_echo "$as_me: WARNING: curl not found, disabling Weborama" >&2;}
-+        WEBORAMA_OPTION_ENABLED="missing"
-+    fi
-+
-+    if (test "x$ATRAILERS_OPTION_ENABLED" = xyes) && (test "x$ATRAILERS_OPTION_REQUESTED" = xyes); then
-+        as_fn_error "unable to configure curl which is required for Apple Trailers support!" "$LINENO" 5
-+    fi
-+
-+    if (test "x$ATRAILERS_OPTION_ENABLED" = xyes) && (test "x$ATRAILERS_OPTION_REQUESTED" != xyes); then
+ $as_echo "$as_me: WARNING: curl not found, disabling Weborama" >&2;}
+         WEBORAMA_OPTION_ENABLED="missing"
+     fi
+ 
+     if (test "x$ATRAILERS_OPTION_ENABLED" = xyes) && (test "x$ATRAILERS_OPTION_REQUESTED" = xyes); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure curl which is required for Apple Trailers support!" >&5
+-$as_echo "$as_me: error: unable to configure curl which is required for Apple Trailers support!" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure curl which is required for Apple Trailers support!" "$LINENO" 5
+     fi
+ 
+     if (test "x$ATRAILERS_OPTION_ENABLED" = xyes) && (test "x$ATRAILERS_OPTION_REQUESTED" != xyes); then
+-        { $as_echo "$as_me:$LINENO: WARNING: curl not found, disabling Apple Trailers" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: curl not found, disabling Apple Trailers" >&5
-+$as_echo "$as_me: WARNING: curl not found, disabling Apple Trailers" >&2;}
-+        ATRAILERS_OPTION_ENABLED="missing"
-+    fi
-+
-+    if (test "x$SOPCAST_OPTION_ENABLED" = xyes) && (test "x$SOPCAST_OPTION_REQUESTED" = xyes); then
-+        as_fn_error "unable to configure curl which is required for SopCast support!" "$LINENO" 5
-+    fi
-+
-+    if (test "x$SOPCAST_OPTION_ENABLED" = xyes) && (test "x$SOPCAST_OPTION_REQUESTED" != xyes); then
+ $as_echo "$as_me: WARNING: curl not found, disabling Apple Trailers" >&2;}
+         ATRAILERS_OPTION_ENABLED="missing"
+     fi
+ 
+     if (test "x$SOPCAST_OPTION_ENABLED" = xyes) && (test "x$SOPCAST_OPTION_REQUESTED" = xyes); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure curl which is required for SopCast support!" >&5
+-$as_echo "$as_me: error: unable to configure curl which is required for SopCast support!" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure curl which is required for SopCast support!" "$LINENO" 5
+     fi
+ 
+     if (test "x$SOPCAST_OPTION_ENABLED" = xyes) && (test "x$SOPCAST_OPTION_REQUESTED" != xyes); then
+-        { $as_echo "$as_me:$LINENO: WARNING: curl not found, disabling SopCast" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: curl not found, disabling SopCast" >&5
-+$as_echo "$as_me: WARNING: curl not found, disabling SopCast" >&2;}
-+        SOPCAST_OPTION_ENABLED="missing"
-+    fi
-+
-+    if test "x$EXTERNAL_TRANSCODING_OPTION" = xyes; then
-+        if ((test $USE_CURL -eq 1) && (test $CURL_REQUESTED -eq 0)); then
+ $as_echo "$as_me: WARNING: curl not found, disabling SopCast" >&2;}
+         SOPCAST_OPTION_ENABLED="missing"
+     fi
+ 
+     if test "x$EXTERNAL_TRANSCODING_OPTION" = xyes; then
+         if ((test $USE_CURL -eq 1) && (test $CURL_REQUESTED -eq 0)); then
+-            { $as_echo "$as_me:$LINENO: WARNING: unable to configure curl, external transcoding will have limited functionality!" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unable to configure curl, external transcoding will have limited functionality!" >&5
-+$as_echo "$as_me: WARNING: unable to configure curl, external transcoding will have limited functionality!" >&2;}
-+        fi
-+
-+        if ((test $USE_CURL -eq 1) && (test $CURL_REQUESTED -eq 1)); then
-+            as_fn_error "You enabled curl support but the curl library could not be configured" "$LINENO" 5
-+        fi
-+    fi
-+
-+    if (test "x$YOUTUBE_OPTION_ENABLED" != xyes) && (test "x$WEBORAMA_OPTION_ENABLED" != xyes) && (test "x$ATRAILERS_OPTION_ENABLED" != xyes) && (test "x$EXTERNAL_TRANSCODING_OPTION" = !xyes) && (test "x$SOPCAST_OPTION_ENABLED" != xyes); then
-+        CURL_CFLAGS=
-+        CURL_LIBS=
-+    fi
-+fi
-+CPPFLAGS="$CPPFLAGS_SAVE"
-+CXXFLAGS="$CXXFLAGS_SAVE"
-+LDFLAGS="$LDFLAGS_SAVE"
-+
-+######## ffmpeg or extractor?
-+
-+FFMPEG_STATUS=
-+LIBEXTRACTOR_STATUS=
-+
-+
-+
-+    mt_libextractor_option_enabled=
-+    mt_libextractor_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_libextractor_option_enabled=yes
-+    else
-+        mt_libextractor_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-libextractor was given.
+ $as_echo "$as_me: WARNING: unable to configure curl, external transcoding will have limited functionality!" >&2;}
+         fi
+ 
+         if ((test $USE_CURL -eq 1) && (test $CURL_REQUESTED -eq 1)); then
+-            { { $as_echo "$as_me:$LINENO: error: You enabled curl support but the curl library could not be configured" >&5
+-$as_echo "$as_me: error: You enabled curl support but the curl library could not be configured" >&2;}
+-   { (exit 1); exit 1; }; }
++            as_fn_error $? "You enabled curl support but the curl library could not be configured" "$LINENO" 5
+         fi
+     fi
+ 
+@@ -31292,7 +16403,7 @@ LIBEXTRACTOR_STATUS=
+     fi
+ 
+     # Check whether --enable-libextractor was given.
+-if test "${enable_libextractor+set}" = set; then
 +if test "${enable_libextractor+set}" = set; then :
-+  enableval=$enable_libextractor;
-+            mt_libextractor_option_enabled=$enableval
-+            mt_libextractor_option_requested=yes
-+
-+
-+fi
-+
-+
-+    LIBEXTRACTOR_OPTION_ENABLED=${mt_libextractor_option_enabled}
-+    LIBEXTRACTOR_OPTION_REQUESTED=${mt_libextractor_option_requested}
-+
-+
-+
-+
+   enableval=$enable_libextractor;
+             mt_libextractor_option_enabled=$enableval
+             mt_libextractor_option_requested=yes
+@@ -31307,7 +16418,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_libextractor_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+
-+
-+    mt_ffmpeg_option_enabled=
-+    mt_ffmpeg_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_ffmpeg_option_enabled=yes
-+    else
-+        mt_ffmpeg_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-ffmpeg was given.
+ 
+ 
+ 
+@@ -31320,7 +16433,7 @@ fi
+     fi
+ 
+     # Check whether --enable-ffmpeg was given.
+-if test "${enable_ffmpeg+set}" = set; then
 +if test "${enable_ffmpeg+set}" = set; then :
-+  enableval=$enable_ffmpeg;
-+            mt_ffmpeg_option_enabled=$enableval
-+            mt_ffmpeg_option_requested=yes
-+
-+
-+fi
-+
-+
-+    FFMPEG_OPTION_ENABLED=${mt_ffmpeg_option_enabled}
-+    FFMPEG_OPTION_REQUESTED=${mt_ffmpeg_option_requested}
-+
-+
-+
-+
+   enableval=$enable_ffmpeg;
+             mt_ffmpeg_option_enabled=$enableval
+             mt_ffmpeg_option_requested=yes
+@@ -31335,28 +16448,28 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_ffmpeg_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+if ((test "x$FFMPEG_OPTION_ENABLED" = xno) && (test "x$LIBEXTRACTOR_OPTION_ENABLED" = xyes)) ; then
-+    FFMPEG_STATUS=disabled
-+    FFMPEG_OPTION_ENABLED=no
+ 
+ if ((test "x$FFMPEG_OPTION_ENABLED" = xno) && (test "x$LIBEXTRACTOR_OPTION_ENABLED" = xyes)) ; then
+     FFMPEG_STATUS=disabled
+     FFMPEG_OPTION_ENABLED=no
+-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg disabled" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ffmpeg disabled" >&5
-+$as_echo "$as_me: WARNING: ffmpeg disabled" >&2;}
-+elif ((test "x$FFMPEG_OPTION_ENABLED" = xyes) && (test "x$LIBEXTRACTOR_OPTION_ENABLED" = xno)) ; then
-+    LIBEXTRACTOR_STATUS=disabled
-+    LIBEXTRACTOR_OPTION_ENABLED=no
-+elif ((test "x$FFMPEG_OPTION_ENABLED" = xyes) && (test "x$LIBEXTRACTOR_OPTION_ENABLED" = xyes)) ; then
-+    if ((test "x$FFMPEG_OPTION_REQUESTED" = xyes) && (test "x$LIBEXTRACTOR_OPTION_REQUESTED" = xyes)); then
-+    as_fn_error "Please select either ffmpeg or libextractor, but not both." "$LINENO" 5
-+    elif ((test "x$FFMPEG_OPTION_REQUESTED" = xyes) && (test "x$LIBEXTRACTOR_OPTION_REQUESTED" = xno)); then
-+       LIBEXTRACTOR_STATUS=disabled
-+       LIBEXTRACTOR_OPTION_ENABLED=no
-+    elif ((test "x$FFMPEG_OPTION_REQUESTED" = xno) && (test "x$LIBEXTRACTOR_OPTION_REQUESTED" = xyes)); then
-+       FFMPEG_STATUS=disabled
-+       FFMPEG_OPTION_ENABLED=no
+ $as_echo "$as_me: WARNING: ffmpeg disabled" >&2;}
+ elif ((test "x$FFMPEG_OPTION_ENABLED" = xyes) && (test "x$LIBEXTRACTOR_OPTION_ENABLED" = xno)) ; then
+     LIBEXTRACTOR_STATUS=disabled
+     LIBEXTRACTOR_OPTION_ENABLED=no
+ elif ((test "x$FFMPEG_OPTION_ENABLED" = xyes) && (test "x$LIBEXTRACTOR_OPTION_ENABLED" = xyes)) ; then
+     if ((test "x$FFMPEG_OPTION_REQUESTED" = xyes) && (test "x$LIBEXTRACTOR_OPTION_REQUESTED" = xyes)); then
+-    { { $as_echo "$as_me:$LINENO: error: Please select either ffmpeg or libextractor, but not both." >&5
+-$as_echo "$as_me: error: Please select either ffmpeg or libextractor, but not both." >&2;}
+-   { (exit 1); exit 1; }; }
++    as_fn_error $? "Please select either ffmpeg or libextractor, but not both." "$LINENO" 5
+     elif ((test "x$FFMPEG_OPTION_REQUESTED" = xyes) && (test "x$LIBEXTRACTOR_OPTION_REQUESTED" = xno)); then
+        LIBEXTRACTOR_STATUS=disabled
+        LIBEXTRACTOR_OPTION_ENABLED=no
+     elif ((test "x$FFMPEG_OPTION_REQUESTED" = xno) && (test "x$LIBEXTRACTOR_OPTION_REQUESTED" = xyes)); then
+        FFMPEG_STATUS=disabled
+        FFMPEG_OPTION_ENABLED=no
+-       { $as_echo "$as_me:$LINENO: WARNING: ffmpeg disabled" >&5
 +       { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ffmpeg disabled" >&5
-+$as_echo "$as_me: WARNING: ffmpeg disabled" >&2;}
-+    fi
-+fi
-+
-+######## ffmpeg
-+
-+if test "x$FFMPEG_OPTION_ENABLED" = xyes; then
-+
-+       ac_ext=c
-+ac_cpp='$CPP $CPPFLAGS'
-+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_c_compiler_gnu
-+
-+
-+    # the header location of the older and newer ffmpeg version is different
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_avformat_header_status=yes
-+
-+
-+# Check whether --with-avformat-h was given.
+ $as_echo "$as_me: WARNING: ffmpeg disabled" >&2;}
+     fi
+ fi
+@@ -31388,10 +16501,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+ # Check whether --with-avformat-h was given.
+-if test "${with_avformat_h+set}" = set; then
 +if test "${with_avformat_h+set}" = set; then :
-+  withval=$with_avformat_h;
-+            mt_avformat_search_headers="$withval"
+   withval=$with_avformat_h;
+             mt_avformat_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for avformat headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for avformat headers in $withval" >&5
-+$as_echo "$as_me: Will search for avformat headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_avformat_search_headers" ; then
-+        unset ac_cv_header_ffmpeg_avformat_h
-+        CFLAGS="$CFLAGS -I${mt_avformat_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_avformat_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_avformat_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_avformat_search_headers/ffmpeg/avformat.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for avformat headers in $withval" >&6;}
+ 
+ 
+@@ -31404,145 +16517,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_avformat_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_avformat_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_avformat_search_headers/ffmpeg/avformat.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_avformat_search_headers/ffmpeg/avformat.h" >&5
+-$as_echo_n "checking for $mt_avformat_search_headers/ffmpeg/avformat.h... " >&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 $mt_avformat_search_headers/ffmpeg/avformat.h usability" >&5
+-$as_echo_n "checking $mt_avformat_search_headers/ffmpeg/avformat.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 <$mt_avformat_search_headers/ffmpeg/avformat.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 $mt_avformat_search_headers/ffmpeg/avformat.h presence" >&5
+-$as_echo_n "checking $mt_avformat_search_headers/ffmpeg/avformat.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 <$mt_avformat_search_headers/ffmpeg/avformat.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
+-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: $mt_avformat_search_headers/ffmpeg/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/ffmpeg/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_avformat_search_headers/ffmpeg/avformat.h" >&5
+-$as_echo_n "checking for $mt_avformat_search_headers/ffmpeg/avformat.h... " >&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
 +ac_fn_c_check_header_mongrel "$LINENO" "$mt_avformat_search_headers/ffmpeg/avformat.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_avformat_cxxflags="-I${mt_avformat_search_headers}"
-+
-+else
-+
-+                mt_avformat_header_status=missing
-+                if test "pass" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_avformat_cxxflags="-I${mt_avformat_search_headers}"
+ 
+@@ -31550,12 +16526,10 @@ else
+ 
+                 mt_avformat_header_status=missing
+                 if test "pass" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: avformat headers not found in requested location $mt_avformat_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: avformat headers not found in requested location $mt_avformat_search_headers" >&5
-+$as_echo "$as_me: avformat headers not found in requested location $mt_avformat_search_headers" >&6;}
-+                else
-+                    as_fn_error "avformat headers not found in requested location $mt_avformat_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_ffmpeg_avformat_h
+ $as_echo "$as_me: avformat headers not found in requested location $mt_avformat_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: avformat headers not found in requested location $mt_avformat_search_headers" >&5
+-$as_echo "$as_me: error: avformat headers not found in requested location $mt_avformat_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "avformat headers not found in requested location $mt_avformat_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -31564,140 +16538,9 @@ fi
+ 
+     else
+         unset ac_cv_header_ffmpeg_avformat_h
+-        if test "${ac_cv_header_ffmpeg_avformat_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for ffmpeg/avformat.h" >&5
+-$as_echo_n "checking for ffmpeg/avformat.h... " >&6; }
+-if test "${ac_cv_header_ffmpeg_avformat_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ffmpeg_avformat_h" >&5
+-$as_echo "$ac_cv_header_ffmpeg_avformat_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking ffmpeg/avformat.h usability" >&5
+-$as_echo_n "checking ffmpeg/avformat.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 <ffmpeg/avformat.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
 +        ac_fn_c_check_header_mongrel "$LINENO" "ffmpeg/avformat.h" "ac_cv_header_ffmpeg_avformat_h" "$ac_includes_default"
 +if test "x$ac_cv_header_ffmpeg_avformat_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_ffmpeg_avformat_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h" | $as_tr_sh`
+ 
+-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 ffmpeg/avformat.h presence" >&5
+-$as_echo_n "checking ffmpeg/avformat.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 <ffmpeg/avformat.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
+-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: ffmpeg/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: ffmpeg/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: ffmpeg/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: ffmpeg/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: ffmpeg/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: ffmpeg/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: ffmpeg/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: ffmpeg/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: ffmpeg/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: ffmpeg/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for ffmpeg/avformat.h" >&5
+-$as_echo_n "checking for ffmpeg/avformat.h... " >&6; }
+-if test "${ac_cv_header_ffmpeg_avformat_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_ffmpeg_avformat_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_ffmpeg_avformat_h" >&5
+-$as_echo "$ac_cv_header_ffmpeg_avformat_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_ffmpeg_avformat_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -31705,145 +16548,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_ffmpeg_avformat_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h... " >&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 $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.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 <$MT_SEARCHPATH_HEADERS/ffmpeg/avformat.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 $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.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 <$MT_SEARCHPATH_HEADERS/ffmpeg/avformat.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
+-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: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h... " >&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
 +ac_fn_c_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/ffmpeg/avformat.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_avformat_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_avformat_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_avformat_header_status" != xyes; then
-+        mt_avformat_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+
-+    AVFORMAT_CFLAGS=${mt_avformat_cxxflags}
-+    AVFORMAT_STATUS=${mt_avformat_header_status}
-+
-+
-+
-+
-+    if test "x$AVFORMAT_STATUS" != xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_avformat_header_status=yes
-+
-+
-+# Check whether --with-avformat-h was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_avformat_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -31892,10 +16598,10 @@ fi
+ 
+ 
+ # Check whether --with-avformat-h was given.
+-if test "${with_avformat_h+set}" = set; then
 +if test "${with_avformat_h+set}" = set; then :
-+  withval=$with_avformat_h;
-+            mt_avformat_search_headers="$withval"
+   withval=$with_avformat_h;
+             mt_avformat_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for avformat headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for avformat headers in $withval" >&5
-+$as_echo "$as_me: Will search for avformat headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_avformat_search_headers" ; then
-+        unset ac_cv_header_libavformat_avformat_h
-+        CFLAGS="$CFLAGS -I${mt_avformat_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_avformat_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_avformat_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_avformat_search_headers/libavformat/avformat.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for avformat headers in $withval" >&6;}
+ 
+ 
+@@ -31908,145 +16614,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_avformat_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_avformat_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_avformat_search_headers/libavformat/avformat.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_avformat_search_headers/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $mt_avformat_search_headers/libavformat/avformat.h... " >&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 $mt_avformat_search_headers/libavformat/avformat.h usability" >&5
+-$as_echo_n "checking $mt_avformat_search_headers/libavformat/avformat.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 <$mt_avformat_search_headers/libavformat/avformat.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 $mt_avformat_search_headers/libavformat/avformat.h presence" >&5
+-$as_echo_n "checking $mt_avformat_search_headers/libavformat/avformat.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 <$mt_avformat_search_headers/libavformat/avformat.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
+-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: $mt_avformat_search_headers/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_avformat_search_headers/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $mt_avformat_search_headers/libavformat/avformat.h... " >&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
 +ac_fn_c_check_header_mongrel "$LINENO" "$mt_avformat_search_headers/libavformat/avformat.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_avformat_cxxflags="-I${mt_avformat_search_headers}"
-+
-+else
-+
-+                mt_avformat_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_avformat_cxxflags="-I${mt_avformat_search_headers}"
+ 
+@@ -32054,12 +16623,10 @@ else
+ 
+                 mt_avformat_header_status=missing
+                 if test "pass" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: avformat headers not found in requested location $mt_avformat_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: avformat headers not found in requested location $mt_avformat_search_headers" >&5
-+$as_echo "$as_me: avformat headers not found in requested location $mt_avformat_search_headers" >&6;}
-+                else
-+                    as_fn_error "avformat headers not found in requested location $mt_avformat_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_libavformat_avformat_h
+ $as_echo "$as_me: avformat headers not found in requested location $mt_avformat_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: avformat headers not found in requested location $mt_avformat_search_headers" >&5
+-$as_echo "$as_me: error: avformat headers not found in requested location $mt_avformat_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "avformat headers not found in requested location $mt_avformat_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -32068,140 +16635,9 @@ fi
+ 
+     else
+         unset ac_cv_header_libavformat_avformat_h
+-        if test "${ac_cv_header_libavformat_avformat_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for libavformat/avformat.h" >&5
+-$as_echo_n "checking for libavformat/avformat.h... " >&6; }
+-if test "${ac_cv_header_libavformat_avformat_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libavformat_avformat_h" >&5
+-$as_echo "$ac_cv_header_libavformat_avformat_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking libavformat/avformat.h usability" >&5
+-$as_echo_n "checking libavformat/avformat.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 <libavformat/avformat.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_fn_c_check_header_mongrel "$LINENO" "libavformat/avformat.h" "ac_cv_header_libavformat_avformat_h" "$ac_includes_default"
 +if test "x$ac_cv_header_libavformat_avformat_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_libavformat_avformat_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/libavformat/avformat.h" | $as_tr_sh`
+ 
+-	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 libavformat/avformat.h presence" >&5
+-$as_echo_n "checking libavformat/avformat.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 <libavformat/avformat.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
+-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: libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for libavformat/avformat.h" >&5
+-$as_echo_n "checking for libavformat/avformat.h... " >&6; }
+-if test "${ac_cv_header_libavformat_avformat_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_libavformat_avformat_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libavformat_avformat_h" >&5
+-$as_echo "$ac_cv_header_libavformat_avformat_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_libavformat_avformat_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -32209,145 +16645,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_libavformat_avformat_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/libavformat/avformat.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h... " >&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 $MT_SEARCHPATH_HEADERS/libavformat/avformat.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libavformat/avformat.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 <$MT_SEARCHPATH_HEADERS/libavformat/avformat.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 $MT_SEARCHPATH_HEADERS/libavformat/avformat.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libavformat/avformat.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 <$MT_SEARCHPATH_HEADERS/libavformat/avformat.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
+-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: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h... " >&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
 +ac_fn_c_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/libavformat/avformat.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_avformat_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_avformat_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_avformat_header_status" != xyes; then
-+        mt_avformat_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+
-+    AVFORMAT_CFLAGS=${mt_avformat_cxxflags}
-+    AVFORMAT_STATUS=${mt_avformat_header_status}
-+
-+
-+
-+
-+        if test "x$AVFORMAT_STATUS" = xyes; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define AVFORMAT_INCLUDE <libavformat/avformat.h>
-+_ACEOF
-+
-+        fi
-+    else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define AVFORMAT_INCLUDE <ffmpeg/avformat.h>
-+_ACEOF
-+
-+    fi
-+
-+    if test "x$AVFORMAT_STATUS" = xyes; then
-+
-+
-+    mt_avformat_arg_default=yes
-+    mt_avformat_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-avformat-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_avformat_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -32404,10 +16703,10 @@ _ACEOF
+ 
+ 
+ # Check whether --with-avformat-h was given.
+-if test "${with_avformat_h+set}" = set; then
++if test "${with_avformat_h+set}" = set; then :
+   withval=$with_avformat_h;
+             mt_avformat_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for avformat headers in $withval" >&5
++            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for avformat headers in $withval" >&5
+ $as_echo "$as_me: Will search for avformat headers in $withval" >&6;}
+ 
+ 
+@@ -32420,145 +16719,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_avformat_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_avformat_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_avformat_search_headers/libavformat/avformat.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_avformat_search_headers/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $mt_avformat_search_headers/libavformat/avformat.h... " >&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 $mt_avformat_search_headers/libavformat/avformat.h usability" >&5
+-$as_echo_n "checking $mt_avformat_search_headers/libavformat/avformat.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 <$mt_avformat_search_headers/libavformat/avformat.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 $mt_avformat_search_headers/libavformat/avformat.h presence" >&5
+-$as_echo_n "checking $mt_avformat_search_headers/libavformat/avformat.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 <$mt_avformat_search_headers/libavformat/avformat.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
+-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: $mt_avformat_search_headers/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_avformat_search_headers/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $mt_avformat_search_headers/libavformat/avformat.h... " >&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
++ac_fn_c_check_header_mongrel "$LINENO" "$mt_avformat_search_headers/libavformat/avformat.h" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_avformat_cxxflags="-I${mt_avformat_search_headers}"
+ 
+@@ -32566,12 +16728,10 @@ else
+ 
+                 mt_avformat_header_status=missing
+                 if test "pass" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: avformat headers not found in requested location $mt_avformat_search_headers" >&5
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: avformat headers not found in requested location $mt_avformat_search_headers" >&5
+ $as_echo "$as_me: avformat headers not found in requested location $mt_avformat_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: avformat headers not found in requested location $mt_avformat_search_headers" >&5
+-$as_echo "$as_me: error: avformat headers not found in requested location $mt_avformat_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "avformat headers not found in requested location $mt_avformat_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -32580,140 +16740,9 @@ fi
+ 
+     else
+         unset ac_cv_header_libavformat_avformat_h
+-        if test "${ac_cv_header_libavformat_avformat_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for libavformat/avformat.h" >&5
+-$as_echo_n "checking for libavformat/avformat.h... " >&6; }
+-if test "${ac_cv_header_libavformat_avformat_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libavformat_avformat_h" >&5
+-$as_echo "$ac_cv_header_libavformat_avformat_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking libavformat/avformat.h usability" >&5
+-$as_echo_n "checking libavformat/avformat.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 <libavformat/avformat.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; }
++        ac_fn_c_check_header_mongrel "$LINENO" "libavformat/avformat.h" "ac_cv_header_libavformat_avformat_h" "$ac_includes_default"
++if test "x$ac_cv_header_libavformat_avformat_h" = x""yes; then :
+ 
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking libavformat/avformat.h presence" >&5
+-$as_echo_n "checking libavformat/avformat.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 <libavformat/avformat.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
+-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: libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for libavformat/avformat.h" >&5
+-$as_echo_n "checking for libavformat/avformat.h... " >&6; }
+-if test "${ac_cv_header_libavformat_avformat_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_libavformat_avformat_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libavformat_avformat_h" >&5
+-$as_echo "$ac_cv_header_libavformat_avformat_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_libavformat_avformat_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -32721,145 +16750,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_libavformat_avformat_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/libavformat/avformat.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h... " >&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 $MT_SEARCHPATH_HEADERS/libavformat/avformat.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libavformat/avformat.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 <$MT_SEARCHPATH_HEADERS/libavformat/avformat.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 $MT_SEARCHPATH_HEADERS/libavformat/avformat.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libavformat/avformat.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 <$MT_SEARCHPATH_HEADERS/libavformat/avformat.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
+-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: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h... " >&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
++ac_fn_c_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/libavformat/avformat.h" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_avformat_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -32919,10 +16811,10 @@ _ACEOF
+ 
+ 
+ # Check whether --with-avformat-h was given.
+-if test "${with_avformat_h+set}" = set; then
++if test "${with_avformat_h+set}" = set; then :
+   withval=$with_avformat_h;
+             mt_avformat_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for avformat headers in $withval" >&5
++            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for avformat headers in $withval" >&5
+ $as_echo "$as_me: Will search for avformat headers in $withval" >&6;}
+ 
+ 
+@@ -32935,145 +16827,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_avformat_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_avformat_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_avformat_search_headers/libavformat/avformat.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_avformat_search_headers/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $mt_avformat_search_headers/libavformat/avformat.h... " >&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 $mt_avformat_search_headers/libavformat/avformat.h usability" >&5
+-$as_echo_n "checking $mt_avformat_search_headers/libavformat/avformat.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 <$mt_avformat_search_headers/libavformat/avformat.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 $mt_avformat_search_headers/libavformat/avformat.h presence" >&5
+-$as_echo_n "checking $mt_avformat_search_headers/libavformat/avformat.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 <$mt_avformat_search_headers/libavformat/avformat.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
+-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: $mt_avformat_search_headers/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_avformat_search_headers/libavformat/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_avformat_search_headers/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $mt_avformat_search_headers/libavformat/avformat.h... " >&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
++ac_fn_c_check_header_mongrel "$LINENO" "$mt_avformat_search_headers/libavformat/avformat.h" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_avformat_cxxflags="-I${mt_avformat_search_headers}"
+ 
+@@ -33081,12 +16836,10 @@ else
+ 
+                 mt_avformat_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: avformat headers not found in requested location $mt_avformat_search_headers" >&5
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: avformat headers not found in requested location $mt_avformat_search_headers" >&5
+ $as_echo "$as_me: avformat headers not found in requested location $mt_avformat_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: avformat headers not found in requested location $mt_avformat_search_headers" >&5
+-$as_echo "$as_me: error: avformat headers not found in requested location $mt_avformat_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "avformat headers not found in requested location $mt_avformat_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -33095,140 +16848,9 @@ fi
+ 
+     else
+         unset ac_cv_header_libavformat_avformat_h
+-        if test "${ac_cv_header_libavformat_avformat_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for libavformat/avformat.h" >&5
+-$as_echo_n "checking for libavformat/avformat.h... " >&6; }
+-if test "${ac_cv_header_libavformat_avformat_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libavformat_avformat_h" >&5
+-$as_echo "$ac_cv_header_libavformat_avformat_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking libavformat/avformat.h usability" >&5
+-$as_echo_n "checking libavformat/avformat.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 <libavformat/avformat.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 libavformat/avformat.h presence" >&5
+-$as_echo_n "checking libavformat/avformat.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 <libavformat/avformat.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
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
++        ac_fn_c_check_header_mongrel "$LINENO" "libavformat/avformat.h" "ac_cv_header_libavformat_avformat_h" "$ac_includes_default"
++if test "x$ac_cv_header_libavformat_avformat_h" = x""yes; then :
+ 
+-  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: libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libavformat/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: libavformat/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for libavformat/avformat.h" >&5
+-$as_echo_n "checking for libavformat/avformat.h... " >&6; }
+-if test "${ac_cv_header_libavformat_avformat_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_libavformat_avformat_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libavformat_avformat_h" >&5
+-$as_echo "$ac_cv_header_libavformat_avformat_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_libavformat_avformat_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -33236,145 +16858,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_libavformat_avformat_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/libavformat/avformat.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h... " >&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 $MT_SEARCHPATH_HEADERS/libavformat/avformat.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libavformat/avformat.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 <$MT_SEARCHPATH_HEADERS/libavformat/avformat.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 $MT_SEARCHPATH_HEADERS/libavformat/avformat.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libavformat/avformat.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 <$MT_SEARCHPATH_HEADERS/libavformat/avformat.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
+-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: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libavformat/avformat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libavformat/avformat.h... " >&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
++ac_fn_c_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/libavformat/avformat.h" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_avformat_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -33442,10 +16927,10 @@ _ACEOF
+ 
+ 
+ # Check whether --with-avformat-libs was given.
+-if test "${with_avformat_libs+set}" = set; then
 +if test "${with_avformat_libs+set}" = set; then :
-+  withval=$with_avformat_libs;
-+            mt_avformat_search_libs="$withval"
+   withval=$with_avformat_libs;
+             mt_avformat_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for avformat libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for avformat libs in $withval" >&5
-+$as_echo "$as_me: Will search for avformat libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_avformat_search_libs" ; then
-+        unset ac_cv_lib_avformat_av_register_all
-+        LDFLAGS="$LDFLAGS -L$mt_avformat_search_libs"
+ $as_echo "$as_me: Will search for avformat libs in $withval" >&6;}
+ 
+ 
+@@ -33455,18 +16940,14 @@ fi
+     if test "$mt_avformat_search_libs" ; then
+         unset ac_cv_lib_avformat_av_register_all
+         LDFLAGS="$LDFLAGS -L$mt_avformat_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for av_register_all in -lavformat" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_register_all in -lavformat" >&5
-+$as_echo_n "checking for av_register_all in -lavformat... " >&6; }
+ $as_echo_n "checking for av_register_all in -lavformat... " >&6; }
+-if test "${ac_cv_lib_avformat_av_register_all+set}" = set; then
 +if test "${ac_cv_lib_avformat_av_register_all+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lavformat  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lavformat  $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.
-+   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 av_register_all ();
-+int
-+main ()
-+{
-+return av_register_all ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -33484,43 +16965,18 @@ return av_register_all ();
+   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_avformat_av_register_all=yes
-+else
+   ac_cv_lib_avformat_av_register_all=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_avformat_av_register_all=no
 +  ac_cv_lib_avformat_av_register_all=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_avformat_av_register_all" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_register_all" >&5
-+$as_echo "$ac_cv_lib_avformat_av_register_all" >&6; }
+ $as_echo "$ac_cv_lib_avformat_av_register_all" >&6; }
+-if test "x$ac_cv_lib_avformat_av_register_all" = x""yes; then
 +if test "x$ac_cv_lib_avformat_av_register_all" = x""yes; then :
-+
-+                mt_avformat_libs="-lavformat"
-+                mt_avformat_ldflags="-L$mt_avformat_search_libs"
-+
-+else
-+
-+                mt_avformat_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_avformat_libs="-lavformat"
+                 mt_avformat_ldflags="-L$mt_avformat_search_libs"
+@@ -33529,12 +16985,10 @@ else
+ 
+                 mt_avformat_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: avformat library not found in requested location $mt_avformat_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: avformat library not found in requested location $mt_avformat_search_libs" >&5
-+$as_echo "$as_me: avformat library not found in requested location $mt_avformat_search_libs" >&6;}
-+                else
-+                    as_fn_error "avformat library not found in requested location $mt_avformat_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_avformat_av_register_all
+ $as_echo "$as_me: avformat library not found in requested location $mt_avformat_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: avformat library not found in requested location $mt_avformat_search_libs" >&5
+-$as_echo "$as_me: error: avformat library not found in requested location $mt_avformat_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "avformat library not found in requested location $mt_avformat_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -33542,18 +16996,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_avformat_av_register_all
+-        { $as_echo "$as_me:$LINENO: checking for av_register_all in -lavformat" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_register_all in -lavformat" >&5
-+$as_echo_n "checking for av_register_all in -lavformat... " >&6; }
+ $as_echo_n "checking for av_register_all in -lavformat... " >&6; }
+-if test "${ac_cv_lib_avformat_av_register_all+set}" = set; then
 +if test "${ac_cv_lib_avformat_av_register_all+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lavformat  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lavformat  $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.
-+   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 av_register_all ();
-+int
-+main ()
-+{
-+return av_register_all ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -33571,43 +17021,18 @@ return av_register_all ();
+   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_avformat_av_register_all=yes
-+else
+   ac_cv_lib_avformat_av_register_all=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_avformat_av_register_all=no
 +  ac_cv_lib_avformat_av_register_all=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_avformat_av_register_all" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_register_all" >&5
-+$as_echo "$ac_cv_lib_avformat_av_register_all" >&6; }
+ $as_echo "$ac_cv_lib_avformat_av_register_all" >&6; }
+-if test "x$ac_cv_lib_avformat_av_register_all" = x""yes; then
 +if test "x$ac_cv_lib_avformat_av_register_all" = x""yes; then :
-+
-+                mt_avformat_libs="-lavformat"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_avformat_av_register_all
+ 
+                 mt_avformat_libs="-lavformat"
+ 
+@@ -33615,18 +17040,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_avformat_av_register_all
+-                { $as_echo "$as_me:$LINENO: checking for av_register_all in -lavformat" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_register_all in -lavformat" >&5
-+$as_echo_n "checking for av_register_all in -lavformat... " >&6; }
+ $as_echo_n "checking for av_register_all in -lavformat... " >&6; }
+-if test "${ac_cv_lib_avformat_av_register_all+set}" = set; then
 +if test "${ac_cv_lib_avformat_av_register_all+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lavformat  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lavformat  $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.
-+   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 av_register_all ();
-+int
-+main ()
-+{
-+return av_register_all ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -33644,43 +17065,18 @@ return av_register_all ();
+   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_avformat_av_register_all=yes
-+else
+   ac_cv_lib_avformat_av_register_all=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_avformat_av_register_all=no
 +  ac_cv_lib_avformat_av_register_all=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_avformat_av_register_all" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_register_all" >&5
-+$as_echo "$ac_cv_lib_avformat_av_register_all" >&6; }
+ $as_echo "$ac_cv_lib_avformat_av_register_all" >&6; }
+-if test "x$ac_cv_lib_avformat_av_register_all" = x""yes; then
 +if test "x$ac_cv_lib_avformat_av_register_all" = x""yes; then :
-+
-+                        mt_avformat_libs="-lavformat"
-+                        mt_avformat_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_avformat_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_avformat_library_status" != xyes; then
-+        mt_avformat_libs=""
-+        mt_avformat_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+
-+    AVFORMAT_LIBS=${mt_avformat_libs}
-+    AVFORMAT_LDFLAGS=${mt_avformat_ldflags}
-+    AVFORMAT_STATUS=${mt_avformat_library_status}
-+
-+
-+
-+
-+
-+
-+
-+    mt_avutil_arg_default=yes
-+    mt_avutil_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-avutil-libs was given.
+ 
+                         mt_avformat_libs="-lavformat"
+                         mt_avformat_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -33731,10 +17127,10 @@ fi
+ 
+ 
+ # Check whether --with-avutil-libs was given.
+-if test "${with_avutil_libs+set}" = set; then
 +if test "${with_avutil_libs+set}" = set; then :
-+  withval=$with_avutil_libs;
-+            mt_avutil_search_libs="$withval"
+   withval=$with_avutil_libs;
+             mt_avutil_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for avutil libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for avutil libs in $withval" >&5
-+$as_echo "$as_me: Will search for avutil libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_avutil_search_libs" ; then
-+        unset ac_cv_lib_avutil_av_log_set_callback
-+        LDFLAGS="$LDFLAGS -L$mt_avutil_search_libs"
+ $as_echo "$as_me: Will search for avutil libs in $withval" >&6;}
+ 
+ 
+@@ -33744,18 +17140,14 @@ fi
+     if test "$mt_avutil_search_libs" ; then
+         unset ac_cv_lib_avutil_av_log_set_callback
+         LDFLAGS="$LDFLAGS -L$mt_avutil_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for av_log_set_callback in -lavutil" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_log_set_callback in -lavutil" >&5
-+$as_echo_n "checking for av_log_set_callback in -lavutil... " >&6; }
+ $as_echo_n "checking for av_log_set_callback in -lavutil... " >&6; }
+-if test "${ac_cv_lib_avutil_av_log_set_callback+set}" = set; then
 +if test "${ac_cv_lib_avutil_av_log_set_callback+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lavutil  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lavutil  $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.
-+   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 av_log_set_callback ();
-+int
-+main ()
-+{
-+return av_log_set_callback ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -33773,43 +17165,18 @@ return av_log_set_callback ();
+   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_avutil_av_log_set_callback=yes
-+else
+   ac_cv_lib_avutil_av_log_set_callback=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_avutil_av_log_set_callback=no
 +  ac_cv_lib_avutil_av_log_set_callback=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_avutil_av_log_set_callback" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_log_set_callback" >&5
-+$as_echo "$ac_cv_lib_avutil_av_log_set_callback" >&6; }
+ $as_echo "$ac_cv_lib_avutil_av_log_set_callback" >&6; }
+-if test "x$ac_cv_lib_avutil_av_log_set_callback" = x""yes; then
 +if test "x$ac_cv_lib_avutil_av_log_set_callback" = x""yes; then :
-+
-+                mt_avutil_libs="-lavutil"
-+                mt_avutil_ldflags="-L$mt_avutil_search_libs"
-+
-+else
-+
-+                mt_avutil_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_avutil_libs="-lavutil"
+                 mt_avutil_ldflags="-L$mt_avutil_search_libs"
+@@ -33818,12 +17185,10 @@ else
+ 
+                 mt_avutil_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: avutil library not found in requested location $mt_avutil_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: avutil library not found in requested location $mt_avutil_search_libs" >&5
-+$as_echo "$as_me: avutil library not found in requested location $mt_avutil_search_libs" >&6;}
-+                else
-+                    as_fn_error "avutil library not found in requested location $mt_avutil_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_avutil_av_log_set_callback
+ $as_echo "$as_me: avutil library not found in requested location $mt_avutil_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: avutil library not found in requested location $mt_avutil_search_libs" >&5
+-$as_echo "$as_me: error: avutil library not found in requested location $mt_avutil_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "avutil library not found in requested location $mt_avutil_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -33831,18 +17196,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_avutil_av_log_set_callback
+-        { $as_echo "$as_me:$LINENO: checking for av_log_set_callback in -lavutil" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_log_set_callback in -lavutil" >&5
-+$as_echo_n "checking for av_log_set_callback in -lavutil... " >&6; }
+ $as_echo_n "checking for av_log_set_callback in -lavutil... " >&6; }
+-if test "${ac_cv_lib_avutil_av_log_set_callback+set}" = set; then
 +if test "${ac_cv_lib_avutil_av_log_set_callback+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lavutil  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lavutil  $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.
-+   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 av_log_set_callback ();
-+int
-+main ()
-+{
-+return av_log_set_callback ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -33860,43 +17221,18 @@ return av_log_set_callback ();
+   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_avutil_av_log_set_callback=yes
-+else
+   ac_cv_lib_avutil_av_log_set_callback=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_avutil_av_log_set_callback=no
 +  ac_cv_lib_avutil_av_log_set_callback=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_avutil_av_log_set_callback" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_log_set_callback" >&5
-+$as_echo "$ac_cv_lib_avutil_av_log_set_callback" >&6; }
+ $as_echo "$ac_cv_lib_avutil_av_log_set_callback" >&6; }
+-if test "x$ac_cv_lib_avutil_av_log_set_callback" = x""yes; then
 +if test "x$ac_cv_lib_avutil_av_log_set_callback" = x""yes; then :
-+
-+                mt_avutil_libs="-lavutil"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_avutil_av_log_set_callback
+ 
+                 mt_avutil_libs="-lavutil"
+ 
+@@ -33904,18 +17240,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_avutil_av_log_set_callback
+-                { $as_echo "$as_me:$LINENO: checking for av_log_set_callback in -lavutil" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_log_set_callback in -lavutil" >&5
-+$as_echo_n "checking for av_log_set_callback in -lavutil... " >&6; }
+ $as_echo_n "checking for av_log_set_callback in -lavutil... " >&6; }
+-if test "${ac_cv_lib_avutil_av_log_set_callback+set}" = set; then
 +if test "${ac_cv_lib_avutil_av_log_set_callback+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lavutil  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lavutil  $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.
-+   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 av_log_set_callback ();
-+int
-+main ()
-+{
-+return av_log_set_callback ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -33933,43 +17265,18 @@ return av_log_set_callback ();
+   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_avutil_av_log_set_callback=yes
-+else
+   ac_cv_lib_avutil_av_log_set_callback=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_avutil_av_log_set_callback=no
 +  ac_cv_lib_avutil_av_log_set_callback=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_avutil_av_log_set_callback" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_log_set_callback" >&5
-+$as_echo "$ac_cv_lib_avutil_av_log_set_callback" >&6; }
+ $as_echo "$ac_cv_lib_avutil_av_log_set_callback" >&6; }
+-if test "x$ac_cv_lib_avutil_av_log_set_callback" = x""yes; then
 +if test "x$ac_cv_lib_avutil_av_log_set_callback" = x""yes; then :
-+
-+                        mt_avutil_libs="-lavutil"
-+                        mt_avutil_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_avutil_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_avutil_library_status" != xyes; then
-+        mt_avutil_libs=""
-+        mt_avutil_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+
-+    AVUTIL_LIBS=${mt_avutil_libs}
-+    AVUTIL_LDFLAGS=${mt_avutil_ldflags}
-+    AVUTIL_STATUS=${mt_avutil_library_status}
-+
-+
-+
-+
-+
-+    fi
-+    ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+
-+    if ((test "x$AVFORMAT_STATUS" = xyes) && (test "x$AVUTIL_STATUS" = xyes)); then
-+        FFMPEG_STATUS=yes
-+    else
-+        FFMPEG_STATUS=missing
-+    fi
-+fi
-+
-+if test "x$FFMPEG_STATUS" = xyes; then
-+
+ 
+                         mt_avutil_libs="-lavutil"
+                         mt_avutil_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -34024,9 +17331,7 @@ fi
+ 
+ if test "x$FFMPEG_STATUS" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FFMPEG 1
+-_ACEOF
 +$as_echo "#define HAVE_FFMPEG 1" >>confdefs.h
-+
-+    FFMPEG_CFLAGS="$AVFORMAT_CFLAGS $AVUTIL_CFLAGS"
-+    FFMPEG_LDFLAGS="$AVFORMAT_LDFLAGS $AVUTIL_LDFLAGS"
-+    FFMPEG_LIBS="$AVFORMAT_LIBS $AVUTIL_LIBS"
-+
-+
-+
-+else
-+    if test "x$FFMPEG_OPTION_REQUESTED" = xyes; then
-+        as_fn_error "unable to configure ffmpeg support" "$LINENO" 5
-+    fi
-+fi
-+
-+
-+    mt_ffmpegthumbnailer_status=yes
-+
-+
-+
-+    mt_ffmpegthumbnailer_option_enabled=
-+    mt_ffmpegthumbnailer_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_ffmpegthumbnailer_option_enabled=yes
-+    else
-+        mt_ffmpegthumbnailer_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-ffmpegthumbnailer was given.
+ 
+     FFMPEG_CFLAGS="$FFMPEG_EXTRA_CFLAGS $AVFORMAT_CFLAGS $AVUTIL_CFLAGS"
+     FFMPEG_LDFLAGS="$AVFORMAT_LDFLAGS $AVUTIL_LDFLAGS"
+@@ -34041,9 +17346,7 @@ else
+ 
+     if (test "x$FFMPEG_OPTION_REQUESTED" = xyes) &&
+        (test "x$FFMPEG_OPTION_ENABLED" = xyes); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure ffmpeg support" >&5
+-$as_echo "$as_me: error: unable to configure ffmpeg support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure ffmpeg support" "$LINENO" 5
+     fi
+ fi
+ 
+@@ -34063,7 +17366,7 @@ FFMPEGTHUMBNAILER_USES_OLD_API=
+     fi
+ 
+     # Check whether --enable-ffmpegthumbnailer was given.
+-if test "${enable_ffmpegthumbnailer+set}" = set; then
 +if test "${enable_ffmpegthumbnailer+set}" = set; then :
-+  enableval=$enable_ffmpegthumbnailer;
-+            mt_ffmpegthumbnailer_option_enabled=$enableval
-+            mt_ffmpegthumbnailer_option_requested=yes
-+
-+
-+fi
-+
-+
-+    FFMPEGTHUMBNAILER_OPTION_ENABLED=${mt_ffmpegthumbnailer_option_enabled}
-+    FFMPEGTHUMBNAILER_OPTION_REQUESTED=${mt_ffmpegthumbnailer_option_requested}
-+
-+
-+
-+
+   enableval=$enable_ffmpegthumbnailer;
+             mt_ffmpegthumbnailer_option_enabled=$enableval
+             mt_ffmpegthumbnailer_option_requested=yes
+@@ -34078,7 +17381,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_ffmpegthumbnailer_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+    if test "x${FFMPEGTHUMBNAILER_OPTION_ENABLED}" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_ffmpegthumbnailer_header_status=yes
-+
-+
-+# Check whether --with-ffmpegthumbnailer-h was given.
+ 
+     if test "x${FFMPEGTHUMBNAILER_OPTION_ENABLED}" = xyes; then
+ 
+@@ -34093,10 +17398,10 @@ fi
+ 
+ 
+ # Check whether --with-ffmpegthumbnailer-h was given.
+-if test "${with_ffmpegthumbnailer_h+set}" = set; then
 +if test "${with_ffmpegthumbnailer_h+set}" = set; then :
-+  withval=$with_ffmpegthumbnailer_h;
-+            mt_ffmpegthumbnailer_search_headers="$withval"
+   withval=$with_ffmpegthumbnailer_h;
+             mt_ffmpegthumbnailer_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for ffmpegthumbnailer headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for ffmpegthumbnailer headers in $withval" >&5
-+$as_echo "$as_me: Will search for ffmpegthumbnailer headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_ffmpegthumbnailer_search_headers" ; then
-+        unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
-+        CFLAGS="$CFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for ffmpegthumbnailer headers in $withval" >&6;}
+ 
+ 
+@@ -34109,145 +17414,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h... " >&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 $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h usability" >&5
+-$as_echo_n "checking $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.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 <$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.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_cxx_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 $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h presence" >&5
+-$as_echo_n "checking $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.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 <$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_ffmpegthumbnailer_cxxflags="-I${mt_ffmpegthumbnailer_search_headers}"
-+
-+else
-+
-+                mt_ffmpegthumbnailer_header_status=missing
-+                if test "pass" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_ffmpegthumbnailer_cxxflags="-I${mt_ffmpegthumbnailer_search_headers}"
+ 
+@@ -34255,12 +17423,10 @@ else
+ 
+                 mt_ffmpegthumbnailer_header_status=missing
+                 if test "pass" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&5
-+$as_echo "$as_me: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&6;}
-+                else
-+                    as_fn_error "ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
+ $as_echo "$as_me: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&5
+-$as_echo "$as_me: error: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -34269,140 +17435,9 @@ fi
+ 
+     else
+         unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
+-        if test "${ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for libffmpegthumbnailer/videothumbnailerc.h... " >&6; }
+-if test "${ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" >&5
+-$as_echo "$ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking libffmpegthumbnailer/videothumbnailerc.h usability" >&5
+-$as_echo_n "checking libffmpegthumbnailer/videothumbnailerc.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 <libffmpegthumbnailer/videothumbnailerc.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_cxx_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 libffmpegthumbnailer/videothumbnailerc.h presence" >&5
+-$as_echo_n "checking libffmpegthumbnailer/videothumbnailerc.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 <libffmpegthumbnailer/videothumbnailerc.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_cxx_preproc_warn_flag$ac_cxx_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
 +        ac_fn_cxx_check_header_mongrel "$LINENO" "libffmpegthumbnailer/videothumbnailerc.h" "ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" "$ac_includes_default"
 +if test "x$ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" | $as_tr_sh`
+ 
+-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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for libffmpegthumbnailer/videothumbnailerc.h... " >&6; }
+-if test "${ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" >&5
+-$as_echo "$ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -34410,145 +17445,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h... " >&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 $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.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 <$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.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_cxx_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 $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.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 <$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_ffmpegthumbnailer_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_ffmpegthumbnailer_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_ffmpegthumbnailer_header_status" != xyes; then
-+        mt_ffmpegthumbnailer_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_ffmpegthumbnailer_package_status=${mt_ffmpegthumbnailer_header_status}
-+
-+    if test "x$mt_ffmpegthumbnailer_package_status" = xyes; then
-+
-+    mt_ffmpegthumbnailer_arg_default=yes
-+    mt_ffmpegthumbnailer_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-ffmpegthumbnailer-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_ffmpegthumbnailer_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -34592,10 +17490,10 @@ fi
+ 
+ 
+ # Check whether --with-ffmpegthumbnailer-libs was given.
+-if test "${with_ffmpegthumbnailer_libs+set}" = set; then
 +if test "${with_ffmpegthumbnailer_libs+set}" = set; then :
-+  withval=$with_ffmpegthumbnailer_libs;
-+            mt_ffmpegthumbnailer_search_libs="$withval"
+   withval=$with_ffmpegthumbnailer_libs;
+             mt_ffmpegthumbnailer_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for ffmpegthumbnailer libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for ffmpegthumbnailer libs in $withval" >&5
-+$as_echo "$as_me: Will search for ffmpegthumbnailer libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_ffmpegthumbnailer_search_libs" ; then
-+        unset ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create
-+        LDFLAGS="$LDFLAGS -L$mt_ffmpegthumbnailer_search_libs"
+ $as_echo "$as_me: Will search for ffmpegthumbnailer libs in $withval" >&6;}
+ 
+ 
+@@ -34605,18 +17503,14 @@ fi
+     if test "$mt_ffmpegthumbnailer_search_libs" ; then
+         unset ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create
+         LDFLAGS="$LDFLAGS -L$mt_ffmpegthumbnailer_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for video_thumbnailer_create in -lffmpegthumbnailer" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for video_thumbnailer_create in -lffmpegthumbnailer" >&5
-+$as_echo_n "checking for video_thumbnailer_create in -lffmpegthumbnailer... " >&6; }
+ $as_echo_n "checking for video_thumbnailer_create in -lffmpegthumbnailer... " >&6; }
+-if test "${ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create+set}" = set; then
 +if test "${ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lffmpegthumbnailer  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lffmpegthumbnailer  $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.
-+   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 video_thumbnailer_create ();
-+int
-+main ()
-+{
-+return video_thumbnailer_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -34634,43 +17528,18 @@ return video_thumbnailer_create ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=yes
-+else
+   ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=no
 +  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&5
-+$as_echo "$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&6; }
+ $as_echo "$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&6; }
+-if test "x$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" = x""yes; then
 +if test "x$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" = x""yes; then :
-+
-+                mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
-+                mt_ffmpegthumbnailer_ldflags="-L$mt_ffmpegthumbnailer_search_libs"
-+
-+else
-+
-+                mt_ffmpegthumbnailer_library_status=missing
-+                if test "pass" = "pass"; then
+ 
+                 mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
+                 mt_ffmpegthumbnailer_ldflags="-L$mt_ffmpegthumbnailer_search_libs"
+@@ -34679,12 +17548,10 @@ else
+ 
+                 mt_ffmpegthumbnailer_library_status=missing
+                 if test "pass" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&5
-+$as_echo "$as_me: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&6;}
-+                else
-+                    as_fn_error "ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create
+ $as_echo "$as_me: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&5
+-$as_echo "$as_me: error: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -34692,18 +17559,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create
+-        { $as_echo "$as_me:$LINENO: checking for video_thumbnailer_create in -lffmpegthumbnailer" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for video_thumbnailer_create in -lffmpegthumbnailer" >&5
-+$as_echo_n "checking for video_thumbnailer_create in -lffmpegthumbnailer... " >&6; }
+ $as_echo_n "checking for video_thumbnailer_create in -lffmpegthumbnailer... " >&6; }
+-if test "${ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create+set}" = set; then
 +if test "${ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lffmpegthumbnailer  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lffmpegthumbnailer  $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.
-+   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 video_thumbnailer_create ();
-+int
-+main ()
-+{
-+return video_thumbnailer_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -34721,43 +17584,18 @@ return video_thumbnailer_create ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=yes
-+else
+   ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=no
 +  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&5
-+$as_echo "$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&6; }
+ $as_echo "$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&6; }
+-if test "x$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" = x""yes; then
 +if test "x$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" = x""yes; then :
-+
-+                mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create
+ 
+                 mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
+ 
+@@ -34765,18 +17603,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create
+-                { $as_echo "$as_me:$LINENO: checking for video_thumbnailer_create in -lffmpegthumbnailer" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for video_thumbnailer_create in -lffmpegthumbnailer" >&5
-+$as_echo_n "checking for video_thumbnailer_create in -lffmpegthumbnailer... " >&6; }
+ $as_echo_n "checking for video_thumbnailer_create in -lffmpegthumbnailer... " >&6; }
+-if test "${ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create+set}" = set; then
 +if test "${ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lffmpegthumbnailer  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lffmpegthumbnailer  $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.
-+   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 video_thumbnailer_create ();
-+int
-+main ()
-+{
-+return video_thumbnailer_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -34794,43 +17628,18 @@ return video_thumbnailer_create ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=yes
-+else
+   ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=no
 +  ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&5
-+$as_echo "$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&6; }
+ $as_echo "$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" >&6; }
+-if test "x$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" = x""yes; then
 +if test "x$ac_cv_lib_ffmpegthumbnailer_video_thumbnailer_create" = x""yes; then :
-+
-+                        mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
-+                        mt_ffmpegthumbnailer_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_ffmpegthumbnailer_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_ffmpegthumbnailer_library_status" != xyes; then
-+        mt_ffmpegthumbnailer_libs=""
-+        mt_ffmpegthumbnailer_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_ffmpegthumbnailer_package_status=${mt_ffmpegthumbnailer_library_status}
-+    fi
-+
-+    if test "x$mt_ffmpegthumbnailer_package_status" = xyes; then
-+        FFMPEGTHUMBNAILER_CFLAGS=${mt_ffmpegthumbnailer_cxxflags}
-+        FFMPEGTHUMBNAILER_LIBS=${mt_ffmpegthumbnailer_libs}
-+        FFMPEGTHUMBNAILER_LDFLAGS=${mt_ffmpegthumbnailer_ldflags}
-+    fi
-+
-+        mt_ffmpegthumbnailer_status=${mt_ffmpegthumbnailer_package_status}
-+    else
-+        mt_ffmpegthumbnailer_status=disabled
-+    fi
-+
-+    if ((test "x${FFMPEGTHUMBNAILER_OPTION_ENABLED}" = xyes) &&
-+        (test "x${FFMPEGTHUMBNAILER_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_ffmpegthumbnailer_status" != xyes) && (test "pass" != "pass")); then
-+        as_fn_error "unable to configure ffmpegthumbnailer support" "$LINENO" 5
-+    fi
-+
-+    if test "x$mt_ffmpegthumbnailer_status" = xyes; then
-+
+ 
+                         mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
+                         mt_ffmpegthumbnailer_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -34876,16 +17685,12 @@ fi
+     if ((test "x${FFMPEGTHUMBNAILER_OPTION_ENABLED}" = xyes) &&
+         (test "x${FFMPEGTHUMBNAILER_OPTION_REQUESTED}" = xyes) &&
+         (test "x$mt_ffmpegthumbnailer_status" != xyes) && (test "pass" != "pass")); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure ffmpegthumbnailer support" >&5
+-$as_echo "$as_me: error: unable to configure ffmpegthumbnailer support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure ffmpegthumbnailer support" "$LINENO" 5
+     fi
+ 
+     if test "x$mt_ffmpegthumbnailer_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FFMPEGTHUMBNAILER 1
+-_ACEOF
 +$as_echo "#define HAVE_FFMPEGTHUMBNAILER 1" >>confdefs.h
-+
-+    fi
-+
-+    FFMPEGTHUMBNAILER_STATUS=${mt_ffmpegthumbnailer_status}
-+
-+
-+
-+
-+
-+
-+
-+if (test "x$FFMPEGTHUMBNAILER_STATUS" != xyes); then
-+
-+    mt_ffmpegthumbnailer_status=yes
-+
-+
-+
-+    mt_ffmpegthumbnailer_option_enabled=
-+    mt_ffmpegthumbnailer_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_ffmpegthumbnailer_option_enabled=yes
-+    else
-+        mt_ffmpegthumbnailer_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-ffmpegthumbnailer was given.
+ 
+     fi
+ 
+@@ -34912,7 +17717,7 @@ if (test "x$FFMPEGTHUMBNAILER_STATUS" != xyes); then
+     fi
+ 
+     # Check whether --enable-ffmpegthumbnailer was given.
+-if test "${enable_ffmpegthumbnailer+set}" = set; then
 +if test "${enable_ffmpegthumbnailer+set}" = set; then :
-+  enableval=$enable_ffmpegthumbnailer;
-+            mt_ffmpegthumbnailer_option_enabled=$enableval
-+            mt_ffmpegthumbnailer_option_requested=yes
-+
-+
-+fi
-+
-+
-+    FFMPEGTHUMBNAILER_OPTION_ENABLED=${mt_ffmpegthumbnailer_option_enabled}
-+    FFMPEGTHUMBNAILER_OPTION_REQUESTED=${mt_ffmpegthumbnailer_option_requested}
-+
-+
-+
-+
+   enableval=$enable_ffmpegthumbnailer;
+             mt_ffmpegthumbnailer_option_enabled=$enableval
+             mt_ffmpegthumbnailer_option_requested=yes
+@@ -34927,7 +17732,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_ffmpegthumbnailer_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+    if test "x${FFMPEGTHUMBNAILER_OPTION_ENABLED}" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_ffmpegthumbnailer_header_status=yes
-+
-+
-+# Check whether --with-ffmpegthumbnailer-h was given.
+ 
+     if test "x${FFMPEGTHUMBNAILER_OPTION_ENABLED}" = xyes; then
+ 
+@@ -34942,10 +17749,10 @@ fi
+ 
+ 
+ # Check whether --with-ffmpegthumbnailer-h was given.
+-if test "${with_ffmpegthumbnailer_h+set}" = set; then
 +if test "${with_ffmpegthumbnailer_h+set}" = set; then :
-+  withval=$with_ffmpegthumbnailer_h;
-+            mt_ffmpegthumbnailer_search_headers="$withval"
+   withval=$with_ffmpegthumbnailer_h;
+             mt_ffmpegthumbnailer_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for ffmpegthumbnailer headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for ffmpegthumbnailer headers in $withval" >&5
-+$as_echo "$as_me: Will search for ffmpegthumbnailer headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_ffmpegthumbnailer_search_headers" ; then
-+        unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
-+        CFLAGS="$CFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for ffmpegthumbnailer headers in $withval" >&6;}
+ 
+ 
+@@ -34958,145 +17765,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_ffmpegthumbnailer_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h... " >&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 $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h usability" >&5
+-$as_echo_n "checking $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.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 <$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.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_cxx_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 $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h presence" >&5
+-$as_echo_n "checking $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.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 <$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for $mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_ffmpegthumbnailer_search_headers/libffmpegthumbnailer/videothumbnailerc.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_ffmpegthumbnailer_cxxflags="-I${mt_ffmpegthumbnailer_search_headers}"
-+
-+else
-+
-+                mt_ffmpegthumbnailer_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_ffmpegthumbnailer_cxxflags="-I${mt_ffmpegthumbnailer_search_headers}"
+ 
+@@ -35104,12 +17774,10 @@ else
+ 
+                 mt_ffmpegthumbnailer_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&5
-+$as_echo "$as_me: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&6;}
-+                else
-+                    as_fn_error "ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
+ $as_echo "$as_me: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&5
+-$as_echo "$as_me: error: ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "ffmpegthumbnailer headers not found in requested location $mt_ffmpegthumbnailer_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -35118,140 +17786,9 @@ fi
+ 
+     else
+         unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
+-        if test "${ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for libffmpegthumbnailer/videothumbnailerc.h... " >&6; }
+-if test "${ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" >&5
+-$as_echo "$ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking libffmpegthumbnailer/videothumbnailerc.h usability" >&5
+-$as_echo_n "checking libffmpegthumbnailer/videothumbnailerc.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 <libffmpegthumbnailer/videothumbnailerc.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_cxx_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; }
 +        ac_fn_cxx_check_header_mongrel "$LINENO" "libffmpegthumbnailer/videothumbnailerc.h" "ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" "$ac_includes_default"
 +if test "x$ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" | $as_tr_sh`
+ 
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking libffmpegthumbnailer/videothumbnailerc.h presence" >&5
+-$as_echo_n "checking libffmpegthumbnailer/videothumbnailerc.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 <libffmpegthumbnailer/videothumbnailerc.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for libffmpegthumbnailer/videothumbnailerc.h... " >&6; }
+-if test "${ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" >&5
+-$as_echo "$ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -35259,145 +17796,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_libffmpegthumbnailer_videothumbnailerc_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h... " >&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 $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.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 <$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.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_cxx_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 $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.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 <$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/libffmpegthumbnailer/videothumbnailerc.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_ffmpegthumbnailer_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_ffmpegthumbnailer_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_ffmpegthumbnailer_header_status" != xyes; then
-+        mt_ffmpegthumbnailer_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_ffmpegthumbnailer_package_status=${mt_ffmpegthumbnailer_header_status}
-+
-+    if test "x$mt_ffmpegthumbnailer_package_status" = xyes; then
-+
-+    mt_ffmpegthumbnailer_arg_default=yes
-+    mt_ffmpegthumbnailer_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-ffmpegthumbnailer-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_ffmpegthumbnailer_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -35441,10 +17841,10 @@ fi
+ 
+ 
+ # Check whether --with-ffmpegthumbnailer-libs was given.
+-if test "${with_ffmpegthumbnailer_libs+set}" = set; then
 +if test "${with_ffmpegthumbnailer_libs+set}" = set; then :
-+  withval=$with_ffmpegthumbnailer_libs;
-+            mt_ffmpegthumbnailer_search_libs="$withval"
+   withval=$with_ffmpegthumbnailer_libs;
+             mt_ffmpegthumbnailer_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for ffmpegthumbnailer libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for ffmpegthumbnailer libs in $withval" >&5
-+$as_echo "$as_me: Will search for ffmpegthumbnailer libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_ffmpegthumbnailer_search_libs" ; then
-+        unset ac_cv_lib_ffmpegthumbnailer_create_thumbnailer
-+        LDFLAGS="$LDFLAGS -L$mt_ffmpegthumbnailer_search_libs"
+ $as_echo "$as_me: Will search for ffmpegthumbnailer libs in $withval" >&6;}
+ 
+ 
+@@ -35454,18 +17854,14 @@ fi
+     if test "$mt_ffmpegthumbnailer_search_libs" ; then
+         unset ac_cv_lib_ffmpegthumbnailer_create_thumbnailer
+         LDFLAGS="$LDFLAGS -L$mt_ffmpegthumbnailer_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for create_thumbnailer in -lffmpegthumbnailer" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for create_thumbnailer in -lffmpegthumbnailer" >&5
-+$as_echo_n "checking for create_thumbnailer in -lffmpegthumbnailer... " >&6; }
+ $as_echo_n "checking for create_thumbnailer in -lffmpegthumbnailer... " >&6; }
+-if test "${ac_cv_lib_ffmpegthumbnailer_create_thumbnailer+set}" = set; then
 +if test "${ac_cv_lib_ffmpegthumbnailer_create_thumbnailer+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lffmpegthumbnailer  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lffmpegthumbnailer  $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.
-+   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 create_thumbnailer ();
-+int
-+main ()
-+{
-+return create_thumbnailer ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -35483,43 +17879,18 @@ return create_thumbnailer ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=yes
-+else
+   ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=no
 +  ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&5
-+$as_echo "$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&6; }
+ $as_echo "$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&6; }
+-if test "x$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" = x""yes; then
 +if test "x$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" = x""yes; then :
-+
-+                mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
-+                mt_ffmpegthumbnailer_ldflags="-L$mt_ffmpegthumbnailer_search_libs"
-+
-+else
-+
-+                mt_ffmpegthumbnailer_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
+                 mt_ffmpegthumbnailer_ldflags="-L$mt_ffmpegthumbnailer_search_libs"
+@@ -35528,12 +17899,10 @@ else
+ 
+                 mt_ffmpegthumbnailer_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&5
-+$as_echo "$as_me: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&6;}
-+                else
-+                    as_fn_error "ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_ffmpegthumbnailer_create_thumbnailer
+ $as_echo "$as_me: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&5
+-$as_echo "$as_me: error: ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "ffmpegthumbnailer library not found in requested location $mt_ffmpegthumbnailer_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -35541,18 +17910,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_ffmpegthumbnailer_create_thumbnailer
+-        { $as_echo "$as_me:$LINENO: checking for create_thumbnailer in -lffmpegthumbnailer" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for create_thumbnailer in -lffmpegthumbnailer" >&5
-+$as_echo_n "checking for create_thumbnailer in -lffmpegthumbnailer... " >&6; }
+ $as_echo_n "checking for create_thumbnailer in -lffmpegthumbnailer... " >&6; }
+-if test "${ac_cv_lib_ffmpegthumbnailer_create_thumbnailer+set}" = set; then
 +if test "${ac_cv_lib_ffmpegthumbnailer_create_thumbnailer+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lffmpegthumbnailer  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lffmpegthumbnailer  $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.
-+   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 create_thumbnailer ();
-+int
-+main ()
-+{
-+return create_thumbnailer ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -35570,43 +17935,18 @@ return create_thumbnailer ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=yes
-+else
+   ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=no
 +  ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&5
-+$as_echo "$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&6; }
+ $as_echo "$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&6; }
+-if test "x$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" = x""yes; then
 +if test "x$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" = x""yes; then :
-+
-+                mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_ffmpegthumbnailer_create_thumbnailer
+ 
+                 mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
+ 
+@@ -35614,18 +17954,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_ffmpegthumbnailer_create_thumbnailer
+-                { $as_echo "$as_me:$LINENO: checking for create_thumbnailer in -lffmpegthumbnailer" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for create_thumbnailer in -lffmpegthumbnailer" >&5
-+$as_echo_n "checking for create_thumbnailer in -lffmpegthumbnailer... " >&6; }
+ $as_echo_n "checking for create_thumbnailer in -lffmpegthumbnailer... " >&6; }
+-if test "${ac_cv_lib_ffmpegthumbnailer_create_thumbnailer+set}" = set; then
 +if test "${ac_cv_lib_ffmpegthumbnailer_create_thumbnailer+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lffmpegthumbnailer  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lffmpegthumbnailer  $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.
-+   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 create_thumbnailer ();
-+int
-+main ()
-+{
-+return create_thumbnailer ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -35643,43 +17979,18 @@ return create_thumbnailer ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=yes
-+else
+   ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=no
 +  ac_cv_lib_ffmpegthumbnailer_create_thumbnailer=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&5
-+$as_echo "$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&6; }
+ $as_echo "$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" >&6; }
+-if test "x$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" = x""yes; then
 +if test "x$ac_cv_lib_ffmpegthumbnailer_create_thumbnailer" = x""yes; then :
-+
-+                        mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
-+                        mt_ffmpegthumbnailer_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_ffmpegthumbnailer_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_ffmpegthumbnailer_library_status" != xyes; then
-+        mt_ffmpegthumbnailer_libs=""
-+        mt_ffmpegthumbnailer_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_ffmpegthumbnailer_package_status=${mt_ffmpegthumbnailer_library_status}
-+    fi
-+
-+    if test "x$mt_ffmpegthumbnailer_package_status" = xyes; then
-+        FFMPEGTHUMBNAILER_CFLAGS=${mt_ffmpegthumbnailer_cxxflags}
-+        FFMPEGTHUMBNAILER_LIBS=${mt_ffmpegthumbnailer_libs}
-+        FFMPEGTHUMBNAILER_LDFLAGS=${mt_ffmpegthumbnailer_ldflags}
-+    fi
-+
-+        mt_ffmpegthumbnailer_status=${mt_ffmpegthumbnailer_package_status}
-+    else
-+        mt_ffmpegthumbnailer_status=disabled
-+    fi
-+
-+    if ((test "x${FFMPEGTHUMBNAILER_OPTION_ENABLED}" = xyes) &&
-+        (test "x${FFMPEGTHUMBNAILER_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_ffmpegthumbnailer_status" != xyes) && (test "" != "pass")); then
-+        as_fn_error "unable to configure ffmpegthumbnailer support" "$LINENO" 5
-+    fi
-+
-+    if test "x$mt_ffmpegthumbnailer_status" = xyes; then
-+
+ 
+                         mt_ffmpegthumbnailer_libs="-lffmpegthumbnailer"
+                         mt_ffmpegthumbnailer_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -35725,16 +18036,12 @@ fi
+     if ((test "x${FFMPEGTHUMBNAILER_OPTION_ENABLED}" = xyes) &&
+         (test "x${FFMPEGTHUMBNAILER_OPTION_REQUESTED}" = xyes) &&
+         (test "x$mt_ffmpegthumbnailer_status" != xyes) && (test "" != "pass")); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure ffmpegthumbnailer support" >&5
+-$as_echo "$as_me: error: unable to configure ffmpegthumbnailer support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure ffmpegthumbnailer support" "$LINENO" 5
+     fi
+ 
+     if test "x$mt_ffmpegthumbnailer_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_FFMPEGTHUMBNAILER 1
+-_ACEOF
 +$as_echo "#define HAVE_FFMPEGTHUMBNAILER 1" >>confdefs.h
-+
-+    fi
-+
-+    FFMPEGTHUMBNAILER_STATUS=${mt_ffmpegthumbnailer_status}
-+
-+
-+
-+
-+
-+
-+
-+    if (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes); then
-+
+ 
+     fi
+ 
+@@ -35748,9 +18055,7 @@ _ACEOF
+ 
+     if (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes); then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define FFMPEGTHUMBNAILER_OLD_API 1
+-_ACEOF
 +$as_echo "#define FFMPEGTHUMBNAILER_OLD_API 1" >>confdefs.h
-+
-+    fi
-+fi
-+
-+if ((test "x$FFMPEG_STATUS" != xyes) && (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes)); then
-+    if test "x$FFMPEGTHUMBNAILER_OPTION_REQUESTED" = xyes; then
-+      as_fn_error "ffmpeg libraries are required in order to use ffmpegthumbnailer" "$LINENO" 5
-+    else
+ 
+         FFMPEGTHUMBNAILER_USES_OLD_API=yes
+     fi
+@@ -35758,11 +18063,9 @@ fi
+ 
+ if ((test "x$FFMPEG_STATUS" != xyes) && (test "x$FFMPEGTHUMBNAILER_STATUS" = xyes)); then
+     if test "x$FFMPEGTHUMBNAILER_OPTION_REQUESTED" = xyes; then
+-      { { $as_echo "$as_me:$LINENO: error: ffmpeg libraries are required in order to use ffmpegthumbnailer" >&5
+-$as_echo "$as_me: error: ffmpeg libraries are required in order to use ffmpegthumbnailer" >&2;}
+-   { (exit 1); exit 1; }; }
++      as_fn_error $? "ffmpeg libraries are required in order to use ffmpegthumbnailer" "$LINENO" 5
+     else
+-      { $as_echo "$as_me:$LINENO: WARNING: ffmpegthumbnailer disabled: ffmpeg libraries required" >&5
 +      { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ffmpegthumbnailer disabled: ffmpeg libraries required" >&5
-+$as_echo "$as_me: WARNING: ffmpegthumbnailer disabled: ffmpeg libraries required" >&2;}
-+      FFMPEGTHUMBNAILER_STATUS="disabled"
-+      FFMPEGTHUMBNAILER_CFLAGS=""
-+      FFMPEGTHUMBNAILER_LDFLAGS=""
-+      FFMPEGTHUMBNAILER_LIBS=""
-+    fi
-+
+ $as_echo "$as_me: WARNING: ffmpegthumbnailer disabled: ffmpeg libraries required" >&2;}
+       FFMPEGTHUMBNAILER_STATUS="disabled"
+       FFMPEGTHUMBNAILER_CFLAGS=""
+@@ -35790,7 +18093,7 @@ CPPFLAGS="$CPPFLAGS_SAVE"
+     fi
+ 
+     # Check whether --enable-lastfmlib was given.
+-if test "${enable_lastfmlib+set}" = set; then
++if test "${enable_lastfmlib+set}" = set; then :
+   enableval=$enable_lastfmlib;
+             mt_lastfmlib_option_enabled=$enableval
+             mt_lastfmlib_option_requested=yes
+@@ -35805,7 +18108,9 @@ fi
+ 
+ 
+ 
++    if test "x${mt_lastfmlib_option_enabled}" = xyes; then :
+ 
 +fi
-+CXXFLAGS="$CXXFLAGS_SAVE"
-+LDFLAGS="$LDFLAGS_SAVE"
-+CPPFLAGS="$CPPFLAGS_SAVE"
-+
-+######## extractor
-+
-+if test "x$LIBEXTRACTOR_OPTION_ENABLED" = xyes; then
-+
-+    mt_libextractor_status=yes
-+
-+    if test "x$mt_libextractor_status" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_libextractor_header_status=yes
-+
-+
-+# Check whether --with-libextractor-h was given.
+ 
+     if test "x${LASTFMLIB_OPTION_ENABLED}" = xyes; then
+ 
+@@ -35820,10 +18125,10 @@ fi
+ 
+ 
+ # Check whether --with-lastfmlib-h was given.
+-if test "${with_lastfmlib_h+set}" = set; then
++if test "${with_lastfmlib_h+set}" = set; then :
+   withval=$with_lastfmlib_h;
+             mt_lastfmlib_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for lastfmlib headers in $withval" >&5
++            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for lastfmlib headers in $withval" >&5
+ $as_echo "$as_me: Will search for lastfmlib headers in $withval" >&6;}
+ 
+ 
+@@ -35836,145 +18141,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_lastfmlib_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_lastfmlib_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h" >&5
+-$as_echo_n "checking for $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h... " >&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 $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h usability" >&5
+-$as_echo_n "checking $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.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 <$mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.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_cxx_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 $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h presence" >&5
+-$as_echo_n "checking $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.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 <$mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h" >&5
+-$as_echo_n "checking for $mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h... " >&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
++ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_lastfmlib_search_headers/lastfmlib/lastfmscrobbler.h" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_lastfmlib_cxxflags="-I${mt_lastfmlib_search_headers}"
+ 
+@@ -35982,12 +18150,10 @@ else
+ 
+                 mt_lastfmlib_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: lastfmlib headers not found in requested location $mt_lastfmlib_search_headers" >&5
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: lastfmlib headers not found in requested location $mt_lastfmlib_search_headers" >&5
+ $as_echo "$as_me: lastfmlib headers not found in requested location $mt_lastfmlib_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: lastfmlib headers not found in requested location $mt_lastfmlib_search_headers" >&5
+-$as_echo "$as_me: error: lastfmlib headers not found in requested location $mt_lastfmlib_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "lastfmlib headers not found in requested location $mt_lastfmlib_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -35996,140 +18162,9 @@ fi
+ 
+     else
+         unset ac_cv_header_lastfmlib_lastfmscrobbler_h
+-        if test "${ac_cv_header_lastfmlib_lastfmscrobbler_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for lastfmlib/lastfmscrobbler.h" >&5
+-$as_echo_n "checking for lastfmlib/lastfmscrobbler.h... " >&6; }
+-if test "${ac_cv_header_lastfmlib_lastfmscrobbler_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lastfmlib_lastfmscrobbler_h" >&5
+-$as_echo "$ac_cv_header_lastfmlib_lastfmscrobbler_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking lastfmlib/lastfmscrobbler.h usability" >&5
+-$as_echo_n "checking lastfmlib/lastfmscrobbler.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 <lastfmlib/lastfmscrobbler.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_cxx_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_fn_cxx_check_header_mongrel "$LINENO" "lastfmlib/lastfmscrobbler.h" "ac_cv_header_lastfmlib_lastfmscrobbler_h" "$ac_includes_default"
++if test "x$ac_cv_header_lastfmlib_lastfmscrobbler_h" = x""yes; then :
+ 
+-	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 lastfmlib/lastfmscrobbler.h presence" >&5
+-$as_echo_n "checking lastfmlib/lastfmscrobbler.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 <lastfmlib/lastfmscrobbler.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: lastfmlib/lastfmscrobbler.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: lastfmlib/lastfmscrobbler.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: lastfmlib/lastfmscrobbler.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: lastfmlib/lastfmscrobbler.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: lastfmlib/lastfmscrobbler.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: lastfmlib/lastfmscrobbler.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: lastfmlib/lastfmscrobbler.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: lastfmlib/lastfmscrobbler.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: lastfmlib/lastfmscrobbler.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: lastfmlib/lastfmscrobbler.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: lastfmlib/lastfmscrobbler.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: lastfmlib/lastfmscrobbler.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: lastfmlib/lastfmscrobbler.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: lastfmlib/lastfmscrobbler.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: lastfmlib/lastfmscrobbler.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: lastfmlib/lastfmscrobbler.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for lastfmlib/lastfmscrobbler.h" >&5
+-$as_echo_n "checking for lastfmlib/lastfmscrobbler.h... " >&6; }
+-if test "${ac_cv_header_lastfmlib_lastfmscrobbler_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_lastfmlib_lastfmscrobbler_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_lastfmlib_lastfmscrobbler_h" >&5
+-$as_echo "$ac_cv_header_lastfmlib_lastfmscrobbler_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_lastfmlib_lastfmscrobbler_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -36137,145 +18172,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_lastfmlib_lastfmscrobbler_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h... " >&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 $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.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 <$MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.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_cxx_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 $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.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 <$MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h... " >&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
++ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/lastfmlib/lastfmscrobbler.h" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_lastfmlib_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -36319,10 +18217,10 @@ fi
+ 
+ 
+ # Check whether --with-lastfmlib-libs was given.
+-if test "${with_lastfmlib_libs+set}" = set; then
++if test "${with_lastfmlib_libs+set}" = set; then :
+   withval=$with_lastfmlib_libs;
+             mt_lastfmlib_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for lastfmlib libs in $withval" >&5
++            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for lastfmlib libs in $withval" >&5
+ $as_echo "$as_me: Will search for lastfmlib libs in $withval" >&6;}
+ 
+ 
+@@ -36332,18 +18230,14 @@ fi
+     if test "$mt_lastfmlib_search_libs" ; then
+         unset ac_cv_lib_lastfmlib_create_scrobbler
+         LDFLAGS="$LDFLAGS -L$mt_lastfmlib_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for create_scrobbler in -llastfmlib" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for create_scrobbler in -llastfmlib" >&5
+ $as_echo_n "checking for create_scrobbler in -llastfmlib... " >&6; }
+-if test "${ac_cv_lib_lastfmlib_create_scrobbler+set}" = set; then
++if test "${ac_cv_lib_lastfmlib_create_scrobbler+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-llastfmlib  $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.
+@@ -36361,43 +18255,18 @@ return create_scrobbler ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
+   ac_cv_lib_lastfmlib_create_scrobbler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_lastfmlib_create_scrobbler=no
++  ac_cv_lib_lastfmlib_create_scrobbler=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_lastfmlib_create_scrobbler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lastfmlib_create_scrobbler" >&5
+ $as_echo "$ac_cv_lib_lastfmlib_create_scrobbler" >&6; }
+-if test "x$ac_cv_lib_lastfmlib_create_scrobbler" = x""yes; then
++if test "x$ac_cv_lib_lastfmlib_create_scrobbler" = x""yes; then :
+ 
+                 mt_lastfmlib_libs="-llastfmlib"
+                 mt_lastfmlib_ldflags="-L$mt_lastfmlib_search_libs"
+@@ -36406,12 +18275,10 @@ else
+ 
+                 mt_lastfmlib_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: lastfmlib library not found in requested location $mt_lastfmlib_search_libs" >&5
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: lastfmlib library not found in requested location $mt_lastfmlib_search_libs" >&5
+ $as_echo "$as_me: lastfmlib library not found in requested location $mt_lastfmlib_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: lastfmlib library not found in requested location $mt_lastfmlib_search_libs" >&5
+-$as_echo "$as_me: error: lastfmlib library not found in requested location $mt_lastfmlib_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "lastfmlib library not found in requested location $mt_lastfmlib_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -36419,18 +18286,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_lastfmlib_create_scrobbler
+-        { $as_echo "$as_me:$LINENO: checking for create_scrobbler in -llastfmlib" >&5
++        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for create_scrobbler in -llastfmlib" >&5
+ $as_echo_n "checking for create_scrobbler in -llastfmlib... " >&6; }
+-if test "${ac_cv_lib_lastfmlib_create_scrobbler+set}" = set; then
++if test "${ac_cv_lib_lastfmlib_create_scrobbler+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-llastfmlib  $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.
+@@ -36448,43 +18311,18 @@ return create_scrobbler ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
+   ac_cv_lib_lastfmlib_create_scrobbler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_lastfmlib_create_scrobbler=no
++  ac_cv_lib_lastfmlib_create_scrobbler=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_lastfmlib_create_scrobbler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lastfmlib_create_scrobbler" >&5
+ $as_echo "$ac_cv_lib_lastfmlib_create_scrobbler" >&6; }
+-if test "x$ac_cv_lib_lastfmlib_create_scrobbler" = x""yes; then
++if test "x$ac_cv_lib_lastfmlib_create_scrobbler" = x""yes; then :
+ 
+                 mt_lastfmlib_libs="-llastfmlib"
+ 
+@@ -36492,18 +18330,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_lastfmlib_create_scrobbler
+-                { $as_echo "$as_me:$LINENO: checking for create_scrobbler in -llastfmlib" >&5
++                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for create_scrobbler in -llastfmlib" >&5
+ $as_echo_n "checking for create_scrobbler in -llastfmlib... " >&6; }
+-if test "${ac_cv_lib_lastfmlib_create_scrobbler+set}" = set; then
++if test "${ac_cv_lib_lastfmlib_create_scrobbler+set}" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-llastfmlib  $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.
+@@ -36521,43 +18355,18 @@ return create_scrobbler ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
+   ac_cv_lib_lastfmlib_create_scrobbler=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_lastfmlib_create_scrobbler=no
++  ac_cv_lib_lastfmlib_create_scrobbler=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_lastfmlib_create_scrobbler" >&5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lastfmlib_create_scrobbler" >&5
+ $as_echo "$ac_cv_lib_lastfmlib_create_scrobbler" >&6; }
+-if test "x$ac_cv_lib_lastfmlib_create_scrobbler" = x""yes; then
++if test "x$ac_cv_lib_lastfmlib_create_scrobbler" = x""yes; then :
+ 
+                         mt_lastfmlib_libs="-llastfmlib"
+                         mt_lastfmlib_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -36603,16 +18412,12 @@ fi
+     if ((test "x${LASTFMLIB_OPTION_ENABLED}" = xyes) &&
+         (test "x${LASTFMLIB_OPTION_REQUESTED}" = xyes) &&
+         (test "x$mt_lastfmlib_status" != xyes) && (test "" != "pass")); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure lastfmlib support" >&5
+-$as_echo "$as_me: error: unable to configure lastfmlib support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure lastfmlib support" "$LINENO" 5
+     fi
+ 
+     if test "x$mt_lastfmlib_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LASTFMLIB 1
+-_ACEOF
++$as_echo "#define HAVE_LASTFMLIB 1" >>confdefs.h
+ 
+     fi
+ 
+@@ -36643,10 +18448,10 @@ if test "x$LIBEXTRACTOR_OPTION_ENABLED" = xyes; then
+ 
+ 
+ # Check whether --with-libextractor-h was given.
+-if test "${with_libextractor_h+set}" = set; then
 +if test "${with_libextractor_h+set}" = set; then :
-+  withval=$with_libextractor_h;
-+            mt_libextractor_search_headers="$withval"
+   withval=$with_libextractor_h;
+             mt_libextractor_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libextractor headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libextractor headers in $withval" >&5
-+$as_echo "$as_me: Will search for libextractor headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libextractor_search_headers" ; then
-+        unset ac_cv_header_extractor_h
-+        CFLAGS="$CFLAGS -I${mt_libextractor_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_libextractor_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_libextractor_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_libextractor_search_headers/extractor.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for libextractor headers in $withval" >&6;}
+ 
+ 
+@@ -36659,145 +18464,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_libextractor_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_libextractor_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_libextractor_search_headers/extractor.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_libextractor_search_headers/extractor.h" >&5
+-$as_echo_n "checking for $mt_libextractor_search_headers/extractor.h... " >&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 $mt_libextractor_search_headers/extractor.h usability" >&5
+-$as_echo_n "checking $mt_libextractor_search_headers/extractor.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 <$mt_libextractor_search_headers/extractor.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_cxx_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 $mt_libextractor_search_headers/extractor.h presence" >&5
+-$as_echo_n "checking $mt_libextractor_search_headers/extractor.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 <$mt_libextractor_search_headers/extractor.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libextractor_search_headers/extractor.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_libextractor_search_headers/extractor.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libextractor_search_headers/extractor.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libextractor_search_headers/extractor.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libextractor_search_headers/extractor.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_libextractor_search_headers/extractor.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libextractor_search_headers/extractor.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_libextractor_search_headers/extractor.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libextractor_search_headers/extractor.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_libextractor_search_headers/extractor.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libextractor_search_headers/extractor.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_libextractor_search_headers/extractor.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libextractor_search_headers/extractor.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libextractor_search_headers/extractor.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libextractor_search_headers/extractor.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_libextractor_search_headers/extractor.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_libextractor_search_headers/extractor.h" >&5
+-$as_echo_n "checking for $mt_libextractor_search_headers/extractor.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_libextractor_search_headers/extractor.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_libextractor_cxxflags="-I${mt_libextractor_search_headers}"
-+
-+else
-+
-+                mt_libextractor_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_libextractor_cxxflags="-I${mt_libextractor_search_headers}"
+ 
+@@ -36805,12 +18473,10 @@ else
+ 
+                 mt_libextractor_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libextractor headers not found in requested location $mt_libextractor_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libextractor headers not found in requested location $mt_libextractor_search_headers" >&5
-+$as_echo "$as_me: libextractor headers not found in requested location $mt_libextractor_search_headers" >&6;}
-+                else
-+                    as_fn_error "libextractor headers not found in requested location $mt_libextractor_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_extractor_h
+ $as_echo "$as_me: libextractor headers not found in requested location $mt_libextractor_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libextractor headers not found in requested location $mt_libextractor_search_headers" >&5
+-$as_echo "$as_me: error: libextractor headers not found in requested location $mt_libextractor_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libextractor headers not found in requested location $mt_libextractor_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -36819,140 +18485,9 @@ fi
+ 
+     else
+         unset ac_cv_header_extractor_h
+-        if test "${ac_cv_header_extractor_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for extractor.h" >&5
+-$as_echo_n "checking for extractor.h... " >&6; }
+-if test "${ac_cv_header_extractor_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_extractor_h" >&5
+-$as_echo "$ac_cv_header_extractor_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking extractor.h usability" >&5
+-$as_echo_n "checking extractor.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 <extractor.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_cxx_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 extractor.h presence" >&5
+-$as_echo_n "checking extractor.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 <extractor.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_cxx_preproc_warn_flag$ac_cxx_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
 +        ac_fn_cxx_check_header_mongrel "$LINENO" "extractor.h" "ac_cv_header_extractor_h" "$ac_includes_default"
 +if test "x$ac_cv_header_extractor_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_extractor_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/extractor.h" | $as_tr_sh`
+ 
+-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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: extractor.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: extractor.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: extractor.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: extractor.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: extractor.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: extractor.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: extractor.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: extractor.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: extractor.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: extractor.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: extractor.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: extractor.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: extractor.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: extractor.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: extractor.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: extractor.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for extractor.h" >&5
+-$as_echo_n "checking for extractor.h... " >&6; }
+-if test "${ac_cv_header_extractor_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_extractor_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_extractor_h" >&5
+-$as_echo "$ac_cv_header_extractor_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_extractor_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -36960,145 +18495,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_extractor_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/extractor.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/extractor.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/extractor.h... " >&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 $MT_SEARCHPATH_HEADERS/extractor.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/extractor.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 <$MT_SEARCHPATH_HEADERS/extractor.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_cxx_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 $MT_SEARCHPATH_HEADERS/extractor.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/extractor.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 <$MT_SEARCHPATH_HEADERS/extractor.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/extractor.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/extractor.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/extractor.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/extractor.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_libextractor_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_libextractor_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_libextractor_header_status" != xyes; then
-+        mt_libextractor_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_libextractor_package_status=${mt_libextractor_header_status}
-+
-+    if test "x$mt_libextractor_package_status" = xyes; then
-+
-+    mt_libextractor_arg_default=yes
-+    mt_libextractor_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-libextractor-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_libextractor_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -37142,10 +18540,10 @@ fi
+ 
+ 
+ # Check whether --with-libextractor-libs was given.
+-if test "${with_libextractor_libs+set}" = set; then
 +if test "${with_libextractor_libs+set}" = set; then :
-+  withval=$with_libextractor_libs;
-+            mt_libextractor_search_libs="$withval"
+   withval=$with_libextractor_libs;
+             mt_libextractor_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libextractor libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libextractor libs in $withval" >&5
-+$as_echo "$as_me: Will search for libextractor libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libextractor_search_libs" ; then
-+        unset ac_cv_lib_extractor_EXTRACTOR_getKeywords
-+        LDFLAGS="$LDFLAGS -L$mt_libextractor_search_libs"
+ $as_echo "$as_me: Will search for libextractor libs in $withval" >&6;}
+ 
+ 
+@@ -37155,18 +18553,14 @@ fi
+     if test "$mt_libextractor_search_libs" ; then
+         unset ac_cv_lib_extractor_EXTRACTOR_getKeywords
+         LDFLAGS="$LDFLAGS -L$mt_libextractor_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for EXTRACTOR_getKeywords in -lextractor" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXTRACTOR_getKeywords in -lextractor" >&5
-+$as_echo_n "checking for EXTRACTOR_getKeywords in -lextractor... " >&6; }
+ $as_echo_n "checking for EXTRACTOR_getKeywords in -lextractor... " >&6; }
+-if test "${ac_cv_lib_extractor_EXTRACTOR_getKeywords+set}" = set; then
 +if test "${ac_cv_lib_extractor_EXTRACTOR_getKeywords+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lextractor  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lextractor  $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.
-+   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 EXTRACTOR_getKeywords ();
-+int
-+main ()
-+{
-+return EXTRACTOR_getKeywords ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -37184,43 +18578,18 @@ return EXTRACTOR_getKeywords ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_extractor_EXTRACTOR_getKeywords=yes
-+else
+   ac_cv_lib_extractor_EXTRACTOR_getKeywords=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_extractor_EXTRACTOR_getKeywords=no
 +  ac_cv_lib_extractor_EXTRACTOR_getKeywords=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&5
-+$as_echo "$ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&6; }
+ $as_echo "$ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&6; }
+-if test "x$ac_cv_lib_extractor_EXTRACTOR_getKeywords" = x""yes; then
 +if test "x$ac_cv_lib_extractor_EXTRACTOR_getKeywords" = x""yes; then :
-+
-+                mt_libextractor_libs="-lextractor"
-+                mt_libextractor_ldflags="-L$mt_libextractor_search_libs"
-+
-+else
-+
-+                mt_libextractor_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_libextractor_libs="-lextractor"
+                 mt_libextractor_ldflags="-L$mt_libextractor_search_libs"
+@@ -37229,12 +18598,10 @@ else
+ 
+                 mt_libextractor_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libextractor library not found in requested location $mt_libextractor_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libextractor library not found in requested location $mt_libextractor_search_libs" >&5
-+$as_echo "$as_me: libextractor library not found in requested location $mt_libextractor_search_libs" >&6;}
-+                else
-+                    as_fn_error "libextractor library not found in requested location $mt_libextractor_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_extractor_EXTRACTOR_getKeywords
+ $as_echo "$as_me: libextractor library not found in requested location $mt_libextractor_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libextractor library not found in requested location $mt_libextractor_search_libs" >&5
+-$as_echo "$as_me: error: libextractor library not found in requested location $mt_libextractor_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libextractor library not found in requested location $mt_libextractor_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -37242,18 +18609,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_extractor_EXTRACTOR_getKeywords
+-        { $as_echo "$as_me:$LINENO: checking for EXTRACTOR_getKeywords in -lextractor" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXTRACTOR_getKeywords in -lextractor" >&5
-+$as_echo_n "checking for EXTRACTOR_getKeywords in -lextractor... " >&6; }
+ $as_echo_n "checking for EXTRACTOR_getKeywords in -lextractor... " >&6; }
+-if test "${ac_cv_lib_extractor_EXTRACTOR_getKeywords+set}" = set; then
 +if test "${ac_cv_lib_extractor_EXTRACTOR_getKeywords+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lextractor  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lextractor  $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.
-+   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 EXTRACTOR_getKeywords ();
-+int
-+main ()
-+{
-+return EXTRACTOR_getKeywords ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -37271,43 +18634,18 @@ return EXTRACTOR_getKeywords ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_extractor_EXTRACTOR_getKeywords=yes
-+else
+   ac_cv_lib_extractor_EXTRACTOR_getKeywords=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_extractor_EXTRACTOR_getKeywords=no
 +  ac_cv_lib_extractor_EXTRACTOR_getKeywords=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&5
-+$as_echo "$ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&6; }
+ $as_echo "$ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&6; }
+-if test "x$ac_cv_lib_extractor_EXTRACTOR_getKeywords" = x""yes; then
 +if test "x$ac_cv_lib_extractor_EXTRACTOR_getKeywords" = x""yes; then :
-+
-+                mt_libextractor_libs="-lextractor"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_extractor_EXTRACTOR_getKeywords
+ 
+                 mt_libextractor_libs="-lextractor"
+ 
+@@ -37315,18 +18653,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_extractor_EXTRACTOR_getKeywords
+-                { $as_echo "$as_me:$LINENO: checking for EXTRACTOR_getKeywords in -lextractor" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EXTRACTOR_getKeywords in -lextractor" >&5
-+$as_echo_n "checking for EXTRACTOR_getKeywords in -lextractor... " >&6; }
+ $as_echo_n "checking for EXTRACTOR_getKeywords in -lextractor... " >&6; }
+-if test "${ac_cv_lib_extractor_EXTRACTOR_getKeywords+set}" = set; then
 +if test "${ac_cv_lib_extractor_EXTRACTOR_getKeywords+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lextractor  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lextractor  $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.
-+   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 EXTRACTOR_getKeywords ();
-+int
-+main ()
-+{
-+return EXTRACTOR_getKeywords ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -37344,43 +18678,18 @@ return EXTRACTOR_getKeywords ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_extractor_EXTRACTOR_getKeywords=yes
-+else
+   ac_cv_lib_extractor_EXTRACTOR_getKeywords=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_extractor_EXTRACTOR_getKeywords=no
 +  ac_cv_lib_extractor_EXTRACTOR_getKeywords=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&5
-+$as_echo "$ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&6; }
+ $as_echo "$ac_cv_lib_extractor_EXTRACTOR_getKeywords" >&6; }
+-if test "x$ac_cv_lib_extractor_EXTRACTOR_getKeywords" = x""yes; then
 +if test "x$ac_cv_lib_extractor_EXTRACTOR_getKeywords" = x""yes; then :
-+
-+                        mt_libextractor_libs="-lextractor"
-+                        mt_libextractor_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_libextractor_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_libextractor_library_status" != xyes; then
-+        mt_libextractor_libs=""
-+        mt_libextractor_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_libextractor_package_status=${mt_libextractor_library_status}
-+    fi
-+
-+    if test "x$mt_libextractor_package_status" = xyes; then
-+        LIBEXTRACTOR_CFLAGS=${mt_libextractor_cxxflags}
-+        LIBEXTRACTOR_LIBS=${mt_libextractor_libs}
-+        LIBEXTRACTOR_LDFLAGS=${mt_libextractor_ldflags}
-+    fi
-+
-+        mt_libextractor_status=${mt_libextractor_package_status}
-+    fi
-+
-+    if test "x$mt_libextractor_status" = xyes; then
-+
+ 
+                         mt_libextractor_libs="-lextractor"
+                         mt_libextractor_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -37423,9 +18732,7 @@ fi
+ 
+     if test "x$mt_libextractor_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBEXTRACTOR 1
+-_ACEOF
 +$as_echo "#define HAVE_LIBEXTRACTOR 1" >>confdefs.h
-+
-+    fi
-+
-+    LIBEXTRACTOR_STATUS=${mt_libextractor_status}
-+
-+
-+
-+
-+
-+
-+fi
-+
-+if test "x$LIBEXTRACTOR_STATUS" = xyes; then
-+    FFMPEG_STATUS=disabled
-+    FFMPEG_OPTION_ENABLED=no
-+else
-+    if (test "x$LIBEXTRACTOR_OPTION_REQUESTED" = xyes) &&
-+       (test "x$LIBEXTRACTOR_OPTION_ENABLED" = xyes); then
-+        as_fn_error "unable to configure libextractor support" "$LINENO" 5
-+    fi
-+fi
-+
-+######## libexif
-+
-+
-+    mt_libexif_status=yes
-+
-+
-+
-+    mt_libexif_option_enabled=
-+    mt_libexif_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_libexif_option_enabled=yes
-+    else
-+        mt_libexif_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-libexif was given.
+ 
+     fi
+ 
+@@ -37444,9 +18751,7 @@ if test "x$LIBEXTRACTOR_STATUS" = xyes; then
+ else
+     if (test "x$LIBEXTRACTOR_OPTION_REQUESTED" = xyes) &&
+        (test "x$LIBEXTRACTOR_OPTION_ENABLED" = xyes); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure libextractor support" >&5
+-$as_echo "$as_me: error: unable to configure libextractor support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure libextractor support" "$LINENO" 5
+     fi
+ fi
+ 
+@@ -37466,7 +18771,7 @@ fi
+     fi
+ 
+     # Check whether --enable-libexif was given.
+-if test "${enable_libexif+set}" = set; then
 +if test "${enable_libexif+set}" = set; then :
-+  enableval=$enable_libexif;
-+            mt_libexif_option_enabled=$enableval
-+            mt_libexif_option_requested=yes
-+
-+
-+fi
-+
-+
-+    LIBEXIF_OPTION_ENABLED=${mt_libexif_option_enabled}
-+    LIBEXIF_OPTION_REQUESTED=${mt_libexif_option_requested}
-+
-+
-+
-+
+   enableval=$enable_libexif;
+             mt_libexif_option_enabled=$enableval
+             mt_libexif_option_requested=yes
+@@ -37481,7 +18786,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_libexif_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+    if test "x${LIBEXIF_OPTION_ENABLED}" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_libexif_header_status=yes
-+
-+
-+# Check whether --with-libexif-h was given.
+ 
+     if test "x${LIBEXIF_OPTION_ENABLED}" = xyes; then
+ 
+@@ -37496,10 +18803,10 @@ fi
+ 
+ 
+ # Check whether --with-libexif-h was given.
+-if test "${with_libexif_h+set}" = set; then
 +if test "${with_libexif_h+set}" = set; then :
-+  withval=$with_libexif_h;
-+            mt_libexif_search_headers="$withval"
+   withval=$with_libexif_h;
+             mt_libexif_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libexif headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libexif headers in $withval" >&5
-+$as_echo "$as_me: Will search for libexif headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libexif_search_headers" ; then
-+        unset ac_cv_header_libexif_exif_content_h
-+        CFLAGS="$CFLAGS -I${mt_libexif_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_libexif_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_libexif_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_libexif_search_headers/libexif/exif-content.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for libexif headers in $withval" >&6;}
+ 
+ 
+@@ -37512,145 +18819,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_libexif_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_libexif_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_libexif_search_headers/libexif/exif-content.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_libexif_search_headers/libexif/exif-content.h" >&5
+-$as_echo_n "checking for $mt_libexif_search_headers/libexif/exif-content.h... " >&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 $mt_libexif_search_headers/libexif/exif-content.h usability" >&5
+-$as_echo_n "checking $mt_libexif_search_headers/libexif/exif-content.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 <$mt_libexif_search_headers/libexif/exif-content.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_cxx_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 $mt_libexif_search_headers/libexif/exif-content.h presence" >&5
+-$as_echo_n "checking $mt_libexif_search_headers/libexif/exif-content.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 <$mt_libexif_search_headers/libexif/exif-content.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libexif_search_headers/libexif/exif-content.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_libexif_search_headers/libexif/exif-content.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libexif_search_headers/libexif/exif-content.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_libexif_search_headers/libexif/exif-content.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_libexif_search_headers/libexif/exif-content.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_libexif_search_headers/libexif/exif-content.h" >&5
+-$as_echo_n "checking for $mt_libexif_search_headers/libexif/exif-content.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_libexif_search_headers/libexif/exif-content.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_libexif_cxxflags="-I${mt_libexif_search_headers}"
-+
-+else
-+
-+                mt_libexif_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_libexif_cxxflags="-I${mt_libexif_search_headers}"
+ 
+@@ -37658,12 +18828,10 @@ else
+ 
+                 mt_libexif_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libexif headers not found in requested location $mt_libexif_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libexif headers not found in requested location $mt_libexif_search_headers" >&5
-+$as_echo "$as_me: libexif headers not found in requested location $mt_libexif_search_headers" >&6;}
-+                else
-+                    as_fn_error "libexif headers not found in requested location $mt_libexif_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_libexif_exif_content_h
+ $as_echo "$as_me: libexif headers not found in requested location $mt_libexif_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libexif headers not found in requested location $mt_libexif_search_headers" >&5
+-$as_echo "$as_me: error: libexif headers not found in requested location $mt_libexif_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libexif headers not found in requested location $mt_libexif_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -37672,140 +18840,9 @@ fi
+ 
+     else
+         unset ac_cv_header_libexif_exif_content_h
+-        if test "${ac_cv_header_libexif_exif_content_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for libexif/exif-content.h" >&5
+-$as_echo_n "checking for libexif/exif-content.h... " >&6; }
+-if test "${ac_cv_header_libexif_exif_content_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libexif_exif_content_h" >&5
+-$as_echo "$ac_cv_header_libexif_exif_content_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking libexif/exif-content.h usability" >&5
+-$as_echo_n "checking libexif/exif-content.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 <libexif/exif-content.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_cxx_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; }
 +        ac_fn_cxx_check_header_mongrel "$LINENO" "libexif/exif-content.h" "ac_cv_header_libexif_exif_content_h" "$ac_includes_default"
 +if test "x$ac_cv_header_libexif_exif_content_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_libexif_exif_content_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/libexif/exif-content.h" | $as_tr_sh`
+ 
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking libexif/exif-content.h presence" >&5
+-$as_echo_n "checking libexif/exif-content.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 <libexif/exif-content.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: libexif/exif-content.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: libexif/exif-content.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libexif/exif-content.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: libexif/exif-content.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: libexif/exif-content.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: libexif/exif-content.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libexif/exif-content.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: libexif/exif-content.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libexif/exif-content.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: libexif/exif-content.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libexif/exif-content.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: libexif/exif-content.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libexif/exif-content.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: libexif/exif-content.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: libexif/exif-content.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: libexif/exif-content.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for libexif/exif-content.h" >&5
+-$as_echo_n "checking for libexif/exif-content.h... " >&6; }
+-if test "${ac_cv_header_libexif_exif_content_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_libexif_exif_content_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_libexif_exif_content_h" >&5
+-$as_echo "$ac_cv_header_libexif_exif_content_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_libexif_exif_content_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -37813,145 +18850,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_libexif_exif_content_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/libexif/exif-content.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libexif/exif-content.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libexif/exif-content.h... " >&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 $MT_SEARCHPATH_HEADERS/libexif/exif-content.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libexif/exif-content.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 <$MT_SEARCHPATH_HEADERS/libexif/exif-content.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_cxx_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 $MT_SEARCHPATH_HEADERS/libexif/exif-content.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/libexif/exif-content.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 <$MT_SEARCHPATH_HEADERS/libexif/exif-content.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/libexif/exif-content.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/libexif/exif-content.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/libexif/exif-content.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/libexif/exif-content.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_libexif_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_libexif_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_libexif_header_status" != xyes; then
-+        mt_libexif_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_libexif_package_status=${mt_libexif_header_status}
-+
-+    if test "x$mt_libexif_package_status" = xyes; then
-+
-+    mt_libexif_arg_default=yes
-+    mt_libexif_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-libexif-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_libexif_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -37995,10 +18895,10 @@ fi
+ 
+ 
+ # Check whether --with-libexif-libs was given.
+-if test "${with_libexif_libs+set}" = set; then
 +if test "${with_libexif_libs+set}" = set; then :
-+  withval=$with_libexif_libs;
-+            mt_libexif_search_libs="$withval"
+   withval=$with_libexif_libs;
+             mt_libexif_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libexif libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libexif libs in $withval" >&5
-+$as_echo "$as_me: Will search for libexif libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libexif_search_libs" ; then
-+        unset ac_cv_lib_exif_exif_data_new_from_file
-+        LDFLAGS="$LDFLAGS -L$mt_libexif_search_libs"
+ $as_echo "$as_me: Will search for libexif libs in $withval" >&6;}
+ 
+ 
+@@ -38008,18 +18908,14 @@ fi
+     if test "$mt_libexif_search_libs" ; then
+         unset ac_cv_lib_exif_exif_data_new_from_file
+         LDFLAGS="$LDFLAGS -L$mt_libexif_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for exif_data_new_from_file in -lexif" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exif_data_new_from_file in -lexif" >&5
-+$as_echo_n "checking for exif_data_new_from_file in -lexif... " >&6; }
+ $as_echo_n "checking for exif_data_new_from_file in -lexif... " >&6; }
+-if test "${ac_cv_lib_exif_exif_data_new_from_file+set}" = set; then
 +if test "${ac_cv_lib_exif_exif_data_new_from_file+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lexif  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lexif  $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.
-+   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 exif_data_new_from_file ();
-+int
-+main ()
-+{
-+return exif_data_new_from_file ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -38037,43 +18933,18 @@ return exif_data_new_from_file ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_exif_exif_data_new_from_file=yes
-+else
+   ac_cv_lib_exif_exif_data_new_from_file=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_exif_exif_data_new_from_file=no
 +  ac_cv_lib_exif_exif_data_new_from_file=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exif_exif_data_new_from_file" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_exif_exif_data_new_from_file" >&5
-+$as_echo "$ac_cv_lib_exif_exif_data_new_from_file" >&6; }
+ $as_echo "$ac_cv_lib_exif_exif_data_new_from_file" >&6; }
+-if test "x$ac_cv_lib_exif_exif_data_new_from_file" = x""yes; then
 +if test "x$ac_cv_lib_exif_exif_data_new_from_file" = x""yes; then :
-+
-+                mt_libexif_libs="-lexif"
-+                mt_libexif_ldflags="-L$mt_libexif_search_libs"
-+
-+else
-+
-+                mt_libexif_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_libexif_libs="-lexif"
+                 mt_libexif_ldflags="-L$mt_libexif_search_libs"
+@@ -38082,12 +18953,10 @@ else
+ 
+                 mt_libexif_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libexif library not found in requested location $mt_libexif_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libexif library not found in requested location $mt_libexif_search_libs" >&5
-+$as_echo "$as_me: libexif library not found in requested location $mt_libexif_search_libs" >&6;}
-+                else
-+                    as_fn_error "libexif library not found in requested location $mt_libexif_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_exif_exif_data_new_from_file
+ $as_echo "$as_me: libexif library not found in requested location $mt_libexif_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libexif library not found in requested location $mt_libexif_search_libs" >&5
+-$as_echo "$as_me: error: libexif library not found in requested location $mt_libexif_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libexif library not found in requested location $mt_libexif_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -38095,18 +18964,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_exif_exif_data_new_from_file
+-        { $as_echo "$as_me:$LINENO: checking for exif_data_new_from_file in -lexif" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exif_data_new_from_file in -lexif" >&5
-+$as_echo_n "checking for exif_data_new_from_file in -lexif... " >&6; }
+ $as_echo_n "checking for exif_data_new_from_file in -lexif... " >&6; }
+-if test "${ac_cv_lib_exif_exif_data_new_from_file+set}" = set; then
 +if test "${ac_cv_lib_exif_exif_data_new_from_file+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lexif  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lexif  $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.
-+   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 exif_data_new_from_file ();
-+int
-+main ()
-+{
-+return exif_data_new_from_file ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -38124,43 +18989,18 @@ return exif_data_new_from_file ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_exif_exif_data_new_from_file=yes
-+else
+   ac_cv_lib_exif_exif_data_new_from_file=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_exif_exif_data_new_from_file=no
 +  ac_cv_lib_exif_exif_data_new_from_file=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exif_exif_data_new_from_file" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_exif_exif_data_new_from_file" >&5
-+$as_echo "$ac_cv_lib_exif_exif_data_new_from_file" >&6; }
+ $as_echo "$ac_cv_lib_exif_exif_data_new_from_file" >&6; }
+-if test "x$ac_cv_lib_exif_exif_data_new_from_file" = x""yes; then
 +if test "x$ac_cv_lib_exif_exif_data_new_from_file" = x""yes; then :
-+
-+                mt_libexif_libs="-lexif"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_exif_exif_data_new_from_file
+ 
+                 mt_libexif_libs="-lexif"
+ 
+@@ -38168,18 +19008,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_exif_exif_data_new_from_file
+-                { $as_echo "$as_me:$LINENO: checking for exif_data_new_from_file in -lexif" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for exif_data_new_from_file in -lexif" >&5
-+$as_echo_n "checking for exif_data_new_from_file in -lexif... " >&6; }
+ $as_echo_n "checking for exif_data_new_from_file in -lexif... " >&6; }
+-if test "${ac_cv_lib_exif_exif_data_new_from_file+set}" = set; then
 +if test "${ac_cv_lib_exif_exif_data_new_from_file+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lexif  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lexif  $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.
-+   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 exif_data_new_from_file ();
-+int
-+main ()
-+{
-+return exif_data_new_from_file ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -38197,43 +19033,18 @@ return exif_data_new_from_file ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_exif_exif_data_new_from_file=yes
-+else
+   ac_cv_lib_exif_exif_data_new_from_file=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_exif_exif_data_new_from_file=no
 +  ac_cv_lib_exif_exif_data_new_from_file=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_exif_exif_data_new_from_file" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_exif_exif_data_new_from_file" >&5
-+$as_echo "$ac_cv_lib_exif_exif_data_new_from_file" >&6; }
+ $as_echo "$ac_cv_lib_exif_exif_data_new_from_file" >&6; }
+-if test "x$ac_cv_lib_exif_exif_data_new_from_file" = x""yes; then
 +if test "x$ac_cv_lib_exif_exif_data_new_from_file" = x""yes; then :
-+
-+                        mt_libexif_libs="-lexif"
-+                        mt_libexif_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_libexif_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_libexif_library_status" != xyes; then
-+        mt_libexif_libs=""
-+        mt_libexif_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_libexif_package_status=${mt_libexif_library_status}
-+    fi
-+
-+    if test "x$mt_libexif_package_status" = xyes; then
-+        LIBEXIF_CFLAGS=${mt_libexif_cxxflags}
-+        LIBEXIF_LIBS=${mt_libexif_libs}
-+        LIBEXIF_LDFLAGS=${mt_libexif_ldflags}
-+    fi
-+
-+        mt_libexif_status=${mt_libexif_package_status}
-+    else
-+        mt_libexif_status=disabled
-+    fi
-+
-+    if ((test "x${LIBEXIF_OPTION_ENABLED}" = xyes) &&
-+        (test "x${LIBEXIF_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_libexif_status" != xyes) && (test "" != "pass")); then
-+        as_fn_error "unable to configure libexif support" "$LINENO" 5
-+    fi
-+
-+    if test "x$mt_libexif_status" = xyes; then
-+
+ 
+                         mt_libexif_libs="-lexif"
+                         mt_libexif_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -38279,16 +19090,12 @@ fi
+     if ((test "x${LIBEXIF_OPTION_ENABLED}" = xyes) &&
+         (test "x${LIBEXIF_OPTION_REQUESTED}" = xyes) &&
+         (test "x$mt_libexif_status" != xyes) && (test "" != "pass")); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure libexif support" >&5
+-$as_echo "$as_me: error: unable to configure libexif support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure libexif support" "$LINENO" 5
+     fi
+ 
+     if test "x$mt_libexif_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBEXIF 1
+-_ACEOF
 +$as_echo "#define HAVE_LIBEXIF 1" >>confdefs.h
-+
-+    fi
-+
-+    LIBEXIF_STATUS=${mt_libexif_status}
-+
-+
-+
-+
-+
-+
-+
-+if test "x$LIBEXIF_STATUS" = xyes; then
-+    CFLAGS="$CFLAGS $LIBEXIF_CFLAGS"
-+    CXXFLAGS="$CXXFLAGS $LIBEXIF_CFLAGS"
-+    LDFLAGS="$LDFLAGS $LIBEXIF_LDFLAGS $LIBEXIF_LIBS"
-+
-+    # try 1 argument signature
+ 
+     fi
+ 
+@@ -38306,13 +19113,9 @@ if test "x$LIBEXIF_STATUS" = xyes; then
+     LDFLAGS="$LDFLAGS $LIBEXIF_LDFLAGS $LIBEXIF_LIBS"
+ 
+     # try 1 argument signature
+-    { $as_echo "$as_me:$LINENO: checking exif_entry_get_value signature" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking exif_entry_get_value signature" >&5
-+$as_echo_n "checking exif_entry_get_value signature... " >&6; }
+ $as_echo_n "checking exif_entry_get_value signature... " >&6; }
+-    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 <libexif/exif-data.h>
-+                #include <libexif/exif-content.h>
-+
-+int
-+main ()
-+{
-+
-+                (void)exif_entry_get_value(0);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+                 #include <libexif/exif-data.h>
+@@ -38329,40 +19132,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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+
+ 
+-            { $as_echo "$as_me:$LINENO: result: requires 1 argument" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: requires 1 argument" >&5
-+$as_echo "requires 1 argument" >&6; }
-+            EXIF_EGV_1=yes
-+
-+else
-+
-+            # try 3 argument signature
+ $as_echo "requires 1 argument" >&6; }
+             EXIF_EGV_1=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ 
+             # try 3 argument signature
+-            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 <libexif/exif-data.h>
-+                        #include <libexif/exif-content.h>
-+
-+int
-+main ()
-+{
-+
-+                        (void)exif_entry_get_value(0, 0, 0);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+                         #include <libexif/exif-data.h>
+@@ -38379,60 +19158,34 @@ 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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+
+ 
+-                    { $as_echo "$as_me:$LINENO: result: requires 3 arguments" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: requires 3 arguments" >&5
-+$as_echo "requires 3 arguments" >&6; }
-+                    EXIF_EGV_3=yes
-+
-+else
-+
+ $as_echo "requires 3 arguments" >&6; }
+                     EXIF_EGV_3=yes
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
+-                    { $as_echo "$as_me:$LINENO: result: unsupported, disabling" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported, disabling" >&5
-+$as_echo "unsupported, disabling" >&6; }
-+                    EXIF_OK="disabled (unsupported version)"
-+
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+    if test "x$EXIF_EGV_1" = xyes; then
-+
+ $as_echo "unsupported, disabling" >&6; }
+                     EXIF_OK="disabled (unsupported version)"
+ 
+ 
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+ 
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+     if test "x$EXIF_EGV_1" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define EXIF_EGV_1 1
+-_ACEOF
 +$as_echo "#define EXIF_EGV_1 1" >>confdefs.h
-+
-+    fi
-+    if test "x$EXIF_EGV_3" = xyes; then
-+
+ 
+     fi
+     if test "x$EXIF_EGV_3" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define EXIF_EGV_3 1
+-_ACEOF
 +$as_echo "#define EXIF_EGV_3 1" >>confdefs.h
-+
-+    fi
-+fi
-+
-+LDFLAGS="$LDFLAGS_SAVE"
-+CFLAGS="$CFLAGS_SAVE"
-+CXXFLAGS="$CXXFLAGS_SAVE"
-+
-+######## expat
-+
-+
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_expat_header_status=yes
-+
-+
-+# Check whether --with-expat-h was given.
+ 
+     fi
+ fi
+@@ -38456,10 +19209,10 @@ CXXFLAGS="$CXXFLAGS_SAVE"
+ 
+ 
+ # Check whether --with-expat-h was given.
+-if test "${with_expat_h+set}" = set; then
 +if test "${with_expat_h+set}" = set; then :
-+  withval=$with_expat_h;
-+            mt_expat_search_headers="$withval"
+   withval=$with_expat_h;
+             mt_expat_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for expat headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for expat headers in $withval" >&5
-+$as_echo "$as_me: Will search for expat headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_expat_search_headers" ; then
-+        unset ac_cv_header_expat_h
-+        CFLAGS="$CFLAGS -I${mt_expat_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_expat_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_expat_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_expat_search_headers/expat.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for expat headers in $withval" >&6;}
+ 
+ 
+@@ -38472,145 +19225,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_expat_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_expat_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_expat_search_headers/expat.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_expat_search_headers/expat.h" >&5
+-$as_echo_n "checking for $mt_expat_search_headers/expat.h... " >&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 $mt_expat_search_headers/expat.h usability" >&5
+-$as_echo_n "checking $mt_expat_search_headers/expat.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 <$mt_expat_search_headers/expat.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_cxx_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 $mt_expat_search_headers/expat.h presence" >&5
+-$as_echo_n "checking $mt_expat_search_headers/expat.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 <$mt_expat_search_headers/expat.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_expat_search_headers/expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_expat_search_headers/expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_expat_search_headers/expat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_expat_search_headers/expat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_expat_search_headers/expat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_expat_search_headers/expat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_expat_search_headers/expat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_expat_search_headers/expat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_expat_search_headers/expat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_expat_search_headers/expat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_expat_search_headers/expat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_expat_search_headers/expat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_expat_search_headers/expat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_expat_search_headers/expat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_expat_search_headers/expat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_expat_search_headers/expat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_expat_search_headers/expat.h" >&5
+-$as_echo_n "checking for $mt_expat_search_headers/expat.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_expat_search_headers/expat.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_expat_cxxflags="-I${mt_expat_search_headers}"
-+
-+else
-+
-+                mt_expat_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_expat_cxxflags="-I${mt_expat_search_headers}"
+ 
+@@ -38618,12 +19234,10 @@ else
+ 
+                 mt_expat_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: expat headers not found in requested location $mt_expat_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: expat headers not found in requested location $mt_expat_search_headers" >&5
-+$as_echo "$as_me: expat headers not found in requested location $mt_expat_search_headers" >&6;}
-+                else
-+                    as_fn_error "expat headers not found in requested location $mt_expat_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_expat_h
+ $as_echo "$as_me: expat headers not found in requested location $mt_expat_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: expat headers not found in requested location $mt_expat_search_headers" >&5
+-$as_echo "$as_me: error: expat headers not found in requested location $mt_expat_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "expat headers not found in requested location $mt_expat_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -38632,140 +19246,9 @@ fi
+ 
+     else
+         unset ac_cv_header_expat_h
+-        if test "${ac_cv_header_expat_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for expat.h" >&5
+-$as_echo_n "checking for expat.h... " >&6; }
+-if test "${ac_cv_header_expat_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+-$as_echo "$ac_cv_header_expat_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking expat.h usability" >&5
+-$as_echo_n "checking expat.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 <expat.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_cxx_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 expat.h presence" >&5
+-$as_echo_n "checking expat.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 <expat.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_cxx_preproc_warn_flag$ac_cxx_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; }
 +        ac_fn_cxx_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default"
 +if test "x$ac_cv_header_expat_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_expat_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/expat.h" | $as_tr_sh`
+ 
+-# So?  What about this header?
+-case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: expat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: expat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: expat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for expat.h" >&5
+-$as_echo_n "checking for expat.h... " >&6; }
+-if test "${ac_cv_header_expat_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_expat_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5
+-$as_echo "$ac_cv_header_expat_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_expat_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -38773,145 +19256,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_expat_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/expat.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/expat.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/expat.h... " >&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 $MT_SEARCHPATH_HEADERS/expat.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/expat.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 <$MT_SEARCHPATH_HEADERS/expat.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_cxx_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 $MT_SEARCHPATH_HEADERS/expat.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/expat.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 <$MT_SEARCHPATH_HEADERS/expat.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/expat.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/expat.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/expat.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/expat.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/expat.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/expat.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/expat.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/expat.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_expat_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_expat_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_expat_header_status" != xyes; then
-+        mt_expat_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_expat_package_status=${mt_expat_header_status}
-+
-+    if test "x$mt_expat_package_status" = xyes; then
-+
-+    mt_expat_arg_default=yes
-+    mt_expat_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-expat-libs was given.
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_expat_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -38955,10 +19301,10 @@ fi
+ 
+ 
+ # Check whether --with-expat-libs was given.
+-if test "${with_expat_libs+set}" = set; then
 +if test "${with_expat_libs+set}" = set; then :
-+  withval=$with_expat_libs;
-+            mt_expat_search_libs="$withval"
+   withval=$with_expat_libs;
+             mt_expat_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for expat libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for expat libs in $withval" >&5
-+$as_echo "$as_me: Will search for expat libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_expat_search_libs" ; then
-+        unset ac_cv_lib_expat_XML_ParserCreate
-+        LDFLAGS="$LDFLAGS -L$mt_expat_search_libs"
+ $as_echo "$as_me: Will search for expat libs in $withval" >&6;}
+ 
+ 
+@@ -38968,18 +19314,14 @@ fi
+     if test "$mt_expat_search_libs" ; then
+         unset ac_cv_lib_expat_XML_ParserCreate
+         LDFLAGS="$LDFLAGS -L$mt_expat_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
-+$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
+ $as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
+-if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
 +if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lexpat  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lexpat  $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.
-+   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 XML_ParserCreate ();
-+int
-+main ()
-+{
-+return XML_ParserCreate ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -38997,43 +19339,18 @@ return XML_ParserCreate ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_expat_XML_ParserCreate=yes
-+else
+   ac_cv_lib_expat_XML_ParserCreate=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_expat_XML_ParserCreate=no
 +  ac_cv_lib_expat_XML_ParserCreate=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-+$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+ $as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+-if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then
 +if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
-+
-+                mt_expat_libs="-lexpat"
-+                mt_expat_ldflags="-L$mt_expat_search_libs"
-+
-+else
-+
-+                mt_expat_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_expat_libs="-lexpat"
+                 mt_expat_ldflags="-L$mt_expat_search_libs"
+@@ -39042,12 +19359,10 @@ else
+ 
+                 mt_expat_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: expat library not found in requested location $mt_expat_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: expat library not found in requested location $mt_expat_search_libs" >&5
-+$as_echo "$as_me: expat library not found in requested location $mt_expat_search_libs" >&6;}
-+                else
-+                    as_fn_error "expat library not found in requested location $mt_expat_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_expat_XML_ParserCreate
+ $as_echo "$as_me: expat library not found in requested location $mt_expat_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: expat library not found in requested location $mt_expat_search_libs" >&5
+-$as_echo "$as_me: error: expat library not found in requested location $mt_expat_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "expat library not found in requested location $mt_expat_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -39055,18 +19370,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_expat_XML_ParserCreate
+-        { $as_echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
-+$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
+ $as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
+-if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
 +if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lexpat  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lexpat  $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.
-+   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 XML_ParserCreate ();
-+int
-+main ()
-+{
-+return XML_ParserCreate ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -39084,43 +19395,18 @@ return XML_ParserCreate ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_expat_XML_ParserCreate=yes
-+else
+   ac_cv_lib_expat_XML_ParserCreate=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_expat_XML_ParserCreate=no
 +  ac_cv_lib_expat_XML_ParserCreate=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-+$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+ $as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+-if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then
 +if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
-+
-+                mt_expat_libs="-lexpat"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_expat_XML_ParserCreate
+ 
+                 mt_expat_libs="-lexpat"
+ 
+@@ -39128,18 +19414,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_expat_XML_ParserCreate
+-                { $as_echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5
-+$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
+ $as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; }
+-if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
 +if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lexpat  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lexpat  $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.
-+   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 XML_ParserCreate ();
-+int
-+main ()
-+{
-+return XML_ParserCreate ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -39157,43 +19439,18 @@ return XML_ParserCreate ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_expat_XML_ParserCreate=yes
-+else
+   ac_cv_lib_expat_XML_ParserCreate=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_expat_XML_ParserCreate=no
 +  ac_cv_lib_expat_XML_ParserCreate=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5
-+$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+ $as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; }
+-if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then
 +if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then :
-+
-+                        mt_expat_libs="-lexpat"
-+                        mt_expat_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_expat_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_expat_library_status" != xyes; then
-+        mt_expat_libs=""
-+        mt_expat_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_expat_package_status=${mt_expat_library_status}
-+    fi
-+
-+    if test "x$mt_expat_package_status" = xyes; then
-+        EXPAT_CFLAGS=${mt_expat_cxxflags}
-+        EXPAT_LIBS=${mt_expat_libs}
-+        EXPAT_LDFLAGS=${mt_expat_ldflags}
-+    fi
-+
-+    if test "x$mt_expat_package_status" != xyes; then
-+        as_fn_error "unable to configure required package expat" "$LINENO" 5
-+    fi
-+
-+
+ 
+                         mt_expat_libs="-lexpat"
+                         mt_expat_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -39232,15 +19489,11 @@ fi
+     fi
+ 
+     if test "x$mt_expat_package_status" != xyes; then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure required package expat" >&5
+-$as_echo "$as_me: error: unable to configure required package expat" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure required package expat" "$LINENO" 5
+     fi
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_EXPAT 1
+-_ACEOF
 +$as_echo "#define HAVE_EXPAT 1" >>confdefs.h
-+
-+
-+    EXPAT_STATUS=${mt_expat_package_status}
-+
-+
-+
-+
-+
-+
-+
-+####### libmp4v2
-+
-+
-+    mt_libmp4v2_status=yes
-+
-+
-+
-+    mt_libmp4v2_option_enabled=
-+    mt_libmp4v2_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_libmp4v2_option_enabled=yes
-+    else
-+        mt_libmp4v2_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-libmp4v2 was given.
+ 
+ 
+     EXPAT_STATUS=${mt_expat_package_status}
+@@ -39268,10 +19521,10 @@ MP4_HEADER="mp4"
+ 
+ 
+ # Check whether --with-libmp4v2-h was given.
+-if test "${with_libmp4v2_h+set}" = set; then
++if test "${with_libmp4v2_h+set}" = set; then :
+   withval=$with_libmp4v2_h;
+             mt_libmp4v2_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libmp4v2 headers in $withval" >&5
++            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libmp4v2 headers in $withval" >&5
+ $as_echo "$as_me: Will search for libmp4v2 headers in $withval" >&6;}
+ 
+ 
+@@ -39284,145 +19537,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_libmp4v2_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_libmp4v2_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_libmp4v2_search_headers/mp4v2/mp4v2.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_libmp4v2_search_headers/mp4v2/mp4v2.h" >&5
+-$as_echo_n "checking for $mt_libmp4v2_search_headers/mp4v2/mp4v2.h... " >&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 $mt_libmp4v2_search_headers/mp4v2/mp4v2.h usability" >&5
+-$as_echo_n "checking $mt_libmp4v2_search_headers/mp4v2/mp4v2.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 <$mt_libmp4v2_search_headers/mp4v2/mp4v2.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_cxx_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 $mt_libmp4v2_search_headers/mp4v2/mp4v2.h presence" >&5
+-$as_echo_n "checking $mt_libmp4v2_search_headers/mp4v2/mp4v2.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 <$mt_libmp4v2_search_headers/mp4v2/mp4v2.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/mp4v2/mp4v2.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_libmp4v2_search_headers/mp4v2/mp4v2.h" >&5
+-$as_echo_n "checking for $mt_libmp4v2_search_headers/mp4v2/mp4v2.h... " >&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
++ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_libmp4v2_search_headers/mp4v2/mp4v2.h" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_libmp4v2_cxxflags="-I${mt_libmp4v2_search_headers}"
+ 
+@@ -39430,12 +19546,10 @@ else
+ 
+                 mt_libmp4v2_header_status=missing
+                 if test "pass" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" >&5
++                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" >&5
+ $as_echo "$as_me: libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" >&5
+-$as_echo "$as_me: error: libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -39444,140 +19558,9 @@ fi
+ 
+     else
+         unset ac_cv_header_mp4v2_mp4v2_h
+-        if test "${ac_cv_header_mp4v2_mp4v2_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for mp4v2/mp4v2.h" >&5
+-$as_echo_n "checking for mp4v2/mp4v2.h... " >&6; }
+-if test "${ac_cv_header_mp4v2_mp4v2_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mp4v2_mp4v2_h" >&5
+-$as_echo "$ac_cv_header_mp4v2_mp4v2_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking mp4v2/mp4v2.h usability" >&5
+-$as_echo_n "checking mp4v2/mp4v2.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 <mp4v2/mp4v2.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_cxx_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 mp4v2/mp4v2.h presence" >&5
+-$as_echo_n "checking mp4v2/mp4v2.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 <mp4v2/mp4v2.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_cxx_preproc_warn_flag$ac_cxx_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_fn_cxx_check_header_mongrel "$LINENO" "mp4v2/mp4v2.h" "ac_cv_header_mp4v2_mp4v2_h" "$ac_includes_default"
++if test "x$ac_cv_header_mp4v2_mp4v2_h" = x""yes; then :
+ 
+-  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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: mp4v2/mp4v2.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: mp4v2/mp4v2.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: mp4v2/mp4v2.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: mp4v2/mp4v2.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: mp4v2/mp4v2.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: mp4v2/mp4v2.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: mp4v2/mp4v2.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: mp4v2/mp4v2.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: mp4v2/mp4v2.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for mp4v2/mp4v2.h" >&5
+-$as_echo_n "checking for mp4v2/mp4v2.h... " >&6; }
+-if test "${ac_cv_header_mp4v2_mp4v2_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_mp4v2_mp4v2_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mp4v2_mp4v2_h" >&5
+-$as_echo "$ac_cv_header_mp4v2_mp4v2_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_mp4v2_mp4v2_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -39585,145 +19568,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_mp4v2_mp4v2_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h... " >&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 $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.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 <$MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.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_cxx_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 $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.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 <$MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h... " >&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
++ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/mp4v2/mp4v2.h" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_libmp4v2_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -39780,7 +19626,7 @@ LIBMP4V2_STATUS=
+     fi
+ 
+     # Check whether --enable-libmp4v2 was given.
+-if test "${enable_libmp4v2+set}" = set; then
 +if test "${enable_libmp4v2+set}" = set; then :
-+  enableval=$enable_libmp4v2;
-+            mt_libmp4v2_option_enabled=$enableval
-+            mt_libmp4v2_option_requested=yes
-+
-+
-+fi
-+
-+
-+    LIBMP4V2_OPTION_ENABLED=${mt_libmp4v2_option_enabled}
-+    LIBMP4V2_OPTION_REQUESTED=${mt_libmp4v2_option_requested}
-+
-+
-+
-+
+   enableval=$enable_libmp4v2;
+             mt_libmp4v2_option_enabled=$enableval
+             mt_libmp4v2_option_requested=yes
+@@ -39795,7 +19641,9 @@ fi
+ 
+ 
+ 
 +    if test "x${mt_libmp4v2_option_enabled}" = xyes; then :
-+
+ 
 +fi
-+
-+    if test "x${LIBMP4V2_OPTION_ENABLED}" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_libmp4v2_header_status=yes
-+
-+
-+# Check whether --with-libmp4v2-h was given.
+ 
+     if test "x${LIBMP4V2_OPTION_ENABLED}" = xyes; then
+ 
+@@ -39810,10 +19658,10 @@ fi
+ 
+ 
+ # Check whether --with-libmp4v2-h was given.
+-if test "${with_libmp4v2_h+set}" = set; then
 +if test "${with_libmp4v2_h+set}" = set; then :
-+  withval=$with_libmp4v2_h;
-+            mt_libmp4v2_search_headers="$withval"
+   withval=$with_libmp4v2_h;
+             mt_libmp4v2_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libmp4v2 headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libmp4v2 headers in $withval" >&5
-+$as_echo "$as_me: Will search for libmp4v2 headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libmp4v2_search_headers" ; then
-+        unset ac_cv_header_mp4_h
-+        CFLAGS="$CFLAGS -I${mt_libmp4v2_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_libmp4v2_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_libmp4v2_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_libmp4v2_search_headers/mp4.h" | $as_tr_sh`
-+ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_libmp4v2_search_headers/mp4.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_libmp4v2_cxxflags="-I${mt_libmp4v2_search_headers}"
-+
-+else
-+
-+                mt_libmp4v2_header_status=missing
-+                if test "" = "pass"; then
+ $as_echo "$as_me: Will search for libmp4v2 headers in $withval" >&6;}
+ 
+ 
+@@ -39826,145 +19674,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_libmp4v2_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_libmp4v2_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_libmp4v2_search_headers/$MP4_HEADER.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_libmp4v2_search_headers/$MP4_HEADER.h" >&5
+-$as_echo_n "checking for $mt_libmp4v2_search_headers/$MP4_HEADER.h... " >&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 $mt_libmp4v2_search_headers/$MP4_HEADER.h usability" >&5
+-$as_echo_n "checking $mt_libmp4v2_search_headers/$MP4_HEADER.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 <$mt_libmp4v2_search_headers/$MP4_HEADER.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_cxx_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 $mt_libmp4v2_search_headers/$MP4_HEADER.h presence" >&5
+-$as_echo_n "checking $mt_libmp4v2_search_headers/$MP4_HEADER.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 <$mt_libmp4v2_search_headers/$MP4_HEADER.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_libmp4v2_search_headers/$MP4_HEADER.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_libmp4v2_search_headers/$MP4_HEADER.h" >&5
+-$as_echo_n "checking for $mt_libmp4v2_search_headers/$MP4_HEADER.h... " >&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
++ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_libmp4v2_search_headers/$MP4_HEADER.h" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_libmp4v2_cxxflags="-I${mt_libmp4v2_search_headers}"
+ 
+@@ -39972,12 +19683,10 @@ else
+ 
+                 mt_libmp4v2_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" >&5
-+$as_echo "$as_me: libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" >&6;}
-+                else
-+                    as_fn_error "libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_mp4_h
-+        ac_fn_cxx_check_header_mongrel "$LINENO" "mp4.h" "ac_cv_header_mp4_h" "$ac_includes_default"
-+if test "x$ac_cv_header_mp4_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_mp4_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/mp4.h" | $as_tr_sh`
-+ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/mp4.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_libmp4v2_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_libmp4v2_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_libmp4v2_header_status" != xyes; then
-+        mt_libmp4v2_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+    mt_libmp4v2_package_status=${mt_libmp4v2_header_status}
-+
-+    if test "x$mt_libmp4v2_package_status" = xyes; then
-+
-+    mt_libmp4v2_arg_default=yes
-+    mt_libmp4v2_library_status=yes
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+# Check whether --with-libmp4v2-libs was given.
+ $as_echo "$as_me: libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" >&5
+-$as_echo "$as_me: error: libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libmp4v2 headers not found in requested location $mt_libmp4v2_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -39987,146 +19696,9 @@ fi
+     else
+         unset ac_cv_header_$MP4_HEADER_h
+         as_ac_Header=`$as_echo "ac_cv_header_$MP4_HEADER.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MP4_HEADER.h" >&5
+-$as_echo_n "checking for $MP4_HEADER.h... " >&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 $MP4_HEADER.h usability" >&5
+-$as_echo_n "checking $MP4_HEADER.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 <$MP4_HEADER.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_cxx_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; }
++ac_fn_cxx_check_header_mongrel "$LINENO" "$MP4_HEADER.h" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking $MP4_HEADER.h presence" >&5
+-$as_echo_n "checking $MP4_HEADER.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 <$MP4_HEADER.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MP4_HEADER.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MP4_HEADER.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MP4_HEADER.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MP4_HEADER.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MP4_HEADER.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MP4_HEADER.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MP4_HEADER.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MP4_HEADER.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MP4_HEADER.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MP4_HEADER.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MP4_HEADER.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MP4_HEADER.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MP4_HEADER.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MP4_HEADER.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MP4_HEADER.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MP4_HEADER.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MP4_HEADER.h" >&5
+-$as_echo_n "checking for $MP4_HEADER.h... " >&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
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -40134,145 +19706,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_$MP4_HEADER_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/$MP4_HEADER.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h... " >&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 $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/$MP4_HEADER.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 <$MT_SEARCHPATH_HEADERS/$MP4_HEADER.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_cxx_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 $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/$MP4_HEADER.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 <$MT_SEARCHPATH_HEADERS/$MP4_HEADER.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/$MP4_HEADER.h... " >&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
++ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/$MP4_HEADER.h" "$as_ac_Header" "$ac_includes_default"
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_libmp4v2_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -40316,10 +19751,10 @@ fi
+ 
+ 
+ # Check whether --with-libmp4v2-libs was given.
+-if test "${with_libmp4v2_libs+set}" = set; then
 +if test "${with_libmp4v2_libs+set}" = set; then :
-+  withval=$with_libmp4v2_libs;
-+            mt_libmp4v2_search_libs="$withval"
+   withval=$with_libmp4v2_libs;
+             mt_libmp4v2_search_libs="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for libmp4v2 libs in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libmp4v2 libs in $withval" >&5
-+$as_echo "$as_me: Will search for libmp4v2 libs in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_libmp4v2_search_libs" ; then
-+        unset ac_cv_lib_mp4v2_MP4Read
-+        LDFLAGS="$LDFLAGS -L$mt_libmp4v2_search_libs"
+ $as_echo "$as_me: Will search for libmp4v2 libs in $withval" >&6;}
+ 
+ 
+@@ -40329,18 +19764,14 @@ fi
+     if test "$mt_libmp4v2_search_libs" ; then
+         unset ac_cv_lib_mp4v2_MP4Read
+         LDFLAGS="$LDFLAGS -L$mt_libmp4v2_search_libs"
+-        { $as_echo "$as_me:$LINENO: checking for MP4Read in -lmp4v2" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MP4Read in -lmp4v2" >&5
-+$as_echo_n "checking for MP4Read in -lmp4v2... " >&6; }
+ $as_echo_n "checking for MP4Read in -lmp4v2... " >&6; }
+-if test "${ac_cv_lib_mp4v2_MP4Read+set}" = set; then
 +if test "${ac_cv_lib_mp4v2_MP4Read+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmp4v2  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmp4v2  $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.
-+   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 MP4Read ();
-+int
-+main ()
-+{
-+return MP4Read ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -40358,43 +19789,18 @@ return MP4Read ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_mp4v2_MP4Read=yes
-+else
+   ac_cv_lib_mp4v2_MP4Read=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_mp4v2_MP4Read=no
 +  ac_cv_lib_mp4v2_MP4Read=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mp4v2_MP4Read" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp4v2_MP4Read" >&5
-+$as_echo "$ac_cv_lib_mp4v2_MP4Read" >&6; }
+ $as_echo "$ac_cv_lib_mp4v2_MP4Read" >&6; }
+-if test "x$ac_cv_lib_mp4v2_MP4Read" = x""yes; then
 +if test "x$ac_cv_lib_mp4v2_MP4Read" = x""yes; then :
-+
-+                mt_libmp4v2_libs="-lmp4v2"
-+                mt_libmp4v2_ldflags="-L$mt_libmp4v2_search_libs"
-+
-+else
-+
-+                mt_libmp4v2_library_status=missing
-+                if test "" = "pass"; then
+ 
+                 mt_libmp4v2_libs="-lmp4v2"
+                 mt_libmp4v2_ldflags="-L$mt_libmp4v2_search_libs"
+@@ -40403,12 +19809,10 @@ else
+ 
+                 mt_libmp4v2_library_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" >&5
-+$as_echo "$as_me: libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" >&6;}
-+                else
-+                    as_fn_error "libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+    else
-+        unset ac_cv_lib_mp4v2_MP4Read
+ $as_echo "$as_me: libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" >&5
+-$as_echo "$as_me: error: libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "libmp4v2 library not found in requested location $mt_libmp4v2_search_libs" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -40416,18 +19820,14 @@ fi
+ 
+     else
+         unset ac_cv_lib_mp4v2_MP4Read
+-        { $as_echo "$as_me:$LINENO: checking for MP4Read in -lmp4v2" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MP4Read in -lmp4v2" >&5
-+$as_echo_n "checking for MP4Read in -lmp4v2... " >&6; }
+ $as_echo_n "checking for MP4Read in -lmp4v2... " >&6; }
+-if test "${ac_cv_lib_mp4v2_MP4Read+set}" = set; then
 +if test "${ac_cv_lib_mp4v2_MP4Read+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmp4v2  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmp4v2  $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.
-+   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 MP4Read ();
-+int
-+main ()
-+{
-+return MP4Read ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -40445,43 +19845,18 @@ return MP4Read ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_mp4v2_MP4Read=yes
-+else
+   ac_cv_lib_mp4v2_MP4Read=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_mp4v2_MP4Read=no
 +  ac_cv_lib_mp4v2_MP4Read=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mp4v2_MP4Read" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp4v2_MP4Read" >&5
-+$as_echo "$ac_cv_lib_mp4v2_MP4Read" >&6; }
+ $as_echo "$ac_cv_lib_mp4v2_MP4Read" >&6; }
+-if test "x$ac_cv_lib_mp4v2_MP4Read" = x""yes; then
 +if test "x$ac_cv_lib_mp4v2_MP4Read" = x""yes; then :
-+
-+                mt_libmp4v2_libs="-lmp4v2"
-+
-+else
-+
-+                LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
-+                unset ac_cv_lib_mp4v2_MP4Read
+ 
+                 mt_libmp4v2_libs="-lmp4v2"
+ 
+@@ -40489,18 +19864,14 @@ else
+ 
+                 LDFLAGS="$LDFLAGS -L$MT_SEARCHPATH_LIBS"
+                 unset ac_cv_lib_mp4v2_MP4Read
+-                { $as_echo "$as_me:$LINENO: checking for MP4Read in -lmp4v2" >&5
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MP4Read in -lmp4v2" >&5
-+$as_echo_n "checking for MP4Read in -lmp4v2... " >&6; }
+ $as_echo_n "checking for MP4Read in -lmp4v2... " >&6; }
+-if test "${ac_cv_lib_mp4v2_MP4Read+set}" = set; then
 +if test "${ac_cv_lib_mp4v2_MP4Read+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lmp4v2  $LIBS"
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lmp4v2  $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.
-+   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 MP4Read ();
-+int
-+main ()
-+{
-+return MP4Read ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+ /* Override any GCC internal prototype to avoid an error.
+@@ -40518,43 +19889,18 @@ return MP4Read ();
+   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_cxx_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_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_mp4v2_MP4Read=yes
-+else
+   ac_cv_lib_mp4v2_MP4Read=yes
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_mp4v2_MP4Read=no
 +  ac_cv_lib_mp4v2_MP4Read=no
-+fi
+ 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
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_mp4v2_MP4Read" >&5
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp4v2_MP4Read" >&5
-+$as_echo "$ac_cv_lib_mp4v2_MP4Read" >&6; }
+ $as_echo "$ac_cv_lib_mp4v2_MP4Read" >&6; }
+-if test "x$ac_cv_lib_mp4v2_MP4Read" = x""yes; then
 +if test "x$ac_cv_lib_mp4v2_MP4Read" = x""yes; then :
-+
-+                        mt_libmp4v2_libs="-lmp4v2"
-+                        mt_libmp4v2_ldflags="-L$MT_SEARCHPATH_LIBS"
-+
-+else
-+
-+                        mt_libmp4v2_library_status=missing
-+
-+
-+fi
-+
-+
-+
-+fi
-+
-+    fi
-+
-+    if test "x$mt_libmp4v2_library_status" != xyes; then
-+        mt_libmp4v2_libs=""
-+        mt_libmp4v2_ldflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_libmp4v2_package_status=${mt_libmp4v2_library_status}
-+    fi
-+
-+    if test "x$mt_libmp4v2_package_status" = xyes; then
-+        LIBMP4V2_CFLAGS=${mt_libmp4v2_cxxflags}
-+        LIBMP4V2_LIBS=${mt_libmp4v2_libs}
-+        LIBMP4V2_LDFLAGS=${mt_libmp4v2_ldflags}
-+    fi
-+
-+        mt_libmp4v2_status=${mt_libmp4v2_package_status}
-+    else
-+        mt_libmp4v2_status=disabled
-+    fi
-+
-+    if ((test "x${LIBMP4V2_OPTION_ENABLED}" = xyes) &&
-+        (test "x${LIBMP4V2_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_libmp4v2_status" != xyes) && (test "" != "pass")); then
-+        as_fn_error "unable to configure libmp4v2 support" "$LINENO" 5
-+    fi
-+
-+    if test "x$mt_libmp4v2_status" = xyes; then
-+
+ 
+                         mt_libmp4v2_libs="-lmp4v2"
+                         mt_libmp4v2_ldflags="-L$MT_SEARCHPATH_LIBS"
+@@ -40600,16 +19946,12 @@ fi
+     if ((test "x${LIBMP4V2_OPTION_ENABLED}" = xyes) &&
+         (test "x${LIBMP4V2_OPTION_REQUESTED}" = xyes) &&
+         (test "x$mt_libmp4v2_status" != xyes) && (test "" != "pass")); then
+-        { { $as_echo "$as_me:$LINENO: error: unable to configure libmp4v2 support" >&5
+-$as_echo "$as_me: error: unable to configure libmp4v2 support" >&2;}
+-   { (exit 1); exit 1; }; }
++        as_fn_error $? "unable to configure libmp4v2 support" "$LINENO" 5
+     fi
+ 
+     if test "x$mt_libmp4v2_status" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LIBMP4V2 1
+-_ACEOF
 +$as_echo "#define HAVE_LIBMP4V2 1" >>confdefs.h
-+
-+    fi
-+
-+    LIBMP4V2_STATUS=${mt_libmp4v2_status}
-+
-+
-+
-+
-+
-+
-+
-+if test "x$LIBMP4V2_STATUS" = xyes; then
-+   CFLAGS="$CFLAGS $LIBMP4V2_CFLAGS"
-+   CXXFLAGS="$CXXFLAGS $LIBMP4V2_CFLAGS"
-+   LDFLAGS="$LDFLAGS $LIBMP4V2_LDFLAGS $LIBMP4V2_LIBS"
-+
-+   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MP4GetMetadataCoverArtCount() libmp4v2" >&5
-+$as_echo_n "checking for MP4GetMetadataCoverArtCount() libmp4v2... " >&6; }
+ 
+     fi
+ 
+@@ -40637,13 +19979,9 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+-   { $as_echo "$as_me:$LINENO: checking for MP4GetMetadataCoverArtCount() in libmp4v2" >&5
++   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MP4GetMetadataCoverArtCount() in libmp4v2" >&5
+ $as_echo_n "checking for MP4GetMetadataCoverArtCount() in libmp4v2... " >&6; }
+-   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 <mp4.h>
-+
-+int
-+main ()
-+{
-+
-+                (void)MP4GetMetadataCoverArtCount(0);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+                 #include <$MP4_HEADER.h>
+@@ -40659,52 +19997,25 @@ 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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+
+ 
+-            { $as_echo "$as_me:$LINENO: result: yes" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
+ $as_echo "yes" >&6; }
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MP4_GET_METADATA_COVER_ART_COUNT 1
+-_ACEOF
 +$as_echo "#define HAVE_MP4_GET_METADATA_COVER_ART_COUNT 1" >>confdefs.h
-+
-+
-+else
-+
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-
+-            { $as_echo "$as_me:$LINENO: result: no" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
+ $as_echo "no" >&6; }
+ 
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+-   { $as_echo "$as_me:$LINENO: checking for MP4GetTrackAudioChannels() in libmp4v2" >&5
 +   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MP4GetTrackAudioChannels() in libmp4v2" >&5
-+$as_echo_n "checking for MP4GetTrackAudioChannels() in libmp4v2... " >&6; }
+ $as_echo_n "checking for MP4GetTrackAudioChannels() in libmp4v2... " >&6; }
+-   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 <mp4.h>
-+
-+int
-+main ()
-+{
-+
-+                (void)MP4GetTrackAudioChannels(0, 0);
-+
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ 
+                 #include <$MP4_HEADER.h>
+@@ -40720,43 +20031,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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest.$ac_objext; then
 +if ac_fn_cxx_try_compile "$LINENO"; then :
-+
+ 
+-            { $as_echo "$as_me:$LINENO: result: yes" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; }
-+
+ $as_echo "yes" >&6; }
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_MP4_GET_TRACK_AUDIO_CHANNELS 1
+-_ACEOF
 +$as_echo "#define HAVE_MP4_GET_TRACK_AUDIO_CHANNELS 1" >>confdefs.h
-+
-+
-+else
-+
+ 
+ 
+ else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+ 
+-            { $as_echo "$as_me:$LINENO: result: no" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+
-+   ac_ext=cpp
-+ac_cpp='$CXXCPP $CPPFLAGS'
-+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-+
-+fi
-+
-+########## INOTIFY TOOLS
-+
-+
-+
-+    mt_inotify_option_enabled=
-+    mt_inotify_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_inotify_option_enabled=yes
-+    else
-+        mt_inotify_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-inotify was given.
+ $as_echo "no" >&6; }
+ 
+ fi
+-
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ 
+    ac_ext=cpp
+@@ -40780,7 +20068,7 @@ fi
+     fi
+ 
+     # Check whether --enable-inotify was given.
+-if test "${enable_inotify+set}" = set; then
 +if test "${enable_inotify+set}" = set; then :
-+  enableval=$enable_inotify;
-+            mt_inotify_option_enabled=$enableval
-+            mt_inotify_option_requested=yes
-+
-+
-+fi
-+
-+
-+    INOTIFY_OPTION_ENABLED=${mt_inotify_option_enabled}
-+    INOTIFY_OPTION_REQUESTED=${mt_inotify_option_requested}
-+
-+
-+
-+
+   enableval=$enable_inotify;
+             mt_inotify_option_enabled=$enableval
+             mt_inotify_option_requested=yes
+@@ -40795,13 +20083,12 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_inotify_option_enabled}" = xyes; then
+-  :
 +    if test "x${mt_inotify_option_enabled}" = xyes; then :
 +
-+else
-+  INOTIFY_STATUS=disabled
-+fi
-+
-+if test "x$INOTIFY_OPTION_ENABLED" = xyes; then
-+
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+    mt_inotify_header_status=yes
-+
-+
-+# Check whether --with-inotify-h was given.
+ else
+   INOTIFY_STATUS=disabled
+ fi
+ 
+-
+ if test "x$INOTIFY_OPTION_ENABLED" = xyes; then
+ 
+ 
+@@ -40815,10 +20102,10 @@ if test "x$INOTIFY_OPTION_ENABLED" = xyes; then
+ 
+ 
+ # Check whether --with-inotify-h was given.
+-if test "${with_inotify_h+set}" = set; then
 +if test "${with_inotify_h+set}" = set; then :
-+  withval=$with_inotify_h;
-+            mt_inotify_search_headers="$withval"
+   withval=$with_inotify_h;
+             mt_inotify_search_headers="$withval"
+-            { $as_echo "$as_me:$LINENO: Will search for inotify headers in $withval" >&5
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for inotify headers in $withval" >&5
-+$as_echo "$as_me: Will search for inotify headers in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test "$mt_inotify_search_headers" ; then
-+        unset ac_cv_header_sys_inotify_h
-+        CFLAGS="$CFLAGS -I${mt_inotify_search_headers}"
-+        CXXFLAGS="$CXXFLAGS -I${mt_inotify_search_headers}"
-+        CPPFLAGS="$CPPFLAGS -I${mt_inotify_search_headers}"
-+        as_ac_Header=`$as_echo "ac_cv_header_$mt_inotify_search_headers/sys/inotify.h" | $as_tr_sh`
+ $as_echo "$as_me: Will search for inotify headers in $withval" >&6;}
+ 
+ 
+@@ -40831,145 +20118,8 @@ fi
+         CXXFLAGS="$CXXFLAGS -I${mt_inotify_search_headers}"
+         CPPFLAGS="$CPPFLAGS -I${mt_inotify_search_headers}"
+         as_ac_Header=`$as_echo "ac_cv_header_$mt_inotify_search_headers/sys/inotify.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $mt_inotify_search_headers/sys/inotify.h" >&5
+-$as_echo_n "checking for $mt_inotify_search_headers/sys/inotify.h... " >&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 $mt_inotify_search_headers/sys/inotify.h usability" >&5
+-$as_echo_n "checking $mt_inotify_search_headers/sys/inotify.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 <$mt_inotify_search_headers/sys/inotify.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_cxx_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 $mt_inotify_search_headers/sys/inotify.h presence" >&5
+-$as_echo_n "checking $mt_inotify_search_headers/sys/inotify.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 <$mt_inotify_search_headers/sys/inotify.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_inotify_search_headers/sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $mt_inotify_search_headers/sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_inotify_search_headers/sys/inotify.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $mt_inotify_search_headers/sys/inotify.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_inotify_search_headers/sys/inotify.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $mt_inotify_search_headers/sys/inotify.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_inotify_search_headers/sys/inotify.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $mt_inotify_search_headers/sys/inotify.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_inotify_search_headers/sys/inotify.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $mt_inotify_search_headers/sys/inotify.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_inotify_search_headers/sys/inotify.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $mt_inotify_search_headers/sys/inotify.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_inotify_search_headers/sys/inotify.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $mt_inotify_search_headers/sys/inotify.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $mt_inotify_search_headers/sys/inotify.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $mt_inotify_search_headers/sys/inotify.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $mt_inotify_search_headers/sys/inotify.h" >&5
+-$as_echo_n "checking for $mt_inotify_search_headers/sys/inotify.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$mt_inotify_search_headers/sys/inotify.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                mt_inotify_cxxflags="-I${mt_inotify_search_headers}"
-+
-+else
-+
-+                mt_inotify_header_status=missing
-+                if test "" = "pass"; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                 mt_inotify_cxxflags="-I${mt_inotify_search_headers}"
+ 
+@@ -40977,12 +20127,10 @@ else
+ 
+                 mt_inotify_header_status=missing
+                 if test "" = "pass"; then
+-                    { $as_echo "$as_me:$LINENO: inotify headers not found in requested location $mt_inotify_search_headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: inotify headers not found in requested location $mt_inotify_search_headers" >&5
-+$as_echo "$as_me: inotify headers not found in requested location $mt_inotify_search_headers" >&6;}
-+                else
-+                    as_fn_error "inotify headers not found in requested location $mt_inotify_search_headers" "$LINENO" 5
-+                fi
-+
-+
-+fi
-+
-+
-+    else
-+        unset ac_cv_header_sys_inotify_h
+ $as_echo "$as_me: inotify headers not found in requested location $mt_inotify_search_headers" >&6;}
+                 else
+-                    { { $as_echo "$as_me:$LINENO: error: inotify headers not found in requested location $mt_inotify_search_headers" >&5
+-$as_echo "$as_me: error: inotify headers not found in requested location $mt_inotify_search_headers" >&2;}
+-   { (exit 1); exit 1; }; }
++                    as_fn_error $? "inotify headers not found in requested location $mt_inotify_search_headers" "$LINENO" 5
+                 fi
+ 
+ 
+@@ -40991,140 +20139,9 @@ fi
+ 
+     else
+         unset ac_cv_header_sys_inotify_h
+-        if test "${ac_cv_header_sys_inotify_h+set}" = set; then
+-  { $as_echo "$as_me:$LINENO: checking for sys/inotify.h" >&5
+-$as_echo_n "checking for sys/inotify.h... " >&6; }
+-if test "${ac_cv_header_sys_inotify_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_inotify_h" >&5
+-$as_echo "$ac_cv_header_sys_inotify_h" >&6; }
+-else
+-  # Is the header compilable?
+-{ $as_echo "$as_me:$LINENO: checking sys/inotify.h usability" >&5
+-$as_echo_n "checking sys/inotify.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 <sys/inotify.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_cxx_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; }
 +        ac_fn_cxx_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
 +if test "x$ac_cv_header_sys_inotify_h" = x""yes; then :
-+
-+else
-+
-+                CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CXXFLAGS="$CXXFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
-+                unset ac_cv_header_sys_inotify_h
-+                as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/sys/inotify.h" | $as_tr_sh`
+ 
+-# Is the header present?
+-{ $as_echo "$as_me:$LINENO: checking sys/inotify.h presence" >&5
+-$as_echo_n "checking sys/inotify.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 <sys/inotify.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/inotify.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: sys/inotify.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/inotify.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: sys/inotify.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/inotify.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: sys/inotify.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/inotify.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: sys/inotify.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/inotify.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: sys/inotify.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/inotify.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: sys/inotify.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: sys/inotify.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: sys/inotify.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for sys/inotify.h" >&5
+-$as_echo_n "checking for sys/inotify.h... " >&6; }
+-if test "${ac_cv_header_sys_inotify_h+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_cv_header_sys_inotify_h=$ac_header_preproc
+-fi
+-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_sys_inotify_h" >&5
+-$as_echo "$ac_cv_header_sys_inotify_h" >&6; }
+-
+-fi
+-if test "x$ac_cv_header_sys_inotify_h" = x""yes; then
+-  :
+ else
+ 
+                 CFLAGS="$CFLAGS -I$MT_SEARCHPATH_HEADERS"
+@@ -41132,145 +20149,8 @@ else
+                 CPPFLAGS="$CPPFLAGS -I$MT_SEARCHPATH_HEADERS"
+                 unset ac_cv_header_sys_inotify_h
+                 as_ac_Header=`$as_echo "ac_cv_header_$MT_SEARCHPATH_HEADERS/sys/inotify.h" | $as_tr_sh`
+-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
+-  { $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/sys/inotify.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/sys/inotify.h... " >&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 $MT_SEARCHPATH_HEADERS/sys/inotify.h usability" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/sys/inotify.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 <$MT_SEARCHPATH_HEADERS/sys/inotify.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_cxx_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 $MT_SEARCHPATH_HEADERS/sys/inotify.h presence" >&5
+-$as_echo_n "checking $MT_SEARCHPATH_HEADERS/sys/inotify.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 <$MT_SEARCHPATH_HEADERS/sys/inotify.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_cxx_preproc_warn_flag$ac_cxx_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_cxx_preproc_warn_flag in
+-  yes:no: )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: proceeding with the compiler's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: proceeding with the compiler's result" >&2;}
+-    ac_header_preproc=yes
+-    ;;
+-  no:yes:* )
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: present but cannot be compiled" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: present but cannot be compiled" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h:     check for missing prerequisite headers?" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h:     check for missing prerequisite headers?" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: see the Autoconf documentation" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: see the Autoconf documentation" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h:     section \"Present But Cannot Be Compiled\"" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: proceeding with the preprocessor's result" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: proceeding with the preprocessor's result" >&2;}
+-    { $as_echo "$as_me:$LINENO: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: in the future, the compiler will take precedence" >&5
+-$as_echo "$as_me: WARNING: $MT_SEARCHPATH_HEADERS/sys/inotify.h: in the future, the compiler will take precedence" >&2;}
+-    ( cat <<\_ASBOX
+-## ------------------------------- ##
+-## Report this to jin at mediatomb.cc ##
+-## ------------------------------- ##
+-_ASBOX
+-     ) | sed "s/^/$as_me: WARNING:     /" >&2
+-    ;;
+-esac
+-{ $as_echo "$as_me:$LINENO: checking for $MT_SEARCHPATH_HEADERS/sys/inotify.h" >&5
+-$as_echo_n "checking for $MT_SEARCHPATH_HEADERS/sys/inotify.h... " >&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
 +ac_fn_cxx_check_header_mongrel "$LINENO" "$MT_SEARCHPATH_HEADERS/sys/inotify.h" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+
-+                        mt_inotify_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
-+
-+else
-+
-+                        mt_inotify_header_status=missing
-+
-+
-+fi
-+
-+
-+
-+
-+fi
-+
-+
-+    fi
-+
-+    if test "x$mt_inotify_header_status" != xyes; then
-+        mt_inotify_cxxflags=""
-+    fi
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+
-+    INOTIFY_CFLAGS=${mt_inotify_cxxflags}
-+    INOTIFY_STATUS=${mt_inotify_header_status}
-+
-+
-+
-+
-+fi
-+
-+if test "x$INOTIFY_STATUS" = xyes; then
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+ 
+                         mt_inotify_cxxflags="-I${MT_SEARCHPATH_HEADERS}"
+ 
+@@ -41309,102 +20189,12 @@ fi
+ fi
+ 
+ if test "x$INOTIFY_STATUS" = xyes; then
+-
+-for ac_func in inotify_init
+-do
+-as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
+-$as_echo_n "checking for $ac_func... " >&6; }
+-if { as_var=$as_ac_var; 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.  */
+-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
+-#define $ac_func innocuous_$ac_func
+-
+-/* System header to define __stub macros and hopefully few prototypes,
+-    which can conflict with char $ac_func (); below.
+-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+-    <limits.h> exists even on freestanding compilers.  */
+-
+-#ifdef __STDC__
+-# include <limits.h>
+-#else
+-# include <assert.h>
+-#endif
+-
+-#undef $ac_func
+-
+-/* Override any 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 $ac_func ();
+-/* 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_$ac_func || defined __stub___$ac_func
+-choke me
+-#endif
+-
+-int
+-main ()
+-{
+-return $ac_func ();
+-  ;
+-  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_cxx_werror_flag" ||
+-	 test ! -s conftest.err
+-       } && test -s conftest$ac_exeext && {
+-	 test "$cross_compiling" = yes ||
+-	 $as_test_x conftest$ac_exeext
+-       }; then
+-  eval "$as_ac_var=yes"
+-else
+-  $as_echo "$as_me: failed program was:" >&5
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	eval "$as_ac_var=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
+-ac_res=`eval 'as_val=${'$as_ac_var'}
+-		 $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_var'}
+-		 $as_echo "$as_val"'`
+-   if test "x$as_val" = x""yes; then
 +    for ac_func in inotify_init
 +do :
 +  ac_fn_cxx_check_func "$LINENO" "inotify_init" "ac_cv_func_inotify_init"
 +if test "x$ac_cv_func_inotify_init" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
+   cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define HAVE_INOTIFY_INIT 1
-+_ACEOF
-+
-+else
-+  INOTIFY_STATUS=missing
-+fi
-+done
-+
-+fi
-+
-+if test "x$INOTIFY_STATUS" = xyes; then
-+    CXXFLAGS="$CXXFLAGS $INOTIFY_CFLAGS"
-+    CFLAGS="$CFLAGS $INOTIFY_CFLAGS"
+ _ACEOF
+ 
+ else
+@@ -41417,27 +20207,23 @@ fi
+ if test "x$INOTIFY_STATUS" = xyes; then
+     CXXFLAGS="$CXXFLAGS $INOTIFY_CFLAGS"
+     CFLAGS="$CFLAGS $INOTIFY_CFLAGS"
+-    { $as_echo "$as_me:$LINENO: checking whether sys/inotify.h works" >&5
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether sys/inotify.h works" >&5
-+$as_echo_n "checking whether sys/inotify.h works... " >&6; }
+ $as_echo_n "checking whether sys/inotify.h works... " >&6; }
+-    if test "$cross_compiling" = yes; then
 +    if test "$cross_compiling" = yes; then :
-+
-+                    if ((test "x$INOTIFY_OPTION_REQUESTED" = xyes) &&
-+                        (test "x$INOTIFY_OPTION_ENABLED" = xyes)); then
+ 
+                     if ((test "x$INOTIFY_OPTION_REQUESTED" = xyes) &&
+                         (test "x$INOTIFY_OPTION_ENABLED" = xyes)); then
+-                       { $as_echo "$as_me:$LINENO: result: selecting yes for cross compiling" >&5
 +                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: selecting yes for cross compiling" >&5
-+$as_echo "selecting yes for cross compiling" >&6; }
-+                       INOTIFY_STATUS=yes
-+                    else
+ $as_echo "selecting yes for cross compiling" >&6; }
+                        INOTIFY_STATUS=yes
+                     else
+-                       { $as_echo "$as_me:$LINENO: result: selecting no for cross compiling" >&5
 +                       { $as_echo "$as_me:${as_lineno-$LINENO}: result: selecting no for cross compiling" >&5
-+$as_echo "selecting no for cross compiling" >&6; }
-+                       INOTIFY_STATUS=no
-+                    fi
-+
-+else
+ $as_echo "selecting no for cross compiling" >&6; }
+                        INOTIFY_STATUS=no
+                     fi
+ 
+ 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 <sys/inotify.h>
-+int
-+main ()
-+{
-+return (-1 == inotify_init());
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include <sys/inotify.h>
+ int
+@@ -41449,66 +20235,34 @@ return (-1 == inotify_init());
+   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_cxx_try_run "$LINENO"; then :
-+
+ 
+-                    { $as_echo "$as_me:$LINENO: result: yes" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; };
-+
+ $as_echo "yes" >&6; };
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define SYS_INOTIFY_H_OK 1
+-_ACEOF
 +$as_echo "#define SYS_INOTIFY_H_OK 1" >>confdefs.h
-+
-+else
-+
+ 
+ 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 )
+ 
+-                    { $as_echo "$as_me:$LINENO: result: no, using own inotify headers" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using own inotify headers" >&5
-+$as_echo "no, using own inotify headers" >&6; }
+ $as_echo "no, using own inotify headers" >&6; }
+-                    { $as_echo "$as_me:$LINENO: checking whether inotify-nosys.h works on this system" >&5
 +                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether inotify-nosys.h works on this system" >&5
-+$as_echo_n "checking whether inotify-nosys.h works on this system... " >&6; }
+ $as_echo_n "checking whether inotify-nosys.h works on this system... " >&6; }
+-                    if test "$cross_compiling" = yes; then
 +                    if test "$cross_compiling" = yes; then :
-+
-+                            if ((test "x$INOTIFY_OPTION_REQUESTED" = xyes) &&
-+                                (test "x$INOTIFY_OPTION_ENABLED" = xyes)); then
+ 
+                             if ((test "x$INOTIFY_OPTION_REQUESTED" = xyes) &&
+                                 (test "x$INOTIFY_OPTION_ENABLED" = xyes)); then
+-                                { $as_echo "$as_me:$LINENO: result: selecting yes for cross compiling" >&5
 +                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: selecting yes for cross compiling" >&5
-+$as_echo "selecting yes for cross compiling" >&6; }
-+                                INOTIFY_STATUS=yes
-+                            else
+ $as_echo "selecting yes for cross compiling" >&6; }
+                                 INOTIFY_STATUS=yes
+                             else
+-                                { $as_echo "$as_me:$LINENO: result: selecting no for cross compiling" >&5
 +                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: selecting no for cross compiling" >&5
-+$as_echo "selecting no for cross compiling" >&6; }
-+                                INOTIFY_STATUS=no
-+                            fi
-+
-+else
+ $as_echo "selecting no for cross compiling" >&6; }
+                                 INOTIFY_STATUS=no
+                             fi
+ 
+ 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 "src/inotify-nosys.h"
-+int
-+main ()
-+{
-+return (-1 == inotify_init());
-+
-+  ;
-+  return 0;
-+}
-+_ACEOF
+ /* end confdefs.h.  */
+ #include "src/inotify-nosys.h"
+ int
+@@ -41520,90 +20274,56 @@ return (-1 == inotify_init());
+   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_cxx_try_run "$LINENO"; then :
-+
+ 
+-                            { $as_echo "$as_me:$LINENO: result: yes" >&5
 +                            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+$as_echo "yes" >&6; };
-+
-+else
-+
-+                            if ((test "x$INOTIFY_OPTION_REQUESTED" != xyes) &&
-+                                (test "x$INOTIFY_OPTION_ENABLED" = xyes)); then
+ $as_echo "yes" >&6; };
+ 
+ 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 )
+ 
+                             if ((test "x$INOTIFY_OPTION_REQUESTED" != xyes) &&
+                                 (test "x$INOTIFY_OPTION_ENABLED" = xyes)); then
+-                                { $as_echo "$as_me:$LINENO: result: no, disabling inotify support" >&5
 +                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, disabling inotify support" >&5
-+$as_echo "no, disabling inotify support" >&6; }
-+                            elif ((test "x$INOTIFY_OPTION_REQUESTED" != xyes) &&
-+                               (test "x$INOTIFY_OPTION_ENABLED" != xyes)); then
+ $as_echo "no, disabling inotify support" >&6; }
+                             elif ((test "x$INOTIFY_OPTION_REQUESTED" != xyes) &&
+                                (test "x$INOTIFY_OPTION_ENABLED" != xyes)); then
+-                                { $as_echo "$as_me:$LINENO: result: no" >&5
 +                                { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+                            fi
-+                                INOTIFY_STATUS=no
-+
-+fi
+ $as_echo "no" >&6; }
+                             fi
+                                 INOTIFY_STATUS=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
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
-+fi
-+
-+
-+
-+fi
+ fi
+ 
+ 
+ 
+-
+ 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
-+
-+if test "x$INOTIFY_STATUS" = xyes; then
-+
+ fi
+ 
+-
+ fi
+ 
+ if test "x$INOTIFY_STATUS" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_INOTIFY 1
+-_ACEOF
 +$as_echo "#define HAVE_INOTIFY 1" >>confdefs.h
-+
-+
-+else
-+    if ((test "x$INOTIFY_OPTION_REQUESTED" = xyes) &&
-+        (test "x$INOTIFY_OPTION_ENABLED" = xyes)); then
+ 
+ 
+ else
+     if ((test "x$INOTIFY_OPTION_REQUESTED" = xyes) &&
+         (test "x$INOTIFY_OPTION_ENABLED" = xyes)); then
+-        { $as_echo "$as_me:$LINENO: enabling runtime inotify detection" >&5
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: enabling runtime inotify detection" >&5
-+$as_echo "$as_me: enabling runtime inotify detection" >&6;}
-+        # if system inotify header exists, go with it, otherwise take our own
-+        if test "x$ac_cv_header_sys_inotify_h" = xyes; then
-+
+ $as_echo "$as_me: enabling runtime inotify detection" >&6;}
+         # if system inotify header exists, go with it, otherwise take our own
+         if test "x$ac_cv_header_sys_inotify_h" = xyes; then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define SYS_INOTIFY_H_OK 1
+-_ACEOF
 +$as_echo "#define SYS_INOTIFY_H_OK 1" >>confdefs.h
-+
-+        fi
-+
+ 
+         fi
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_INOTIFY 1
+-_ACEOF
 +$as_echo "#define HAVE_INOTIFY 1" >>confdefs.h
-+
-+
-+        INOTIFY_STATUS=yes
-+    fi
-+fi
-+
-+LDFLAGS="$LDFLAGS_SAVE"
-+CPPFLAGS="$CPPFLAGS_SAVE"
-+CXXFLAGS="$CXXFLAGS_SAVE"
-+
-+
+ 
+ 
+         INOTIFY_STATUS=yes
+@@ -41615,14 +20335,10 @@ CPPFLAGS="$CPPFLAGS_SAVE"
+ CXXFLAGS="$CXXFLAGS_SAVE"
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define __STDC_CONSTANT_MACROS 1
+-_ACEOF
 +$as_echo "#define __STDC_CONSTANT_MACROS 1" >>confdefs.h
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define __STDC_LIMIT_MACROS 1
+-_ACEOF
 +$as_echo "#define __STDC_LIMIT_MACROS 1" >>confdefs.h
-+
-+
-+
-+    mt_libdvdnav_status=yes
-+    mt_libdvdnav_requested=no
-+
-+
-+
-+    mt_libdvdnav_option_enabled=
-+    mt_libdvdnav_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_libdvdnav_option_enabled=yes
-+    else
-+        mt_libdvdnav_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-libdvdnav was given.
-+if test "${enable_libdvdnav+set}" = set; then :
-+  enableval=$enable_libdvdnav;
-+            mt_libdvdnav_option_enabled=$enableval
-+            mt_libdvdnav_option_requested=yes
-+
-+
-+fi
-+
-+
-+    LIBDVDNAV_OPTION_ENABLED=${mt_libdvdnav_option_enabled}
-+    LIBDVDNAV_OPTION_REQUESTED=${mt_libdvdnav_option_requested}
-+
-+
-+
-+
-+    if test "x${mt_libdvdnav_option_enabled}" = xyes; then :
-+
-+fi
-+
-+    if test "x${LIBDVDNAV_OPTION_ENABLED}" = xyes; then
-+
-+    LIBS_SAVE=$LIBS
-+    LDFLAGS_SAVE=$LDFLAGS
-+    CFLAGS_SAVE=$CFLAGS
-+    CXXFLAGS_SAVE=$CXXFLAGS
-+    CPPFLAGS_SAVE=$CPPFLAGS
-+
-+
-+    mt_libdvdnav_config=none
-+    mt_libdvdnav_package_status=yes
-+
-+
-+# Check whether --with-libdvdnav-cfg was given.
-+if test "${with_libdvdnav_cfg+set}" = set; then :
-+  withval=$with_libdvdnav_cfg;
-+            mt_libdvdnav_search_config="$withval"
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: Will search for libdvdnav config in $withval" >&5
-+$as_echo "$as_me: Will search for libdvdnav config in $withval" >&6;}
-+
-+
-+fi
-+
-+
-+    if test -n "$mt_libdvdnav_search_config"; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: You specified ${mt_libdvdnav_search_config} for dvdnav-config" >&5
-+$as_echo "$as_me: You specified ${mt_libdvdnav_search_config} for dvdnav-config" >&6;}
-+        if test -f "$mt_libdvdnav_search_config"; then
-+            mt_libdvdnav_config=${mt_libdvdnav_search_config}
-+        else
-+            as_fn_error "${mt_libdvdnav_search_config} not found" "$LINENO" 5
-+        fi
-+
-+        mt_libdvdnav_version=`${mt_libdvdnav_config} --version 2>/dev/null`
-+        if test -z "$mt_libdvdnav_version"; then
-+            as_fn_error "${mt_libdvdnav_search_config} could not be executed or returned invalid values" "$LINENO" 5
-+        fi
-+    else
-+        # Extract the first word of "dvdnav-config", so it can be a program name with args.
-+set dummy dvdnav-config; ac_word=$2
-+{ $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_mt_libdvdnav_config+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $mt_libdvdnav_config in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_mt_libdvdnav_config="$mt_libdvdnav_config" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $PATH
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_mt_libdvdnav_config="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_mt_libdvdnav_config" && ac_cv_path_mt_libdvdnav_config="none"
-+  ;;
-+esac
-+fi
-+mt_libdvdnav_config=$ac_cv_path_mt_libdvdnav_config
-+if test -n "$mt_libdvdnav_config"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_libdvdnav_config" >&5
-+$as_echo "$mt_libdvdnav_config" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+        if test "x$mt_libdvdnav_config" = xnone; then
-+            unset ac_cv_path_mt_libdvdnav_config
-+            # Extract the first word of "dvdnav-config", so it can be a program name with args.
-+set dummy dvdnav-config; ac_word=$2
-+{ $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_mt_libdvdnav_config+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  case $mt_libdvdnav_config in
-+  [\\/]* | ?:[\\/]*)
-+  ac_cv_path_mt_libdvdnav_config="$mt_libdvdnav_config" # Let the user override the test with a path.
-+  ;;
-+  *)
-+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-+for as_dir in $MT_SEARCHPATH_PROGS
-+do
-+  IFS=$as_save_IFS
-+  test -z "$as_dir" && as_dir=.
-+    for ac_exec_ext in '' $ac_executable_extensions; do
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-+    ac_cv_path_mt_libdvdnav_config="$as_dir/$ac_word$ac_exec_ext"
-+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-+    break 2
-+  fi
-+done
-+  done
-+IFS=$as_save_IFS
-+
-+  test -z "$ac_cv_path_mt_libdvdnav_config" && ac_cv_path_mt_libdvdnav_config="none"
-+  ;;
-+esac
-+fi
-+mt_libdvdnav_config=$ac_cv_path_mt_libdvdnav_config
-+if test -n "$mt_libdvdnav_config"; then
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_libdvdnav_config" >&5
-+$as_echo "$mt_libdvdnav_config" >&6; }
-+else
-+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
-+fi
-+
-+
-+            if test "x$mt_libdvdnav_config" = xnone; then
-+                mt_libdvdnav_package_status=missing
-+                { $as_echo "$as_me:${as_lineno-$LINENO}: result: dvdnav-config not found, please install the libdvdnav devel package" >&5
-+$as_echo "dvdnav-config not found, please install the libdvdnav devel package" >&6; }
-+            fi
-+        fi
-+
-+        mt_libdvdnav_version=`${mt_libdvdnav_config} --version 2>/dev/null`
-+        if test -z "$mt_libdvdnav_version"; then
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: ${mt_libdvdnav_config} could not be executed or returned invalid values" >&5
-+$as_echo "$as_me: ${mt_libdvdnav_config} could not be executed or returned invalid values" >&6;}
-+            mt_libdvdnav_package_status=missing
-+        fi
-+    fi
-+    if test "x$mt_libdvdnav_package_status" = xyes; then
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking libdvdnav cflags" >&5
-+$as_echo_n "checking libdvdnav cflags... " >&6; }
-+        mt_libdvdnav_cxxflags=`${mt_libdvdnav_config} --cflags`
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_libdvdnav_cxxflags" >&5
-+$as_echo "$mt_libdvdnav_cxxflags" >&6; }
-+        mt_libdvdnav_libs=
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking libdvdnav libs" >&5
-+$as_echo_n "checking libdvdnav libs... " >&6; }
-+        if test -z "";  then
-+            mt_libdvdnav_libs=`${mt_libdvdnav_config} --libs`
-+        else
-+            mt_libdvdnav_libs=`${mt_libdvdnav_config} `
-+        fi
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $mt_libdvdnav_libs" >&5
-+$as_echo "$mt_libdvdnav_libs" >&6; }
-+    fi
-+
-+    if test "x$mt_libdvdnav_package_status" = xyes; then
-+        CPPFLAGS="$CPPFLAGS $mt_libdvdnav_cxxflags"
-+        CXXFLAGS="$CXXFLAGS $mt_libdvdnav_cxxflags"
-+        CFLAGS="$CFLAGS $mt_libdvdnav_cxxflags"
-+        for mt_u_header in dvdnav_dvdnav_h; do
-+            unset ac_cv_header_${mt_u_header}
-+        done
-+        for ac_header in dvdnav/dvdnav.h
-+do :
-+  ac_fn_cxx_check_header_mongrel "$LINENO" "dvdnav/dvdnav.h" "ac_cv_header_dvdnav_dvdnav_h" "$ac_includes_default"
-+if test "x$ac_cv_header_dvdnav_dvdnav_h" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_DVDNAV_DVDNAV_H 1
-+_ACEOF
-+
-+else
-+  mt_libdvdnav_package_status=missing
-+fi
-+
-+done
-+
-+    fi
-+
-+    if test "x$mt_libdvdnav_package_status" = xyes; then
-+        LIBS="$mt_libdvdnav_libs $LIBS"
-+        if test -z "dvdnav"; then
-+            unset ac_cv_func_dvdnav_get_audio_attr
-+            for ac_func in dvdnav_get_audio_attr
-+do :
-+  ac_fn_cxx_check_func "$LINENO" "dvdnav_get_audio_attr" "ac_cv_func_dvdnav_get_audio_attr"
-+if test "x$ac_cv_func_dvdnav_get_audio_attr" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_DVDNAV_GET_AUDIO_ATTR 1
-+_ACEOF
-+
-+else
-+  mt_libdvdnav_package_status=missing
-+fi
-+done
-+
-+        else
-+            unset ac_cv_lib_dvdnav_dvdnav_get_audio_attr
-+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dvdnav_get_audio_attr in -ldvdnav" >&5
-+$as_echo_n "checking for dvdnav_get_audio_attr in -ldvdnav... " >&6; }
-+if test "${ac_cv_lib_dvdnav_dvdnav_get_audio_attr+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldvdnav  $LIBS"
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* 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 dvdnav_get_audio_attr ();
-+int
-+main ()
-+{
-+return dvdnav_get_audio_attr ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+if ac_fn_cxx_try_link "$LINENO"; then :
-+  ac_cv_lib_dvdnav_dvdnav_get_audio_attr=yes
-+else
-+  ac_cv_lib_dvdnav_dvdnav_get_audio_attr=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_dvdnav_dvdnav_get_audio_attr" >&5
-+$as_echo "$ac_cv_lib_dvdnav_dvdnav_get_audio_attr" >&6; }
-+if test "x$ac_cv_lib_dvdnav_dvdnav_get_audio_attr" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBDVDNAV 1
-+_ACEOF
-+
-+  LIBS="-ldvdnav $LIBS"
-+
-+else
-+  mt_libdvdnav_package_status=missing
-+fi
-+
-+        fi
-+    fi
-+
-+    if test "x$mt_libdvdnav_package_status" = xyes; then
-+        LIBDVDNAV_CFLAGS=${mt_libdvdnav_cxxflags}
-+        LIBDVDNAV_LIBS=${mt_libdvdnav_libs}
-+        LIBDVDNAV_VERSION=${mt_libdvdnav_version}
-+    fi
-+
-+
-+    LIBS=$LIBS_SAVE
-+    LDFLAGS=$LDFLAGS_SAVE
-+    CFLAGS=$CFLAGS_SAVE
-+    CXXFLAGS=$CXXFLAGS_SAVE
-+    CPPFLAGS=$CPPFLAGS_SAVE
-+
-+        mt_libdvdnav_status=${mt_libdvdnav_package_status}
-+    else
-+        mt_libdvdnav_status=disabled
-+    fi
-+
-+    if ((test "x${LIBDVDNAV_OPTION_ENABLED}" = xyes) &&
-+        (test "x${LIBDVDNAV_OPTION_REQUESTED}" = xyes) &&
-+        (test "x$mt_libdvdnav_status" != xyes)); then
-+        as_fn_error "unable to configure libdvdnav support" "$LINENO" 5
-+    fi
-+
-+    if test "x$mt_libdvdnav_status" = xyes; then
-+
-+$as_echo "#define HAVE_LIBDVDNAV 1" >>confdefs.h
-+
-+    fi
-+
-+    LIBDVDNAV_STATUS=${mt_libdvdnav_status}
-+
-+
-+
-+
-+
-+
-+
-+#    AS_IF([test x"$mt_libdvdnav_status" = xyes], [], [])[]dnl
-+
-+
-+
-+
-+
-+    mt_tombdebug_option_enabled=
-+    mt_tombdebug_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_tombdebug_option_enabled=yes
-+    else
-+        mt_tombdebug_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-tombdebug was given.
+ 
+ 
+ #MT_CHECK_OPTIONAL_PACKAGE_CFG([libdvdnav], [enable],
+@@ -41642,7 +20358,7 @@ _ACEOF
+     fi
+ 
+     # Check whether --enable-tombdebug was given.
+-if test "${enable_tombdebug+set}" = set; then
 +if test "${enable_tombdebug+set}" = set; then :
-+  enableval=$enable_tombdebug;
-+            mt_tombdebug_option_enabled=$enableval
-+            mt_tombdebug_option_requested=yes
-+
-+
-+fi
-+
-+
-+    TOMBDEBUG_OPTION_ENABLED=${mt_tombdebug_option_enabled}
-+    TOMBDEBUG_OPTION_REQUESTED=${mt_tombdebug_option_requested}
-+
-+
-+
-+
+   enableval=$enable_tombdebug;
+             mt_tombdebug_option_enabled=$enableval
+             mt_tombdebug_option_requested=yes
+@@ -41657,19 +20373,16 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_tombdebug_option_enabled}" = xyes; then
 +    if test "x${mt_tombdebug_option_enabled}" = xyes; then :
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define TOMBDEBUG 1
+-_ACEOF
 +$as_echo "#define TOMBDEBUG 1" >>confdefs.h
-+
-+
-+fi
-+
-+
-+
-+    mt_upnpdebug_option_enabled=
-+    mt_upnpdebug_option_requested=no
-+    if test "xenable" = xdisable; then
-+        mt_upnpdebug_option_enabled=yes
-+    else
-+        mt_upnpdebug_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-upnpdebug was given.
+ 
+ 
+ fi
+ 
+ 
+ 
+-
+     mt_upnpdebug_option_enabled=
+     mt_upnpdebug_option_requested=no
+     if test "xenable" = xdisable; then
+@@ -41679,7 +20392,7 @@ fi
+     fi
+ 
+     # Check whether --enable-upnpdebug was given.
+-if test "${enable_upnpdebug+set}" = set; then
 +if test "${enable_upnpdebug+set}" = set; then :
-+  enableval=$enable_upnpdebug;
-+            mt_upnpdebug_option_enabled=$enableval
-+            mt_upnpdebug_option_requested=yes
-+
-+
-+fi
-+
-+
-+    UPNPDEBUG_OPTION_ENABLED=${mt_upnpdebug_option_enabled}
-+    UPNPDEBUG_OPTION_REQUESTED=${mt_upnpdebug_option_requested}
-+
-+
-+
-+
+   enableval=$enable_upnpdebug;
+             mt_upnpdebug_option_enabled=$enableval
+             mt_upnpdebug_option_requested=yes
+@@ -41694,28 +20407,21 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_upnpdebug_option_enabled}" = xyes; then
 +    if test "x${mt_upnpdebug_option_enabled}" = xyes; then :
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define UPNP_HAVE_DEBUG 1
+-_ACEOF
 +$as_echo "#define UPNP_HAVE_DEBUG 1" >>confdefs.h
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define DEBUG 1
+-_ACEOF
 +$as_echo "#define DEBUG 1" >>confdefs.h
-+
-+
-+fi
-+
-+if (test "x$TOMBDEBUG_OPTION_ENABLED" != xyes) &&
-+   (test "x$UPNPDEBUG_OPTION_ENABLED" != xyes); then
-+
+ 
+ 
+ fi
+ 
+-
+ if (test "x$TOMBDEBUG_OPTION_ENABLED" != xyes) &&
+    (test "x$UPNPDEBUG_OPTION_ENABLED" != xyes); then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define NDEBUG 1
+-_ACEOF
 +$as_echo "#define NDEBUG 1" >>confdefs.h
-+
-+fi
-+
-+
-+
-+    mt_log_option_enabled=
-+    mt_log_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_log_option_enabled=yes
-+    else
-+        mt_log_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-log was given.
+ 
+ fi
+ 
+@@ -41730,7 +20436,7 @@ fi
+     fi
+ 
+     # Check whether --enable-log was given.
+-if test "${enable_log+set}" = set; then
 +if test "${enable_log+set}" = set; then :
-+  enableval=$enable_log;
-+            mt_log_option_enabled=$enableval
-+            mt_log_option_requested=yes
-+
-+
-+fi
-+
-+
-+    LOG_OPTION_ENABLED=${mt_log_option_enabled}
-+    LOG_OPTION_REQUESTED=${mt_log_option_requested}
-+
-+
-+
-+
+   enableval=$enable_log;
+             mt_log_option_enabled=$enableval
+             mt_log_option_requested=yes
+@@ -41745,19 +20451,16 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_log_option_enabled}" = xyes; then
 +    if test "x${mt_log_option_enabled}" = xyes; then :
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define LOG_ENABLED 1
+-_ACEOF
 +$as_echo "#define LOG_ENABLED 1" >>confdefs.h
-+
-+
-+fi
-+
-+
-+
-+    mt_debug_log_option_enabled=
-+    mt_debug_log_option_requested=no
-+    if test "xdisable" = xdisable; then
-+        mt_debug_log_option_enabled=yes
-+    else
-+        mt_debug_log_option_enabled=no
-+    fi
-+
-+    # Check whether --enable-debug-log was given.
+ 
+ 
+ fi
+ 
+ 
+ 
+-
+     mt_debug_log_option_enabled=
+     mt_debug_log_option_requested=no
+     if test "xdisable" = xdisable; then
+@@ -41767,7 +20470,7 @@ fi
+     fi
+ 
+     # Check whether --enable-debug-log was given.
+-if test "${enable_debug_log+set}" = set; then
 +if test "${enable_debug_log+set}" = set; then :
-+  enableval=$enable_debug_log;
-+            mt_debug_log_option_enabled=$enableval
-+            mt_debug_log_option_requested=yes
-+
-+
-+fi
-+
-+
-+    DEBUG_LOG_OPTION_ENABLED=${mt_debug_log_option_enabled}
-+    DEBUG_LOG_OPTION_REQUESTED=${mt_debug_log_option_requested}
-+
-+
-+
-+
+   enableval=$enable_debug_log;
+             mt_debug_log_option_enabled=$enableval
+             mt_debug_log_option_requested=yes
+@@ -41782,18 +20485,15 @@ fi
+ 
+ 
+ 
+-    if test "x${mt_debug_log_option_enabled}" = xyes; then
 +    if test "x${mt_debug_log_option_enabled}" = xyes; then :
-+
-+
+ 
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define DEBUG_LOG_ENABLED 1
+-_ACEOF
 +$as_echo "#define DEBUG_LOG_ENABLED 1" >>confdefs.h
-+
-+
-+fi
-+
-+
-+eval PACKAGE_DATADIR="${datadir}/${PACKAGE}"
-+eval PACKAGE_DATADIR="${PACKAGE_DATADIR}"
-+
-+cat >>confdefs.h <<_ACEOF
-+#define PACKAGE_DATADIR "$PACKAGE_DATADIR"
-+_ACEOF
-+
-+
-+if (test "x$YOUTUBE_OPTION_ENABLED" = xyes) || (test "x$WEBORAMA_OPTION_ENABLED" = xyes) || (test "x$ATRAILERS_OPTION_ENABLED" = xyes) || (test "x$SOPCAST_OPTION_ENABLED" = xyes); then
-+
+ 
+ 
+ fi
+ 
+ 
+-
+ eval PACKAGE_DATADIR="${datadir}/${PACKAGE}"
+ eval PACKAGE_DATADIR="${PACKAGE_DATADIR}"
+ 
+@@ -41804,41 +20504,31 @@ _ACEOF
+ 
+ if (test "x$YOUTUBE_OPTION_ENABLED" = xyes) || (test "x$WEBORAMA_OPTION_ENABLED" = xyes) || (test "x$ATRAILERS_OPTION_ENABLED" = xyes) || (test "x$SOPCAST_OPTION_ENABLED" = xyes); then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ONLINE_SERVICES 1
+-_ACEOF
 +$as_echo "#define ONLINE_SERVICES 1" >>confdefs.h
-+
-+fi
-+
-+if (test "x$YOUTUBE_OPTION_ENABLED" = xyes); then
-+
+ 
+ fi
+ 
+ if (test "x$YOUTUBE_OPTION_ENABLED" = xyes); then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define YOUTUBE 1
+-_ACEOF
 +$as_echo "#define YOUTUBE 1" >>confdefs.h
-+
-+fi
-+
-+if (test "x$WEBORAMA_OPTION_ENABLED" = xyes); then
-+
+ 
+ fi
+ 
+ if (test "x$WEBORAMA_OPTION_ENABLED" = xyes); then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define WEBORAMA 1
+-_ACEOF
 +$as_echo "#define WEBORAMA 1" >>confdefs.h
-+
-+fi
-+
-+if (test "x$ATRAILERS_OPTION_ENABLED" = xyes); then
-+
+ 
+ fi
+ 
+ if (test "x$ATRAILERS_OPTION_ENABLED" = xyes); then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define ATRAILERS 1
+-_ACEOF
 +$as_echo "#define ATRAILERS 1" >>confdefs.h
-+
-+fi
-+
-+if (test "x$SOPCAST_OPTION_ENABLED" = xyes); then
-+
+ 
+ fi
+ 
+ if (test "x$SOPCAST_OPTION_ENABLED" = xyes); then
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define SOPCAST 1
+-_ACEOF
 +$as_echo "#define SOPCAST 1" >>confdefs.h
-+
-+fi
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define COMPILE_INFO "host: $host; sqlite3: $SQLITE3_STATUS; mysql: $MYSQL_STATUS libjs: $JS_OK; libmagic: $LIBMAGIC_STATUS; inotify: $INOTIFY_STATUS; libexif: $LIBEXIF_STATUS; id3lib: $ID3LIB_STATUS; taglib: $TAGLIB_STATUS; ffmpeg: $FFMPEG_STATUS; libmp4v2: $LIBMP4V2_STATUS; external transcoding: $EXTERNAL_TRANSCODING_OPTION_ENABLED; curl: $CURL_OK; YouTube: $YOUTUBE_OPTION_ENABLED; SopCast: $SOPCAST_OPTION_ENABLED; Weborama: $WEBORAMA_OPTION_ENABLED; Apple Trailers: $ATRAILERS_OPTION_ENABLED; libdvdnav: $LIBDVDNAV_STATUS; libextractor: $LIBEXTRACTOR_STATUS; db-autocreate: $DB_AUTOCREATE_OPTION_ENABLED; debug log: $DEBUG_LOG_OPTION_ENABLED; protocol info extensions: $PROTOCOLINFO_EXTENSION_OPTION_ENABLED; data directory: $PACKAGE_DATADIR; ffmpegthumbnailer: $FFMPEGTHUMBNAILER_STATUS"
-+_ACEOF
-+
-+
-+###############
-+ac_config_files="$ac_config_files Makefile build/Makefile doc/Makefile scripts/Makefile scripts/js/Makefile scripts/mediatomb-service-optware tombupnp/Makefile tombupnp/build/Makefile web/Makefile config/Makefile artwork/Makefile mediatomb.spec"
-+
-+
-+cat >confcache <<\_ACEOF
-+# This file is a shell script that caches the results of configure
-+# tests run on this system so they can be shared between configure
-+# scripts and configure runs, see configure's option --config-cache.
-+# It is not useful on other systems.  If it contains results you don't
-+# want to keep, you may remove or edit it.
-+#
-+# config.status only pays attention to the cache file if you give it
-+# the --recheck option to rerun configure.
-+#
-+# `ac_cv_env_foo' variables (set or unset) will be overridden when
-+# loading this file, other *unset* `ac_cv_foo' will be assigned the
-+# following values.
-+
-+_ACEOF
-+
-+# The following way of writing the cache mishandles newlines in values,
-+# but we know of no workaround that is simple, portable, and efficient.
-+# So, we kill variables containing newlines.
-+# Ultrix sh set writes to stderr and can't be redirected directly,
-+# and sets the high bit in the cache file unless we assign to the vars.
-+(
-+  for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do
-+    eval ac_val=\$$ac_var
-+    case $ac_val in #(
-+    *${as_nl}*)
-+      case $ac_var in #(
+ 
+ fi
+ 
+@@ -41879,13 +20569,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_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
-+
-+  (set) 2>&1 |
-+    case $as_nl`(ac_space=' '; set) 2>&1` in #(
-+    *${as_nl}ac_space=\ *)
+       esac ;;
+     esac
+   done
+@@ -41893,8 +20583,8 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+   (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"
-+      ;; #(
-+    *)
-+      # `set' quotes correctly as required by POSIX, so do not add quotes.
-+      sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p"
-+      ;;
-+    esac |
-+    sort
-+) |
-+  sed '
-+     /^ac_cv_env_/b end
-+     t clear
-+     :clear
-+     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-+     t end
-+     s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-+     :end' >>confcache
-+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
-+  if test -w "$cache_file"; then
-+    test "x$cache_file" != "x/dev/null" &&
+       sed -n \
+ 	"s/'/'\\\\''/g;
+ 	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
+@@ -41917,11 +20607,11 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ 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: 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
-+rm -f confcache
-+
-+test "x$prefix" = xNONE && prefix=$ac_default_prefix
-+# Let make expand exec_prefix.
-+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-+
-+DEFS=-DHAVE_CONFIG_H
-+
-+ac_libobjs=
-+ac_ltlibobjs=
-+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-+  # 1. Remove the extension, and $U if already installed.
-+  ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
-+  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.
+ $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+   fi
+ fi
+@@ -41935,14 +20625,15 @@ DEFS=-DHAVE_CONFIG_H
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
++U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+   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
-+
-+LTLIBOBJS=$ac_ltlibobjs
-+
-+
-+ if test -n "$EXEEXT"; then
-+  am__EXEEXT_TRUE=
-+  am__EXEEXT_FALSE='#'
-+else
-+  am__EXEEXT_TRUE='#'
-+  am__EXEEXT_FALSE=
-+fi
-+
-+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-+  as_fn_error "conditional \"AMDEP\" was never defined.
+ done
+ LIBOBJS=$ac_libobjs
+ 
+@@ -41958,25 +20649,16 @@ 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__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-+  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+ fi
+ if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
+-  { { $as_echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&5
+-$as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
+-Usually this means the macro was only invoked conditionally." >&2;}
+-   { (exit 1); exit 1; }; }
++  as_fn_error $? "conditional \"am__fastdepCXX\" 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_fn_error "conditional \"am__fastdepCC\" was never defined.
+ 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
-+
-+
-+: ${CONFIG_STATUS=./config.status}
-+ac_write_fail=0
-+ac_clean_files_save=$ac_clean_files
-+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+ fi
+ 
+ 
+@@ -41984,9 +20666,10 @@ fi
+ 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;}
+ $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.
-+# Compiler output produced by configure, useful for debugging
-+# configure, is in config.log if it exists.
-+
-+debug=false
-+ac_cs_recheck=false
-+ac_cs_silent=false
-+
+ #! $SHELL
+ # Generated by $as_me.
+ # Run this file to recreate the current configuration.
+@@ -41996,17 +20679,18 @@ cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ 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
@@ -27825,33 +38792,48 @@ Patch that applies changes after `autoreconf -fi` is done.
 +## -------------------- ##
 +## M4sh Initialization. ##
 +## -------------------- ##
-+
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
+ 
+ # 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
-+  # is contrary to our usage.  Disable this feature.
-+  alias -g '${1+"$@"}'='"$@"'
-+  setopt NO_GLOB_SUBST
-+else
+   emulate sh
+   NULLCMD=:
+   # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+@@ -42014,23 +20698,15 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+   alias -g '${1+"$@"}'='"$@"'
+   setopt NO_GLOB_SUBST
+ else
+-  case `(set -o) 2>/dev/null` in
+-  *posix*) set -o posix ;;
 +  case `(set -o) 2>/dev/null` in #(
 +  *posix*) :
 +    set -o posix ;; #(
 +  *) :
 +     ;;
-+esac
-+fi
-+
-+
-+as_nl='
-+'
-+export as_nl
-+# Printing a long string crashes Solaris 7 /usr/bin/printf.
-+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
+ 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
+@@ -42038,7 +20714,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" \
@@ -27859,71 +38841,62 @@ Patch that applies changes after `autoreconf -fi` is done.
 +  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
-+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
-+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
-+    as_echo_n='/usr/ucb/echo -n'
-+  else
-+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
-+    as_echo_n_body='eval
-+      arg=$1;
+   as_echo='printf %s\n'
+   as_echo_n='printf %s'
+ else
+@@ -42049,7 +20731,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\\(.*\\)"`;;
-+      esac;
-+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
-+    '
-+    export as_echo_n_body
-+    as_echo_n='sh -c $as_echo_n_body as_echo'
-+  fi
-+  export as_echo_body
-+  as_echo='sh -c $as_echo_body as_echo'
-+fi
-+
-+# The user is always right.
-+if test "${PATH_SEPARATOR+set}" != set; then
-+  PATH_SEPARATOR=:
-+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
-+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
-+      PATH_SEPARATOR=';'
-+  }
-+fi
-+
-+
-+# IFS
-+# We need space, tab and new line, in precisely that order.  Quoting is
-+# there to prevent editors from complaining about space-tab.
-+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-+# splitting by setting IFS to empty value.)
-+IFS=" ""	$as_nl"
-+
-+# Find who we are.  Look in the path if we contain no directory separator.
+       *"$as_nl"*)
+ 	expr "X$arg" : "X\\(.*\\)$as_nl";
+ 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+@@ -42072,13 +20754,6 @@ if test "${PATH_SEPARATOR+set}" != set; then
+   }
+ 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
+@@ -42088,15 +20763,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=.
+   *[\\/]* ) 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
-+
-+     ;;
-+esac
-+# We did not find ourselves, most probably we were run as `sh COMMAND'
-+# in which case we are not to be found in the path.
-+if test "x$as_myself" = x; then
-+  as_myself=$0
-+fi
-+if test ! -f "$as_myself"; then
-+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ IFS=$as_save_IFS
+ 
+      ;;
+@@ -42108,12 +20783,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
-+
+ 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
@@ -27931,34 +38904,31 @@ Patch that applies changes after `autoreconf -fi` is done.
 +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='> '
-+PS4='+ '
-+
-+# NLS nuisances.
-+LC_ALL=C
-+export LC_ALL
-+LANGUAGE=C
-+export LANGUAGE
-+
+ done
+ PS1='$ '
+ PS2='> '
+@@ -42125,7 +20804,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]
-+# ---------------------------------
++# as_fn_error STATUS 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.
++# 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
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 +  fi
-+  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&2
 +  as_fn_exit $as_status
 +} # as_fn_error
 +
@@ -28025,91 +38995,115 @@ Patch that applies changes after `autoreconf -fi` is done.
 +fi # as_fn_arith
 +
 +
-+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
-+
+ if expr a : '\(a\)' >/dev/null 2>&1 &&
+    test "X`expr 00001 : '.*\(...\)'`" = X001; then
+   as_expr=expr
+@@ -42139,8 +20900,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
-+
-+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'`
-+
+ 
+-# Name of the executable.
+ as_me=`$as_basename -- "$0" ||
+ $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+ 	 X"$0" : 'X\(//\)$' \| \
+@@ -42160,76 +20925,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=
+ 
+ ECHO_C= ECHO_N= ECHO_T=
+-case `echo -n x` in
 +case `echo -n x` in #(((((
-+-n*)
+ -n*)
+-  case `echo 'x\c'` in
 +  case `echo 'xy\c'` in
-+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+   *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
-+
-+rm -f conf$$ conf$$.exe conf$$.file
-+if test -d conf$$.dir; then
-+  rm -f conf$$.dir/conf$$.file
-+else
-+  rm -f conf$$.dir
-+  mkdir conf$$.dir 2>/dev/null
-+fi
-+if (echo >conf$$.file) 2>/dev/null; then
-+  if ln -s conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s='ln -s'
-+    # ... but there are two gotchas:
-+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-+    # In both cases, we have to default to `cp -p'.
-+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-+      as_ln_s='cp -p'
-+  elif ln conf$$.file conf$$ 2>/dev/null; then
-+    as_ln_s=ln
-+  else
-+    as_ln_s='cp -p'
-+  fi
-+else
-+  as_ln_s='cp -p'
-+fi
-+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-+rmdir conf$$.dir 2>/dev/null
-+
+   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
+@@ -42258,8 +20972,56 @@ fi
+ rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+ rmdir conf$$.dir 2>/dev/null
+ 
 +
 +# as_fn_mkdir_p
 +# -------------
@@ -28154,310 +39148,198 @@ Patch that applies changes after `autoreconf -fi` is done.
 +      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"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
 +
 +
 +} # as_fn_mkdir_p
-+if mkdir -p . 2>/dev/null; then
+ 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
-+fi
-+
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
-+else
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+	test -d "$1/.";
-+      else
+ else
+   test -d ./-p && rmdir ./-p
+   as_mkdir_p=false
+@@ -42278,10 +21040,10 @@ else
+       if test -d "$1"; then
+ 	test -d "$1/.";
+       else
+-	case $1 in
 +	case $1 in #(
-+	-*)set "./$1";;
-+	esac;
+ 	-*)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
-+  '
-+fi
-+as_executable_p=$as_test_x
-+
-+# Sed expression to map a string onto a valid CPP name.
-+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-+
-+# Sed expression to map a string onto a valid variable name.
-+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-+
-+
-+exec 6>&1
+ 	???[sx]*):;;*)false;;esac;fi
+     '\'' sh
+   '
+@@ -42296,13 +21058,19 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+ 
+ 
+ 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 MediaTomb $as_me 0.12.0, which was
-+generated by GNU Autoconf 2.65.  Invocation command line was
-+
-+  CONFIG_FILES    = $CONFIG_FILES
-+  CONFIG_HEADERS  = $CONFIG_HEADERS
-+  CONFIG_LINKS    = $CONFIG_LINKS
-+  CONFIG_COMMANDS = $CONFIG_COMMANDS
-+  $ $0 $@
-+
-+on `(hostname || uname -n) 2>/dev/null | sed 1q`
-+"
-+
-+_ACEOF
-+
-+case $ac_config_files in *"
-+"*) set x $ac_config_files; shift; ac_config_files=$*;;
-+esac
-+
-+case $ac_config_headers in *"
-+"*) set x $ac_config_headers; shift; ac_config_headers=$*;;
-+esac
-+
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+# Files that config.status was made for.
-+config_files="$ac_config_files"
-+config_headers="$ac_config_headers"
-+config_commands="$ac_config_commands"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+ac_cs_usage="\
+ # report actual input values of CONFIG_FILES etc. instead of their
+ # values after options handling.
+ ac_log="
+ This file was extended by MediaTomb $as_me 0.12.1, which was
+-generated by GNU Autoconf 2.63.  Invocation command line was
++generated by GNU Autoconf 2.67.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -42334,13 +21102,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
+ 
+   -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
-+      --recheck    update $as_me by reconfiguring in the same conditions
-+      --file=FILE[:TEMPLATE]
-+                   instantiate the configuration file FILE
-+      --header=FILE[:TEMPLATE]
-+                   instantiate the configuration header FILE
-+
-+Configuration files:
-+$config_files
-+
-+Configuration headers:
-+$config_headers
-+
-+Configuration commands:
-+$config_commands
-+
+   -q, --quiet, --silent
+                    do not print progress messages
+   -d, --debug      don't remove temporary files
+@@ -42359,16 +21129,17 @@ $config_headers
+ Configuration commands:
+ $config_commands
+ 
+-Report bugs to <bug-autoconf at gnu.org>."
 +Report bugs to <jin at mediatomb.cc>."
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ 
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-+ac_cs_version="\\
-+MediaTomb config.status 0.12.0
-+configured by $0, generated by GNU Autoconf 2.65,
+ ac_cs_version="\\
+ MediaTomb config.status 0.12.1
+-configured by $0, generated by GNU Autoconf 2.63,
+-  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
++configured by $0, generated by GNU Autoconf 2.67,
 +  with options \\"\$ac_cs_config\\"
-+
-+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."
-+
-+ac_pwd='$ac_pwd'
-+srcdir='$srcdir'
-+INSTALL='$INSTALL'
-+MKDIR_P='$MKDIR_P'
-+AWK='$AWK'
-+test -n "\$AWK" || AWK=awk
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# The default lists apply if the user does not specify any file.
-+ac_need_defaults=:
-+while test $# != 0
-+do
-+  case $1 in
-+  --*=*)
+ 
+-Copyright (C) 2008 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+@@ -42386,11 +21157,16 @@ ac_need_defaults=:
+ while test $# != 0
+ do
+   case $1 in
+-  --*=*)
++  --*=?*)
+     ac_option=`expr "X$1" : 'X\([^=]*\)='`
+     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
++  --*=)
 +    ac_option=`expr "X$1" : 'X\([^=]*\)='`
-+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
++    ac_optarg=
 +    ac_shift=:
 +    ;;
-+  *)
-+    ac_option=$1
-+    ac_optarg=$2
-+    ac_shift=shift
-+    ;;
-+  esac
-+
-+  case $ac_option in
-+  # Handling of the options.
-+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+    ac_cs_recheck=: ;;
-+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-+    $as_echo "$ac_cs_version"; exit ;;
+   *)
+     ac_option=$1
+     ac_optarg=$2
+@@ -42404,27 +21180,29 @@ 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 )
-+    $ac_shift
-+    case $ac_optarg in
-+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
-+    esac
+   --debug | --debu | --deb | --de | --d | -d )
+     debug=: ;;
+   --file | --fil | --fi | --f )
+     $ac_shift
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    '') as_fn_error $? "missing file argument" ;;
+     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
+     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_fn_error "ambiguous option: \`$1'
+     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 \
-+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-+    ac_cs_silent=: ;;
-+
-+  # This is an error.
-+  -*) as_fn_error "unrecognized option: \`$1'
+   --help | --hel | -h )
+     $as_echo "$ac_cs_usage"; exit ;;
+   -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+@@ -42432,11 +21210,10 @@ Try \`$0 --help' for more information." >&2
+     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
-+  shift
-+done
-+
-+ac_configure_extra_args=
-+
-+if $ac_cs_silent; then
-+  exec 6>/dev/null
-+  ac_configure_extra_args="$ac_configure_extra_args --silent"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+if \$ac_cs_recheck; then
-+  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-+  shift
-+  \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-+  CONFIG_SHELL='$SHELL'
-+  export CONFIG_SHELL
-+  exec "\$@"
-+fi
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+exec 5>>config.log
-+{
-+  echo
-+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-+## Running $as_me. ##
-+_ASBOX
-+  $as_echo "$ac_log"
-+} >&5
-+
-+_ACEOF
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+#
-+# INIT-COMMANDS
-+#
-+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-+
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+
-+# Handling of arguments.
-+for ac_config_target in $ac_config_targets
-+do
-+  case $ac_config_target in
-+    "autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS autoconfig.h" ;;
-+    "tombupnp/upnp/inc/upnpconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS tombupnp/upnp/inc/upnpconfig.h" ;;
-+    "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-+    "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-+    "build/Makefile") CONFIG_FILES="$CONFIG_FILES build/Makefile" ;;
-+    "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-+    "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;;
-+    "scripts/js/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/js/Makefile" ;;
-+    "scripts/mediatomb-service-optware") CONFIG_FILES="$CONFIG_FILES scripts/mediatomb-service-optware" ;;
-+    "tombupnp/Makefile") CONFIG_FILES="$CONFIG_FILES tombupnp/Makefile" ;;
-+    "tombupnp/build/Makefile") CONFIG_FILES="$CONFIG_FILES tombupnp/build/Makefile" ;;
-+    "web/Makefile") CONFIG_FILES="$CONFIG_FILES web/Makefile" ;;
-+    "config/Makefile") CONFIG_FILES="$CONFIG_FILES config/Makefile" ;;
-+    "artwork/Makefile") CONFIG_FILES="$CONFIG_FILES artwork/Makefile" ;;
-+    "mediatomb.spec") CONFIG_FILES="$CONFIG_FILES mediatomb.spec" ;;
-+
-+  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
-+  esac
-+done
-+
-+
-+# If the user did not use the arguments to specify the items to instantiate,
-+# then the envvar interface is used.  Set only those that are not.
-+# We use the long form for the default assignment because of an extremely
-+# bizarre bug on SunOS 4.1.3.
-+if $ac_need_defaults; then
-+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-+  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-+  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-+fi
-+
-+# Have a temporary directory for convenience.  Make it in the build tree
-+# simply because there is no reason against having it here, and in addition,
-+# creating and moving files from /tmp can sometimes cause problems.
-+# Hook for its removal unless debugging.
-+# Note that there is a small window in which the directory will not be cleaned:
-+# after its creation but before its name has been assigned to `$tmp'.
-+$debug ||
-+{
-+  tmp=
-+  trap 'exit_status=$?
-+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-+' 0
+      ac_need_defaults=false ;;
+ 
+   esac
+@@ -42503,9 +21280,7 @@ do
+     "artwork/Makefile") CONFIG_FILES="$CONFIG_FILES artwork/Makefile" ;;
+     "mediatomb.spec") CONFIG_FILES="$CONFIG_FILES mediatomb.spec" ;;
+ 
+-  *) { { $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
+ 
+@@ -42532,7 +21307,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.
-+
-+{
-+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-+  test -n "$tmp" && test -d "$tmp"
-+}  ||
-+{
-+  tmp=./conf$$-$RANDOM
-+  (umask 077 && mkdir "$tmp")
-+} || 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.
-+# This happens for instance with `./config.status config.h'.
-+if test -n "$CONFIG_FILES"; then
-+
-+
+ }
+ # Create a (secure) tmp directory for tmp files.
+ 
+@@ -42543,11 +21318,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.
+@@ -42555,7 +21326,13 @@ $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
@@ -28465,10272 +39347,553 @@ Patch that applies changes after `autoreconf -fi` is done.
 +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'
-+else
-+  ac_cs_awk_cr=$ac_cr
-+fi
-+
-+echo 'BEGIN {' >"$tmp/subs1.awk" &&
-+_ACEOF
-+
-+
-+{
-+  echo "cat >conf$$subs.awk <<_ACEOF" &&
-+  echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
-+  echo "_ACEOF"
-+} >conf$$subs.sh ||
-+  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_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_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+rm -f conf$$subs.sh
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
-+_ACEOF
-+sed -n '
-+h
-+s/^/S["/; s/!.*/"]=/
-+p
-+g
-+s/^[^!]*!//
-+:repl
-+t repl
-+s/'"$ac_delim"'$//
-+t delim
-+:nl
-+h
+ 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'
+@@ -42572,24 +21349,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; }; }
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++  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
+@@ -42611,7 +21382,7 @@ s/'"$ac_delim"'$//
+ t delim
+ :nl
+ h
+-s/\(.\{148\}\).*/\1/
 +s/\(.\{148\}\)..*/\1/
-+t more1
-+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
-+p
-+n
-+b repl
-+:more1
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t nl
-+:delim
-+h
+ t more1
+ s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+ p
+@@ -42625,7 +21396,7 @@ s/.\{148\}//
+ t nl
+ :delim
+ h
+-s/\(.\{148\}\).*/\1/
 +s/\(.\{148\}\)..*/\1/
-+t more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"/
-+p
-+b
-+:more2
-+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
-+p
-+g
-+s/.\{148\}//
-+t delim
-+' <conf$$subs.awk | sed '
-+/^[^""]/{
-+  N
-+  s/\n//
-+}
-+' >>$CONFIG_STATUS || ac_write_fail=1
-+rm -f conf$$subs.awk
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+_ACAWK
-+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
-+  for (key in S) S_is_set[key] = 1
-+  FS = ""
-+
-+}
-+{
-+  line = $ 0
-+  nfields = split(line, field, "@")
-+  substed = 0
-+  len = length(field[1])
-+  for (i = 2; i < nfields; i++) {
-+    key = field[i]
-+    keylen = length(key)
-+    if (S_is_set[key]) {
-+      value = S[key]
-+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
-+      len += length(value) + length(field[++i])
-+      substed = 1
-+    } else
-+      len += 1 + keylen
-+  }
-+
-+  print line
-+}
-+
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
-+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
-+else
-+  cat
-+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-+  || as_fn_error "could not setup config files machinery" "$LINENO" 5
-+_ACEOF
-+
-+# VPATH may cause trouble with some makes, so we remove $(srcdir),
-+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-+# trailing colons and then remove the whole line if VPATH becomes empty
-+# (actually we leave an empty line to preserve line numbers).
-+if test "x$srcdir" = x.; then
-+  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-+s/:*\$(srcdir):*/:/
-+s/:*\${srcdir}:*/:/
-+s/:*@srcdir@:*/:/
-+s/^\([^=]*=[	 ]*\):*/\1/
-+s/:*$//
-+s/^[^=]*=[	 ]*$//
-+}'
-+fi
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+fi # test -n "$CONFIG_FILES"
-+
-+# Set up the scripts for CONFIG_HEADERS section.
-+# No need to generate them if there are no CONFIG_HEADERS.
-+# This happens for instance with `./config.status Makefile'.
-+if test -n "$CONFIG_HEADERS"; then
-+cat >"$tmp/defines.awk" <<\_ACAWK ||
-+BEGIN {
-+_ACEOF
-+
-+# Transform confdefs.h into an awk script `defines.awk', embedded as
-+# here-document in config.status, that substitutes the proper values into
-+# config.h.in to produce config.h.
-+
-+# Create a delimiter string that does not exist in confdefs.h, to ease
-+# handling of long lines.
-+ac_delim='%!_!# '
-+for ac_last_try in false false :; do
-+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-+  if test -z "$ac_t"; then
-+    break
-+  elif $ac_last_try; then
-+    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
-+  else
-+    ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
-+  fi
-+done
-+
-+# For the awk script, D is an array of macro values keyed by name,
-+# likewise P contains macro parameters if any.  Preserve backslash
-+# newline sequences.
-+
-+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
-+sed -n '
-+s/.\{148\}/&'"$ac_delim"'/g
-+t rset
-+:rset
-+s/^[	 ]*#[	 ]*define[	 ][	 ]*/ /
-+t def
-+d
-+:def
-+s/\\$//
-+t bsnl
-+s/["\\]/\\&/g
-+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-+D["\1"]=" \3"/p
-+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2"/p
-+d
-+:bsnl
-+s/["\\]/\\&/g
-+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[	 ]*\(.*\)/P["\1"]="\2"\
-+D["\1"]=" \3\\\\\\n"\\/p
-+t cont
-+s/^ \('"$ac_word_re"'\)[	 ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p
-+t cont
-+d
-+:cont
-+n
-+s/.\{148\}/&'"$ac_delim"'/g
-+t clear
-+:clear
-+s/\\$//
-+t bsnlc
-+s/["\\]/\\&/g; s/^/"/; s/$/"/p
-+d
-+:bsnlc
-+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
-+b cont
-+' <confdefs.h | sed '
-+s/'"$ac_delim"'/"\\\
-+"/g' >>$CONFIG_STATUS || ac_write_fail=1
-+
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+  for (key in D) D_is_set[key] = 1
-+  FS = ""
-+}
-+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ {
-+  line = \$ 0
-+  split(line, arg, " ")
-+  if (arg[1] == "#") {
-+    defundef = arg[2]
-+    mac1 = arg[3]
-+  } else {
-+    defundef = substr(arg[1], 2)
-+    mac1 = arg[2]
-+  }
-+  split(mac1, mac2, "(") #)
-+  macro = mac2[1]
-+  prefix = substr(line, 1, index(line, defundef) - 1)
-+  if (D_is_set[macro]) {
-+    # Preserve the white space surrounding the "#".
-+    print prefix "define", macro P[macro] D[macro]
-+    next
-+  } else {
-+    # Replace #undef with comments.  This is necessary, for example,
-+    # in the case of _POSIX_SOURCE, which is predefined and required
-+    # on some systems where configure will not decide to define it.
-+    if (defundef == "undef") {
-+      print "/*", prefix defundef, macro, "*/"
-+      next
-+    }
-+  }
-+}
-+{ print }
-+_ACAWK
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+  as_fn_error "could not setup config headers machinery" "$LINENO" 5
-+fi # test -n "$CONFIG_HEADERS"
-+
-+
-+eval set X "  :F $CONFIG_FILES  :H $CONFIG_HEADERS    :C $CONFIG_COMMANDS"
-+shift
-+for ac_tag
-+do
-+  case $ac_tag in
-+  :[FHLC]) ac_mode=$ac_tag; continue;;
-+  esac
-+  case $ac_mode$ac_tag in
-+  :[FHL]*:*);;
-+  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
-+  :[FH]-) ac_tag=-:-;;
-+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-+  esac
-+  ac_save_IFS=$IFS
-+  IFS=:
-+  set x $ac_tag
-+  IFS=$ac_save_IFS
-+  shift
-+  ac_file=$1
-+  shift
-+
-+  case $ac_mode in
-+  :L) ac_source=$1;;
-+  :[FH])
-+    ac_file_inputs=
-+    for ac_f
-+    do
-+      case $ac_f in
-+      -) ac_f="$tmp/stdin";;
-+      *) # Look for the file first in the build tree, then in the source tree
-+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
-+	 # because $ac_f cannot contain `:'.
-+	 test -f "$ac_f" ||
-+	   case $ac_f in
-+	   [\\/$]*) false;;
-+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
-+	   esac ||
-+	   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
+ t more2
+ s/["\\]/\\&/g; s/^/"/; s/$/"/
+ p
+@@ -42678,22 +21449,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ 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),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/
+-s/:*\${srcdir}:*/:/
+-s/:*@srcdir@:*/:/
+-s/^\([^=]*=[	 ]*\):*/\1/
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
++h
++s///
++s/^/:/
++s/[	 ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
+ s/:*$//
++x
++s/\(=[	 ]*\).*/\1/
++G
++s/\n//
+ s/^[^=]*=[	 ]*$//
+ }'
+ fi
+@@ -42721,9 +21498,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
+@@ -42808,9 +21583,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ _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"
+ 
+ 
+@@ -42823,9 +21596,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
+@@ -42853,12 +21624,10 @@ $as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
+ 	   [\\/$]*) 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 1 "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
-+    # use $as_me), people would be surprised to read:
-+    #    /* config.h.  Generated by config.status.  */
-+    configure_input='Generated from '`
-+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
-+	`' by configure.'
-+    if test x"$ac_file" != x-; then
-+      configure_input="$ac_file.  $configure_input"
+     done
+ 
+     # Let's still pretend it is `configure' which instantiates (i.e., don't
+@@ -42869,7 +21638,7 @@ $as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ 	`' 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.
-+    case $configure_input in #(
-+    *\&* | *\|* | *\\* )
-+       ac_sed_conf_input=`$as_echo "$configure_input" |
-+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
-+    *) ac_sed_conf_input=$configure_input;;
-+    esac
-+
-+    case $ac_tag in
-+    *:-:* | *:-) cat >"$tmp/stdin" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
-+    esac
-+    ;;
-+  esac
-+
-+  ac_dir=`$as_dirname -- "$ac_file" ||
-+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$ac_file" : 'X\(//\)[^/]' \| \
-+	 X"$ac_file" : 'X\(//\)$' \| \
-+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$ac_file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
+ $as_echo "$as_me: creating $ac_file" >&6;}
+     fi
+     # Neutralize special characters interpreted by sed in replacement strings.
+@@ -42882,9 +21651,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
+@@ -42912,47 +21679,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
-+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+*)
-+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
-+  # A ".." for each directory in $ac_dir_suffix.
-+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
-+  case $ac_top_builddir_sub in
-+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
-+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-+  esac ;;
-+esac
-+ac_abs_top_builddir=$ac_pwd
-+ac_abs_builddir=$ac_pwd$ac_dir_suffix
-+# for backward compatibility:
-+ac_top_builddir=$ac_top_build_prefix
-+
-+case $srcdir in
-+  .)  # We are building in place.
-+    ac_srcdir=.
-+    ac_top_srcdir=$ac_top_builddir_sub
-+    ac_abs_top_srcdir=$ac_pwd ;;
-+  [\\/]* | ?:[\\/]* )  # Absolute name.
-+    ac_srcdir=$srcdir$ac_dir_suffix;
-+    ac_top_srcdir=$srcdir
-+    ac_abs_top_srcdir=$srcdir ;;
-+  *) # Relative name.
-+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
-+    ac_top_srcdir=$ac_top_build_prefix$srcdir
-+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
-+esac
-+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
-+
-+
-+  case $ac_mode in
-+  :F)
-+  #
-+  # CONFIG_FILE
-+  #
-+
-+  case $INSTALL in
-+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
-+  esac
-+  ac_MKDIR_P=$MKDIR_P
-+  case $MKDIR_P in
-+  [\\/$]* | ?:[\\/]* ) ;;
-+  */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
-+  esac
-+_ACEOF
-+
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+# 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
-+  q
-+}
-+/@datadir@/p
-+/@docdir@/p
-+/@infodir@/p
-+/@localedir@/p
+   ac_builddir=.
+ 
+ case "$ac_dir" in
+@@ -43009,7 +21736,6 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+ # 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
+@@ -43019,12 +21745,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@*)
+ 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
-+  ac_datarootdir_hack='
-+  s&@datadir@&$datadir&g
-+  s&@docdir@&$docdir&g
-+  s&@infodir@&$infodir&g
-+  s&@localedir@&$localedir&g
-+  s&@mandir@&$mandir&g
+ $as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ _ACEOF
+ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+@@ -43034,7 +21759,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+   s&@infodir@&$infodir&g
+   s&@localedir@&$localedir&g
+   s&@mandir@&$mandir&g
+-    s&\\\${datarootdir}&$datarootdir&g' ;;
 +  s&\\\${datarootdir}&$datarootdir&g' ;;
-+esac
-+_ACEOF
-+
-+# Neutralize VPATH when `$srcdir' = `.'.
-+# Shell code in configure.ac might set extrasub.
-+# FIXME: do we really want to maintain this feature?
-+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-+ac_sed_extra="$ac_vpsub
-+$extrasub
-+_ACEOF
-+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
-+:t
-+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-+s|@configure_input@|$ac_sed_conf_input|;t t
-+s&@top_builddir@&$ac_top_builddir_sub&;t t
-+s&@top_build_prefix@&$ac_top_build_prefix&;t t
-+s&@srcdir@&$ac_srcdir&;t t
-+s&@abs_srcdir@&$ac_abs_srcdir&;t t
-+s&@top_srcdir@&$ac_top_srcdir&;t t
-+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
-+s&@builddir@&$ac_builddir&;t t
-+s&@abs_builddir@&$ac_abs_builddir&;t t
-+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
-+s&@INSTALL@&$ac_INSTALL&;t t
-+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_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"; } &&
+ esac
+ _ACEOF
+ 
+@@ -43063,26 +21788,22 @@ 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'
+-which seems to be undefined.  Please make sure it is defined." >&5
 +  { $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;}
-+
-+  rm -f "$tmp/stdin"
-+  case $ac_file in
-+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
-+  esac \
-+  || as_fn_error "could not create $ac_file" "$LINENO" 5
-+ ;;
-+  :H)
-+  #
-+  # CONFIG_HEADER
-+  #
-+  if test x"$ac_file" != x-; then
-+    {
-+      $as_echo "/* $configure_input  */" \
-+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-+    } >"$tmp/config.h" \
-+      || as_fn_error "could not create $ac_file" "$LINENO" 5
-+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
++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;}
++which seems to be undefined.  Please make sure it is defined" >&2;}
+ 
+   rm -f "$tmp/stdin"
+   case $ac_file in
+   -) 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)
+   #
+@@ -43093,25 +21814,19 @@ $as_echo "$as_me: error: could not create $ac_file" >&2;}
+       $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_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_fn_error "could not create -" "$LINENO" 5
-+  fi
-+# Compute "$ac_file"'s index in $config_headers.
-+_am_arg="$ac_file"
-+_am_stamp_count=1
-+for _am_header in $config_headers :; do
-+  case $_am_header in
-+    $_am_arg | $_am_arg:* )
-+      break ;;
-+    * )
-+      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-+  esac
-+done
-+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" ||
-+$as_expr X"$_am_arg" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$_am_arg" : 'X\(//\)[^/]' \| \
-+	 X"$_am_arg" : 'X\(//\)$' \| \
-+	 X"$_am_arg" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$_am_arg" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`/stamp-h$_am_stamp_count
-+ ;;
-+
+ $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"
+@@ -43149,7 +21864,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
-+
-+
-+  case $ac_file$ac_mode in
-+    "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
-+  # Autoconf 2.62 quotes --file arguments for eval, but not when files
-+  # are listed without --file.  Let's play safe and only enable the eval
-+  # if we detect the quoting.
-+  case $CONFIG_FILES in
-+  *\'*) eval set x "$CONFIG_FILES" ;;
-+  *)   set x $CONFIG_FILES ;;
-+  esac
-+  shift
-+  for mf
-+  do
-+    # Strip MF so we end up with the name of the file.
-+    mf=`echo "$mf" | sed -e 's/:.*$//'`
-+    # Check whether this is an Automake generated Makefile or not.
-+    # We used to match only the files named `Makefile.in', but
-+    # some people rename them; so instead we look at the file content.
-+    # Grep'ing the first line is not enough: some people post-process
-+    # each Makefile.in and add a new line on top of each file to say so.
-+    # Grep'ing the whole file is not good either: AIX grep has a line
-+    # limit of 2048, but all sed's we know have understand at least 4000.
-+    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+      dirpart=`$as_dirname -- "$mf" ||
-+$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$mf" : 'X\(//\)[^/]' \| \
-+	 X"$mf" : 'X\(//\)$' \| \
-+	 X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$mf" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
-+    else
-+      continue
-+    fi
-+    # Extract the definition of DEPDIR, am__include, and am__quote
-+    # from the Makefile without running `make'.
-+    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-+    test -z "$DEPDIR" && continue
-+    am__include=`sed -n 's/^am__include = //p' < "$mf"`
-+    test -z "am__include" && continue
-+    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-+    # When using ansi2knr, U may be empty or an underscore; expand it
-+    U=`sed -n 's/^U = //p' < "$mf"`
-+    # Find all dependency output files, they are included files with
-+    # $(DEPDIR) in their names.  We invoke sed twice because it is the
-+    # simplest approach to changing $(DEPDIR) to its actual value in the
-+    # expansion.
-+    for file in `sed -n "
-+      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-+	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-+      # Make sure the directory exists.
-+      test -f "$dirpart/$file" && continue
-+      fdir=`$as_dirname -- "$file" ||
-+$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	 X"$file" : 'X\(//\)[^/]' \| \
-+	 X"$file" : 'X\(//\)$' \| \
-+	 X"$file" : 'X\(/\)' \| . 2>/dev/null ||
-+$as_echo X"$file" |
-+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)[^/].*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\/\)$/{
-+	    s//\1/
-+	    q
-+	  }
-+	  /^X\(\/\).*/{
-+	    s//\1/
-+	    q
-+	  }
-+	  s/.*/./; q'`
+ $as_echo "$as_me: executing $ac_file commands" >&6;}
+  ;;
+   esac
+@@ -43244,47 +21959,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
-+  done
-+}
-+ ;;
-+
-+  esac
-+done # for ac_tag
-+
-+
+       # echo "creating $dirpart/$file"
+       echo '# dummy' > "$dirpart/$file"
+     done
+@@ -43296,15 +21971,12 @@ $as_echo "$as_me: error: cannot create directory $as_dir" >&2;}
+ done # for ac_tag
+ 
+ 
+-{ (exit 0); exit 0; }
 +as_fn_exit 0
-+_ACEOF
-+ac_clean_files=$ac_clean_files_save
-+
-+test $ac_write_fail = 0 ||
-+  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
-+
-+
-+# configure is writing to config.log, and then calls config.status.
-+# config.status does its own redirection, appending to config.log.
-+# Unfortunately, on DOS this fails, as config.log is still kept open
-+# by configure, so config.status won't be able to write to it; its
-+# output is simply discarded.  So we exec the FD to /dev/null,
-+# effectively closing config.log, so it can be properly (re)opened and
-+# appended to by config.status.  When coming back to configure, we
-+# need to make the FD available again.
-+if test "$no_create" != yes; then
-+  ac_cs_success=:
-+  ac_config_status_args=
-+  test "$silent" = yes &&
-+    ac_config_status_args="$ac_config_status_args --quiet"
-+  exec 5>/dev/null
-+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-+  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 || as_fn_exit $?
-+fi
-+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ _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.
+@@ -43325,10 +21997,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 1
+ 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
-+
-+
-+echo
-+echo "CONFIGURATION SUMMARY ----"
-+#                        disabled
-+echo
-+echo "sqlite3               : $SQLITE3_STATUS"
-+echo "mysql                 : $MYSQL_STATUS"
-+##echo "postgresql          : $PGSQL_OK"
-+echo "libjs                 : $JS_OK"
-+echo "libmagic              : $LIBMAGIC_STATUS"
-+echo "inotify               : $INOTIFY_STATUS"
-+echo "libexif               : $LIBEXIF_STATUS"
-+#echo "expat                 : $EXPAT_STATUS"
-+echo "id3lib                : $ID3LIB_STATUS"
-+echo "taglib                : $TAGLIB_STATUS"
-+echo "libmp4v2              : $LIBMP4V2_STATUS"
-+echo "libdvdnav             : $LIBDVDNAV_STATUS"
-+echo "ffmpeg                : $FFMPEG_STATUS"
-+echo "ffmpegthumbnailer     : $FFMPEGTHUMBNAILER_STATUS"
-+echo "external transcoding  : $EXTERNAL_TRANSCODING_OPTION_ENABLED"
-+echo "curl                  : $CURL_OK"
-+echo "YouTube               : $YOUTUBE_OPTION_ENABLED"
-+echo "Weborama              : $WEBORAMA_OPTION_ENABLED"
-+echo "Apple Trailers        : $ATRAILERS_OPTION_ENABLED"
-+echo "SopCast               : $SOPCAST_OPTION_ENABLED"
-+echo "libextractor          : $LIBEXTRACTOR_STATUS"
-+echo "db-autocreate         : $DB_AUTOCREATE_OPTION_ENABLED"
-+
-+if test "x$TOMBDEBUG_OPTION_ENABLED" = xyes; then
-+    echo "debug log             : $TOMBDEBUG_OPTION_ENABLED"
-+fi
-+
-+if test "x$UPNPDEBUG_OPTION_ENABLED" = xyes; then
-+    echo "upnpdebug             : $UPNPDEBUG_OPTION_ENABLED"
-+fi
-+
-+if test "x$STATIC_OPTION_ENABLED" = xyes; then
-+    echo "static build          : $STATIC_OPTION_ENABLED"
-+fi
-+
-+echo
-+
---- /dev/null
-+++ b/configure_aux/compile
-@@ -0,0 +1,143 @@
-+#! /bin/sh
-+# Wrapper for compilers which do not understand `-c -o'.
-+
-+scriptversion=2009-10-06.20; # UTC
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-+# Foundation, Inc.
-+# Written by Tom Tromey <tromey at cygnus.com>.
-+#
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# This file is maintained in Automake, please report
-+# bugs to <bug-automake at gnu.org> or send patches to
-+# <automake-patches at gnu.org>.
-+
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: compile [--help] [--version] PROGRAM [ARGS]
-+
-+Wrapper for compilers which do not understand `-c -o'.
-+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-+arguments, and rename the output as expected.
-+
-+If you are trying to build a whole package this is not the
-+right script to run: please start by reading the file `INSTALL'.
-+
-+Report bugs to <bug-automake at gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "compile $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
-+ofile=
-+cfile=
-+eat=
-+
-+for arg
-+do
-+  if test -n "$eat"; then
-+    eat=
-+  else
-+    case $1 in
-+      -o)
-+	# configure might choose to run compile as `compile cc -o foo foo.c'.
-+	# So we strip `-o arg' only if arg is an object.
-+	eat=1
-+	case $2 in
-+	  *.o | *.obj)
-+	    ofile=$2
-+	    ;;
-+	  *)
-+	    set x "$@" -o "$2"
-+	    shift
-+	    ;;
-+	esac
-+	;;
-+      *.c)
-+	cfile=$1
-+	set x "$@" "$1"
-+	shift
-+	;;
-+      *)
-+	set x "$@" "$1"
-+	shift
-+	;;
-+    esac
-+  fi
-+  shift
-+done
-+
-+if test -z "$ofile" || test -z "$cfile"; then
-+  # If no `-o' option was seen then we might have been invoked from a
-+  # pattern rule where we don't need one.  That is ok -- this is a
-+  # normal compilation that the losing compiler can handle.  If no
-+  # `.c' file was seen then we are probably linking.  That is also
-+  # ok.
-+  exec "$@"
-+fi
-+
-+# Name of file we expect compiler to create.
-+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
-+
-+# Create the lock directory.
-+# Note: use `[/\\:.-]' here to ensure that we don't use the same name
-+# that we are using for the .o file.  Also, base the name on the expected
-+# object file name, since that is what matters with a parallel build.
-+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
-+while true; do
-+  if mkdir "$lockdir" >/dev/null 2>&1; then
-+    break
-+  fi
-+  sleep 1
-+done
-+# FIXME: race condition here if user kills between mkdir and trap.
-+trap "rmdir '$lockdir'; exit 1" 1 2 15
-+
-+# Run the compile.
-+"$@"
-+ret=$?
-+
-+if test -f "$cofile"; then
-+  test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
-+elif test -f "${cofile}bj"; then
-+  test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
-+fi
-+
-+rmdir "$lockdir"
-+exit $ret
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End:
---- /dev/null
+ $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ fi
+ 
+diff --git a/configure_aux/config.guess b/configure_aux/config.guess
+index dc84c68..c2246a4 100755
+--- a/configure_aux/config.guess
 +++ b/configure_aux/config.guess
-@@ -0,0 +1,1533 @@
-+#! /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, 2009
-+#   Free Software Foundation, Inc.
-+
-+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
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but
-+# WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+
-+# Originally written by Per Bothner <per at bothner.com>.
-+# Please send patches to <config-patches at gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# This script attempts to guess a canonical system name similar to
-+# config.sub.  If it succeeds, it prints the system name on stdout, and
-+# exits with 0.  Otherwise, it exits with 1.
-+#
-+# The plan is that this can be called by configure scripts if you
-+# don't specify an explicit build system type.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION]
-+
-+Output the configuration name of the system \`$me' is run on.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches at gnu.org>."
-+
-+version="\
-+GNU config.guess ($timestamp)
-+
-+Originally written by Per Bothner.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit ;;
-+    --version | -v )
-+       echo "$version" ; exit ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help" >&2
-+       exit 1 ;;
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+if test $# != 0; then
-+  echo "$me: too many arguments$help" >&2
-+  exit 1
-+fi
-+
-+trap 'exit 1' 1 2 15
-+
-+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-+# compiler to aid in system detection is discouraged as it requires
-+# temporary files to be created and, as you can see below, it is a
-+# headache to deal with in a portable fashion.
-+
-+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-+# use `HOST_CC' if defined, but it is deprecated.
-+
-+# Portable tmp directory creation inspired by the Autoconf team.
-+
-+set_cc_for_build='
-+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-+: ${TMPDIR=/tmp} ;
-+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
-+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
-+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
-+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-+dummy=$tmp/dummy ;
-+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-+case $CC_FOR_BUILD,$HOST_CC,$CC in
-+ ,,)    echo "int x;" > $dummy.c ;
-+	for c in cc gcc c89 c99 ; do
-+	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-+	     CC_FOR_BUILD="$c"; break ;
-+	  fi ;
-+	done ;
-+	if test x"$CC_FOR_BUILD" = x ; then
-+	  CC_FOR_BUILD=no_compiler_found ;
-+	fi
-+	;;
-+ ,,*)   CC_FOR_BUILD=$CC ;;
-+ ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-+esac ; set_cc_for_build= ;'
-+
-+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-+# (ghazi at noc.rutgers.edu 1994-08-24)
-+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-+	PATH=$PATH:/.attbin ; export PATH
-+fi
-+
-+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-+UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-+
-+# Note: order is significant - the case branches are not exclusive.
-+
-+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-+    *:NetBSD:*:*)
-+	# NetBSD (nbsd) targets should (where applicable) match one or
-+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-+	# switched to ELF, *-*-netbsd* would select the old
-+	# object file format.  This provides both forward
-+	# compatibility and a consistent mechanism for selecting the
-+	# object file format.
-+	#
-+	# Note: NetBSD doesn't particularly care about the vendor
-+	# portion of the name.  We always set it to "unknown".
-+	sysctl="sysctl -n hw.machine_arch"
-+	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-+	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    armeb) machine=armeb-unknown ;;
-+	    arm*) machine=arm-unknown ;;
-+	    sh3el) machine=shl-unknown ;;
-+	    sh3eb) machine=sh-unknown ;;
-+	    sh5el) machine=sh5le-unknown ;;
-+	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-+	esac
-+	# The Operating System including object format, if it has switched
-+	# to ELF recently, or will in the future.
-+	case "${UNAME_MACHINE_ARCH}" in
-+	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-+		eval $set_cc_for_build
-+		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+			| grep -q __ELF__
-+		then
-+		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-+		    # Return netbsd for either.  FIX?
-+		    os=netbsd
-+		else
-+		    os=netbsdelf
-+		fi
-+		;;
-+	    *)
-+	        os=netbsd
-+		;;
-+	esac
-+	# The OS release
-+	# Debian GNU/NetBSD machines have a different userland, and
-+	# thus, need a distinct triplet. However, they do not need
-+	# kernel version information, so it can be replaced with a
-+	# suitable tag, in the style of linux-gnu.
-+	case "${UNAME_VERSION}" in
-+	    Debian*)
-+		release='-gnu'
-+		;;
-+	    *)
-+		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-+		;;
-+	esac
-+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-+	# contains redundant information, the shorter form:
-+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-+	echo "${machine}-${os}${release}"
-+	exit ;;
-+    *:OpenBSD:*:*)
-+	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:ekkoBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-+	exit ;;
-+    *:SolidBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-+	exit ;;
-+    macppc:MirBSD:*:*)
-+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    *:MirBSD:*:*)
-+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-+	exit ;;
-+    alpha:OSF1:*:*)
-+	case $UNAME_RELEASE in
-+	*4.0)
-+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-+		;;
-+	*5.*)
-+	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-+		;;
-+	esac
-+	# According to Compaq, /usr/sbin/psrinfo has been available on
-+	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-+	# covers most systems running today.  This code pipes the CPU
-+	# types through head -n 1, so we only detect the type of CPU 0.
-+	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-+	case "$ALPHA_CPU_TYPE" in
-+	    "EV4 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV4.5 (21064)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "LCA4 (21066/21068)")
-+		UNAME_MACHINE="alpha" ;;
-+	    "EV5 (21164)")
-+		UNAME_MACHINE="alphaev5" ;;
-+	    "EV5.6 (21164A)")
-+		UNAME_MACHINE="alphaev56" ;;
-+	    "EV5.6 (21164PC)")
-+		UNAME_MACHINE="alphapca56" ;;
-+	    "EV5.7 (21164PC)")
-+		UNAME_MACHINE="alphapca57" ;;
-+	    "EV6 (21264)")
-+		UNAME_MACHINE="alphaev6" ;;
-+	    "EV6.7 (21264A)")
-+		UNAME_MACHINE="alphaev67" ;;
-+	    "EV6.8CB (21264C)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8AL (21264B)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.8CX (21264D)")
-+		UNAME_MACHINE="alphaev68" ;;
-+	    "EV6.9A (21264/EV69A)")
-+		UNAME_MACHINE="alphaev69" ;;
-+	    "EV7 (21364)")
-+		UNAME_MACHINE="alphaev7" ;;
-+	    "EV7.9 (21364A)")
-+		UNAME_MACHINE="alphaev79" ;;
-+	esac
-+	# A Pn.n version is a patched version.
-+	# A Vn.n version is a released version.
-+	# A Tn.n version is a released field test version.
-+	# A Xn.n version is an unreleased experimental baselevel.
-+	# 1.2 uses "1.2" for uname -r.
-+	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+	exit ;;
-+    Alpha\ *:Windows_NT*:*)
-+	# How do we know it's Interix rather than the generic POSIX subsystem?
-+	# Should we change UNAME_MACHINE based on the output of uname instead
-+	# of the specific Alpha model?
-+	echo alpha-pc-interix
-+	exit ;;
-+    21064:Windows_NT:50:3)
-+	echo alpha-dec-winnt3.5
-+	exit ;;
-+    Amiga*:UNIX_System_V:4.0:*)
-+	echo m68k-unknown-sysv4
-+	exit ;;
-+    *:[Aa]miga[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-amigaos
-+	exit ;;
-+    *:[Mm]orph[Oo][Ss]:*:*)
-+	echo ${UNAME_MACHINE}-unknown-morphos
-+	exit ;;
-+    *:OS/390:*:*)
-+	echo i370-ibm-openedition
-+	exit ;;
-+    *:z/VM:*:*)
-+	echo s390-ibm-zvmoe
-+	exit ;;
-+    *:OS400:*:*)
-+        echo powerpc-ibm-os400
-+	exit ;;
-+    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-+	echo arm-acorn-riscix${UNAME_RELEASE}
-+	exit ;;
-+    arm:riscos:*:*|arm:RISCOS:*:*)
-+	echo arm-unknown-riscos
-+	exit ;;
-+    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-+	echo hppa1.1-hitachi-hiuxmpp
-+	exit ;;
-+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-+	# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-+	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-+		echo pyramid-pyramid-sysv3
-+	else
-+		echo pyramid-pyramid-bsd
-+	fi
-+	exit ;;
-+    NILE*:*:*:dcosx)
-+	echo pyramid-pyramid-svr4
-+	exit ;;
-+    DRS?6000:unix:4.0:6*)
-+	echo sparc-icl-nx6
-+	exit ;;
-+    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-+	case `/usr/bin/uname -p` in
-+	    sparc) echo sparc-icl-nx7; exit ;;
-+	esac ;;
-+    s390x:SunOS:*:*)
-+	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4H:SunOS:5.*:*)
-+	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-+	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-+	eval $set_cc_for_build
-+	SUN_ARCH="i386"
-+	# If there is a compiler, see if it is configured for 64-bit objects.
-+	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
-+	# This test works for both compilers.
-+	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
-+	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
-+		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
-+		grep IS_64BIT_ARCH >/dev/null
-+	    then
-+		SUN_ARCH="x86_64"
-+	    fi
-+	fi
-+	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:6*:*)
-+	# According to config.sub, this is the proper way to canonicalize
-+	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-+	# it's likely to be more like Solaris than SunOS4.
-+	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    sun4*:SunOS:*:*)
-+	case "`/usr/bin/arch -k`" in
-+	    Series*|S4*)
-+		UNAME_RELEASE=`uname -v`
-+		;;
-+	esac
-+	# Japanese Language versions have a version number like `4.1.3-JL'.
-+	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-+	exit ;;
-+    sun3*:SunOS:*:*)
-+	echo m68k-sun-sunos${UNAME_RELEASE}
-+	exit ;;
-+    sun*:*:4.2BSD:*)
-+	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-+	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-+	case "`/bin/arch`" in
-+	    sun3)
-+		echo m68k-sun-sunos${UNAME_RELEASE}
-+		;;
-+	    sun4)
-+		echo sparc-sun-sunos${UNAME_RELEASE}
-+		;;
-+	esac
-+	exit ;;
-+    aushp:SunOS:*:*)
-+	echo sparc-auspex-sunos${UNAME_RELEASE}
-+	exit ;;
-+    # The situation for MiNT is a little confusing.  The machine name
-+    # can be virtually everything (everything which is not
-+    # "atarist" or "atariste" at least should have a processor
-+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-+    # to the lowercase version "mint" (or "freemint").  Finally
-+    # the system name "TOS" denotes a system which is actually not
-+    # MiNT.  But MiNT is downward compatible to TOS, so this should
-+    # be no problem.
-+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-+        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit ;;
-+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-+	echo m68k-atari-mint${UNAME_RELEASE}
-+        exit ;;
-+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-+        echo m68k-atari-mint${UNAME_RELEASE}
-+	exit ;;
-+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-+        echo m68k-milan-mint${UNAME_RELEASE}
-+        exit ;;
-+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-+        echo m68k-hades-mint${UNAME_RELEASE}
-+        exit ;;
-+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-+        echo m68k-unknown-mint${UNAME_RELEASE}
-+        exit ;;
-+    m68k:machten:*:*)
-+	echo m68k-apple-machten${UNAME_RELEASE}
-+	exit ;;
-+    powerpc:machten:*:*)
-+	echo powerpc-apple-machten${UNAME_RELEASE}
-+	exit ;;
-+    RISC*:Mach:*:*)
-+	echo mips-dec-mach_bsd4.3
-+	exit ;;
-+    RISC*:ULTRIX:*:*)
-+	echo mips-dec-ultrix${UNAME_RELEASE}
-+	exit ;;
-+    VAX*:ULTRIX*:*:*)
-+	echo vax-dec-ultrix${UNAME_RELEASE}
-+	exit ;;
-+    2020:CLIX:*:* | 2430:CLIX:*:*)
-+	echo clipper-intergraph-clix${UNAME_RELEASE}
-+	exit ;;
-+    mips:*:*:UMIPS | mips:*:*:RISCos)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+#ifdef __cplusplus
-+#include <stdio.h>  /* for printf() prototype */
-+	int main (int argc, char *argv[]) {
-+#else
-+	int main (argc, argv) int argc; char *argv[]; {
-+#endif
-+	#if defined (host_mips) && defined (MIPSEB)
-+	#if defined (SYSTYPE_SYSV)
-+	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-+	#endif
-+	#if defined (SYSTYPE_SVR4)
-+	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-+	#endif
-+	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-+	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-+	#endif
-+	#endif
-+	  exit (-1);
-+	}
-+EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c &&
-+	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-+	  SYSTEM_NAME=`$dummy $dummyarg` &&
-+	    { echo "$SYSTEM_NAME"; exit; }
-+	echo mips-mips-riscos${UNAME_RELEASE}
-+	exit ;;
-+    Motorola:PowerMAX_OS:*:*)
-+	echo powerpc-motorola-powermax
-+	exit ;;
-+    Motorola:*:4.3:PL8-*)
-+	echo powerpc-harris-powermax
-+	exit ;;
-+    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-+	echo powerpc-harris-powermax
-+	exit ;;
-+    Night_Hawk:Power_UNIX:*:*)
-+	echo powerpc-harris-powerunix
-+	exit ;;
-+    m88k:CX/UX:7*:*)
-+	echo m88k-harris-cxux7
-+	exit ;;
-+    m88k:*:4*:R4*)
-+	echo m88k-motorola-sysv4
-+	exit ;;
-+    m88k:*:3*:R3*)
-+	echo m88k-motorola-sysv3
-+	exit ;;
-+    AViiON:dgux:*:*)
-+        # DG/UX returns AViiON for all architectures
-+        UNAME_PROCESSOR=`/usr/bin/uname -p`
-+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-+	then
-+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-+	    then
-+		echo m88k-dg-dgux${UNAME_RELEASE}
-+	    else
-+		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-+	    fi
-+	else
-+	    echo i586-dg-dgux${UNAME_RELEASE}
-+	fi
-+ 	exit ;;
-+    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-+	echo m88k-dolphin-sysv3
-+	exit ;;
-+    M88*:*:R3*:*)
-+	# Delta 88k system running SVR3
-+	echo m88k-motorola-sysv3
-+	exit ;;
-+    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-+	echo m88k-tektronix-sysv3
-+	exit ;;
-+    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-+	echo m68k-tektronix-bsd
-+	exit ;;
-+    *:IRIX*:*:*)
-+	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-+	exit ;;
-+    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-+	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-+	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-+    i*86:AIX:*:*)
-+	echo i386-ibm-aix
-+	exit ;;
-+    ia64:AIX:*:*)
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
-+	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
-+	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-+	exit ;;
-+    *:AIX:2:3)
-+	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-+		eval $set_cc_for_build
-+		sed 's/^		//' << EOF >$dummy.c
-+		#include <sys/systemcfg.h>
-+
-+		main()
-+			{
-+			if (!__power_pc())
-+				exit(1);
-+			puts("powerpc-ibm-aix3.2.5");
-+			exit(0);
-+			}
-+EOF
-+		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-+		then
-+			echo "$SYSTEM_NAME"
-+		else
-+			echo rs6000-ibm-aix3.2.5
-+		fi
-+	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-+		echo rs6000-ibm-aix3.2.4
-+	else
-+		echo rs6000-ibm-aix3.2
-+	fi
-+	exit ;;
-+    *:AIX:*:[456])
-+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-+	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-+		IBM_ARCH=rs6000
-+	else
-+		IBM_ARCH=powerpc
-+	fi
-+	if [ -x /usr/bin/oslevel ] ; then
-+		IBM_REV=`/usr/bin/oslevel`
-+	else
-+		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-+	fi
-+	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-+	exit ;;
-+    *:AIX:*:*)
-+	echo rs6000-ibm-aix
-+	exit ;;
-+    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-+	echo romp-ibm-bsd4.4
-+	exit ;;
-+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-+	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-+	exit ;;                             # report: romp-ibm BSD 4.3
-+    *:BOSX:*:*)
-+	echo rs6000-bull-bosx
-+	exit ;;
-+    DPX/2?00:B.O.S.:*:*)
-+	echo m68k-bull-sysv3
-+	exit ;;
-+    9000/[34]??:4.3bsd:1.*:*)
-+	echo m68k-hp-bsd
-+	exit ;;
-+    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-+	echo m68k-hp-bsd4.4
-+	exit ;;
-+    9000/[34678]??:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	case "${UNAME_MACHINE}" in
-+	    9000/31? )            HP_ARCH=m68000 ;;
-+	    9000/[34]?? )         HP_ARCH=m68k ;;
-+	    9000/[678][0-9][0-9])
-+		if [ -x /usr/bin/getconf ]; then
-+		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-+                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-+                    case "${sc_cpu_version}" in
-+                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-+                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-+                      532)                      # CPU_PA_RISC2_0
-+                        case "${sc_kernel_bits}" in
-+                          32) HP_ARCH="hppa2.0n" ;;
-+                          64) HP_ARCH="hppa2.0w" ;;
-+			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-+                        esac ;;
-+                    esac
-+		fi
-+		if [ "${HP_ARCH}" = "" ]; then
-+		    eval $set_cc_for_build
-+		    sed 's/^              //' << EOF >$dummy.c
-+
-+              #define _HPUX_SOURCE
-+              #include <stdlib.h>
-+              #include <unistd.h>
-+
-+              int main ()
-+              {
-+              #if defined(_SC_KERNEL_BITS)
-+                  long bits = sysconf(_SC_KERNEL_BITS);
-+              #endif
-+                  long cpu  = sysconf (_SC_CPU_VERSION);
-+
-+                  switch (cpu)
-+              	{
-+              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-+              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-+              	case CPU_PA_RISC2_0:
-+              #if defined(_SC_KERNEL_BITS)
-+              	    switch (bits)
-+              		{
-+              		case 64: puts ("hppa2.0w"); break;
-+              		case 32: puts ("hppa2.0n"); break;
-+              		default: puts ("hppa2.0"); break;
-+              		} break;
-+              #else  /* !defined(_SC_KERNEL_BITS) */
-+              	    puts ("hppa2.0"); break;
-+              #endif
-+              	default: puts ("hppa1.0"); break;
-+              	}
-+                  exit (0);
-+              }
-+EOF
-+		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-+		    test -z "$HP_ARCH" && HP_ARCH=hppa
-+		fi ;;
-+	esac
-+	if [ ${HP_ARCH} = "hppa2.0w" ]
-+	then
-+	    eval $set_cc_for_build
-+
-+	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-+	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-+	    # generating 64-bit code.  GNU and HP use different nomenclature:
-+	    #
-+	    # $ CC_FOR_BUILD=cc ./config.guess
-+	    # => hppa2.0w-hp-hpux11.23
-+	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-+	    # => hppa64-hp-hpux11.23
-+
-+	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-+		grep -q __LP64__
-+	    then
-+		HP_ARCH="hppa2.0w"
-+	    else
-+		HP_ARCH="hppa64"
-+	    fi
-+	fi
-+	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-+	exit ;;
-+    ia64:HP-UX:*:*)
-+	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-+	echo ia64-hp-hpux${HPUX_REV}
-+	exit ;;
-+    3050*:HI-UX:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#include <unistd.h>
-+	int
-+	main ()
-+	{
-+	  long cpu = sysconf (_SC_CPU_VERSION);
-+	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-+	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-+	     results, however.  */
-+	  if (CPU_IS_PA_RISC (cpu))
-+	    {
-+	      switch (cpu)
-+		{
-+		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-+		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-+		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-+		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-+		}
-+	    }
-+	  else if (CPU_IS_HP_MC68K (cpu))
-+	    puts ("m68k-hitachi-hiuxwe2");
-+	  else puts ("unknown-hitachi-hiuxwe2");
-+	  exit (0);
-+	}
-+EOF
-+	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-+		{ echo "$SYSTEM_NAME"; exit; }
-+	echo unknown-hitachi-hiuxwe2
-+	exit ;;
-+    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-+	echo hppa1.1-hp-bsd
-+	exit ;;
-+    9000/8??:4.3bsd:*:*)
-+	echo hppa1.0-hp-bsd
-+	exit ;;
-+    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-+	echo hppa1.0-hp-mpeix
-+	exit ;;
-+    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-+	echo hppa1.1-hp-osf
-+	exit ;;
-+    hp8??:OSF1:*:*)
-+	echo hppa1.0-hp-osf
-+	exit ;;
-+    i*86:OSF1:*:*)
-+	if [ -x /usr/sbin/sysversion ] ; then
-+	    echo ${UNAME_MACHINE}-unknown-osf1mk
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-osf1
-+	fi
-+	exit ;;
-+    parisc*:Lites*:*:*)
-+	echo hppa1.1-hp-lites
-+	exit ;;
-+    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-+	echo c1-convex-bsd
-+        exit ;;
-+    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+        exit ;;
-+    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-+	echo c34-convex-bsd
-+        exit ;;
-+    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-+	echo c38-convex-bsd
-+        exit ;;
-+    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-+	echo c4-convex-bsd
-+        exit ;;
-+    CRAY*Y-MP:*:*:*)
-+	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*[A-Z]90:*:*:*)
-+	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-+	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-+	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-+	      -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*TS:*:*:*)
-+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*T3E:*:*:*)
-+	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    CRAY*SV1:*:*:*)
-+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    *:UNICOS/mp:*:*)
-+	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-+	exit ;;
-+    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-+	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-+        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+        exit ;;
-+    5000:UNIX_System_V:4.*:*)
-+        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-+        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-+        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-+	exit ;;
-+    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-+	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    sparc*:BSD/OS:*:*)
-+	echo sparc-unknown-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    *:BSD/OS:*:*)
-+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-+	exit ;;
-+    *:FreeBSD:*:*)
-+	case ${UNAME_MACHINE} in
-+	    pc98)
-+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    amd64)
-+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	    *)
-+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-+	esac
-+	exit ;;
-+    i*:CYGWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-cygwin
-+	exit ;;
-+    *:MINGW*:*)
-+	echo ${UNAME_MACHINE}-pc-mingw32
-+	exit ;;
-+    i*:windows32*:*)
-+    	# uname -m includes "-pc" on this system.
-+    	echo ${UNAME_MACHINE}-mingw32
-+	exit ;;
-+    i*:PW*:*)
-+	echo ${UNAME_MACHINE}-pc-pw32
-+	exit ;;
-+    *:Interix*:[3456]*)
-+    	case ${UNAME_MACHINE} in
-+	    x86)
-+		echo i586-pc-interix${UNAME_RELEASE}
-+		exit ;;
-+	    EM64T | authenticamd | genuineintel)
-+		echo x86_64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	    IA64)
-+		echo ia64-unknown-interix${UNAME_RELEASE}
-+		exit ;;
-+	esac ;;
-+    [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
-+	# UNAME_MACHINE based on the output of uname instead of i386?
-+	echo i586-pc-interix
-+	exit ;;
-+    i*:UWIN*:*)
-+	echo ${UNAME_MACHINE}-pc-uwin
-+	exit ;;
-+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-+	echo x86_64-unknown-cygwin
-+	exit ;;
-+    p*:CYGWIN*:*)
-+	echo powerpcle-unknown-cygwin
-+	exit ;;
-+    prep*:SunOS:5.*:*)
-+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-+	exit ;;
-+    *:GNU:*:*)
-+	# the GNU system
-+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-+	exit ;;
-+    *:GNU/*:*:*)
-+	# other systems with GNU libc and userland
-+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-+	exit ;;
-+    i*86:Minix:*:*)
-+	echo ${UNAME_MACHINE}-pc-minix
-+	exit ;;
-+    arm*:Linux:*:*)
-+	eval $set_cc_for_build
-+	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-+	    | grep -q __ARM_EABI__
-+	then
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	else
-+	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-+	fi
-+	exit ;;
-+    avr32*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    cris:Linux:*:*)
-+	echo cris-axis-linux-gnu
-+	exit ;;
-+    crisv32:Linux:*:*)
-+	echo crisv32-axis-linux-gnu
-+	exit ;;
-+    frv:Linux:*:*)
-+    	echo frv-unknown-linux-gnu
-+	exit ;;
-+    ia64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m32r*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    m68*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    mips:Linux:*:* | mips64:Linux:*:*)
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#undef CPU
-+	#undef ${UNAME_MACHINE}
-+	#undef ${UNAME_MACHINE}el
-+	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-+	CPU=${UNAME_MACHINE}el
-+	#else
-+	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-+	CPU=${UNAME_MACHINE}
-+	#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; }
-+	;;
-+    or32:Linux:*:*)
-+	echo or32-unknown-linux-gnu
-+	exit ;;
-+    ppc:Linux:*:*)
-+	echo powerpc-unknown-linux-gnu
-+	exit ;;
-+    ppc64:Linux:*:*)
-+	echo powerpc64-unknown-linux-gnu
-+	exit ;;
-+    alpha:Linux:*:*)
-+	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-+	  EV5)   UNAME_MACHINE=alphaev5 ;;
-+	  EV56)  UNAME_MACHINE=alphaev56 ;;
-+	  PCA56) UNAME_MACHINE=alphapca56 ;;
-+	  PCA57) UNAME_MACHINE=alphapca56 ;;
-+	  EV6)   UNAME_MACHINE=alphaev6 ;;
-+	  EV67)  UNAME_MACHINE=alphaev67 ;;
-+	  EV68*) UNAME_MACHINE=alphaev68 ;;
-+        esac
-+	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 ;;
-+    padre:Linux:*:*)
-+	echo sparc-unknown-linux-gnu
-+	exit ;;
-+    parisc:Linux:*:* | hppa:Linux:*:*)
-+	# Look for CPU level
-+	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-+	  *)    echo hppa-unknown-linux-gnu ;;
-+	esac
-+	exit ;;
-+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-+	echo hppa64-unknown-linux-gnu
-+	exit ;;
-+    s390:Linux:*:* | s390x:Linux:*:*)
-+	echo ${UNAME_MACHINE}-ibm-linux
-+	exit ;;
-+    sh64*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    sh*:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    sparc:Linux:*:* | sparc64:Linux:*:*)
-+	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    vax:Linux:*:*)
-+	echo ${UNAME_MACHINE}-dec-linux-gnu
-+	exit ;;
-+    x86_64:Linux:*:*)
-+	echo x86_64-unknown-linux-gnu
-+	exit ;;
-+    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-+    i*86:Linux:*:*)
-+	# The BFD linker knows what the default object file format is, so
-+	# first see if it will tell us. cd to the root directory to prevent
-+	# problems with other programs or directories called `ld' in the path.
-+	# Set LC_ALL=C to ensure ld outputs messages in English.
-+	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-+			 | sed -ne '/supported targets:/!d
-+				    s/[ 	][ 	]*/ /g
-+				    s/.*supported targets: *//
-+				    s/ .*//
-+				    p'`
-+        case "$ld_supported_targets" in
-+	  elf32-i386)
-+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-+		;;
-+	esac
-+	# Determine whether the default compiler is a.out or elf
-+	eval $set_cc_for_build
-+	sed 's/^	//' << EOF >$dummy.c
-+	#include <features.h>
-+	#ifdef __ELF__
-+	# ifdef __GLIBC__
-+	#  if __GLIBC__ >= 2
-+	LIBC=gnu
-+	#  else
-+	LIBC=gnulibc1
-+	#  endif
-+	# else
-+	LIBC=gnulibc1
-+	# endif
-+	#else
-+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-+	LIBC=gnu
-+	#else
-+	LIBC=gnuaout
-+	#endif
-+	#endif
-+	#ifdef __dietlibc__
-+	LIBC=dietlibc
-+	#endif
-+EOF
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^LIBC/{
-+		s: ::g
-+		p
-+	    }'`"
-+	test x"${LIBC}" != x && {
-+		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-+		exit
-+	}
-+	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-+	;;
-+    i*86:DYNIX/ptx:4*:*)
-+	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-+	# earlier versions are messed up and put the nodename in both
-+	# sysname and nodename.
-+	echo i386-sequent-sysv4
-+	exit ;;
-+    i*86:UNIX_SV:4.2MP:2.*)
-+        # Unixware is an offshoot of SVR4, but it has its own version
-+        # number series starting with 2...
-+        # I am not positive that other SVR4 systems won't match this,
-+	# I just have to hope.  -- rms.
-+        # Use sysv4.2uw... so that sysv4* matches it.
-+	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-+	exit ;;
-+    i*86:OS/2:*:*)
-+	# If we were able to find `uname', then EMX Unix compatibility
-+	# is probably installed.
-+	echo ${UNAME_MACHINE}-pc-os2-emx
-+	exit ;;
-+    i*86:XTS-300:*:STOP)
-+	echo ${UNAME_MACHINE}-unknown-stop
-+	exit ;;
-+    i*86:atheos:*:*)
-+	echo ${UNAME_MACHINE}-unknown-atheos
-+	exit ;;
-+    i*86:syllable:*:*)
-+	echo ${UNAME_MACHINE}-pc-syllable
-+	exit ;;
-+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
-+	echo i386-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    i*86:*DOS:*:*)
-+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-+	exit ;;
-+    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-+	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-+	else
-+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-+	fi
-+	exit ;;
-+    i*86:*:5:[678]*)
-+    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-+	case `/bin/uname -X | grep "^Machine"` in
-+	    *486*)	     UNAME_MACHINE=i486 ;;
-+	    *Pentium)	     UNAME_MACHINE=i586 ;;
-+	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-+	esac
-+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-+	exit ;;
-+    i*86:*:3.2:*)
-+	if test -f /usr/options/cb.name; then
-+		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-+		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-+	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-+		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-+		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-+		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-+			&& UNAME_MACHINE=i586
-+		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-+			&& UNAME_MACHINE=i686
-+		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-+	else
-+		echo ${UNAME_MACHINE}-pc-sysv32
-+	fi
-+	exit ;;
-+    pc:*:*:*)
-+	# Left here for compatibility:
-+        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-+        # the processor, so we play safe by assuming i586.
-+	# Note: whatever this is, it MUST be the same as what config.sub
-+	# prints for the "djgpp" host, or else GDB configury will decide that
-+	# this is a cross-build.
-+	echo i586-pc-msdosdjgpp
-+        exit ;;
-+    Intel:Mach:3*:*)
-+	echo i386-pc-mach3
-+	exit ;;
-+    paragon:*:*:*)
-+	echo i860-intel-osf1
-+	exit ;;
-+    i860:*:4.*:*) # i860-SVR4
-+	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-+	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-+	else # Add other i860-SVR4 vendors below as they are discovered.
-+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-+	fi
-+	exit ;;
-+    mini*:CTIX:SYS*5:*)
-+	# "miniframe"
-+	echo m68010-convergent-sysv
-+	exit ;;
-+    mc68k:UNIX:SYSTEM5:3.51m)
-+	echo m68k-convergent-sysv
-+	exit ;;
-+    M680?0:D-NIX:5.3:*)
-+	echo m68k-diab-dnix
-+	exit ;;
-+    M68*:*:R3V[5678]*:*)
-+	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-+    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-+	OS_REL=''
-+	test -r /etc/.relid \
-+	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-+        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+          && { echo i486-ncr-sysv4; exit; } ;;
-+    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
-+	OS_REL='.3'
-+	test -r /etc/.relid \
-+	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-+	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
-+	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
-+	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-+    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-+	echo m68k-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    mc68030:UNIX_System_V:4.*:*)
-+	echo m68k-atari-sysv4
-+	exit ;;
-+    TSUNAMI:LynxOS:2.*:*)
-+	echo sparc-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    rs6000:LynxOS:2.*:*)
-+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
-+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-+	exit ;;
-+    SM[BE]S:UNIX_SV:*:*)
-+	echo mips-dde-sysv${UNAME_RELEASE}
-+	exit ;;
-+    RM*:ReliantUNIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit ;;
-+    RM*:SINIX-*:*:*)
-+	echo mips-sni-sysv4
-+	exit ;;
-+    *:SINIX-*:*:*)
-+	if uname -p 2>/dev/null >/dev/null ; then
-+		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+		echo ${UNAME_MACHINE}-sni-sysv4
-+	else
-+		echo ns32k-sni-sysv
-+	fi
-+	exit ;;
-+    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-+                      # says <Richard.M.Bartel at ccMail.Census.GOV>
-+        echo i586-unisys-sysv4
-+        exit ;;
-+    *:UNIX_System_V:4*:FTX*)
-+	# From Gerald Hewes <hewes at openmarket.com>.
-+	# How about differentiating between stratus architectures? -djm
-+	echo hppa1.1-stratus-sysv4
-+	exit ;;
-+    *:*:*:FTX*)
-+	# From seanf at swdc.stratus.com.
-+	echo i860-stratus-sysv4
-+	exit ;;
-+    i*86:VOS:*:*)
-+	# From Paul.Green at stratus.com.
-+	echo ${UNAME_MACHINE}-stratus-vos
-+	exit ;;
-+    *:VOS:*:*)
-+	# From Paul.Green at stratus.com.
-+	echo hppa1.1-stratus-vos
-+	exit ;;
-+    mc68*:A/UX:*:*)
-+	echo m68k-apple-aux${UNAME_RELEASE}
-+	exit ;;
-+    news*:NEWS-OS:6*:*)
-+	echo mips-sony-newsos6
-+	exit ;;
-+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-+	if [ -d /usr/nec ]; then
-+	        echo mips-nec-sysv${UNAME_RELEASE}
-+	else
-+	        echo mips-unknown-sysv${UNAME_RELEASE}
-+	fi
-+        exit ;;
-+    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-+	echo powerpc-be-beos
-+	exit ;;
-+    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-+	echo powerpc-apple-beos
-+	exit ;;
-+    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-+	echo i586-pc-beos
-+	exit ;;
-+    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
-+	echo i586-pc-haiku
-+	exit ;;
-+    SX-4:SUPER-UX:*:*)
-+	echo sx4-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-5:SUPER-UX:*:*)
-+	echo sx5-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-6:SUPER-UX:*:*)
-+	echo sx6-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-7:SUPER-UX:*:*)
-+	echo sx7-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8:SUPER-UX:*:*)
-+	echo sx8-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    SX-8R:SUPER-UX:*:*)
-+	echo sx8r-nec-superux${UNAME_RELEASE}
-+	exit ;;
-+    Power*:Rhapsody:*:*)
-+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-+	exit ;;
-+    *:Rhapsody:*:*)
-+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-+	exit ;;
-+    *:Darwin:*:*)
-+	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-+	case $UNAME_PROCESSOR in
-+	    unknown) UNAME_PROCESSOR=powerpc ;;
-+	esac
-+	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-+	exit ;;
-+    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-+	UNAME_PROCESSOR=`uname -p`
-+	if test "$UNAME_PROCESSOR" = "x86"; then
-+		UNAME_PROCESSOR=i386
-+		UNAME_MACHINE=pc
-+	fi
-+	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-+	exit ;;
-+    *:QNX:*:4*)
-+	echo i386-pc-qnx
-+	exit ;;
-+    NSE-?:NONSTOP_KERNEL:*:*)
-+	echo nse-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    NSR-?:NONSTOP_KERNEL:*:*)
-+	echo nsr-tandem-nsk${UNAME_RELEASE}
-+	exit ;;
-+    *:NonStop-UX:*:*)
-+	echo mips-compaq-nonstopux
-+	exit ;;
-+    BS2000:POSIX*:*:*)
-+	echo bs2000-siemens-sysv
-+	exit ;;
-+    DS/*:UNIX_System_V:*:*)
-+	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-+	exit ;;
-+    *:Plan9:*:*)
-+	# "uname -m" is not consistent, so use $cputype instead. 386
-+	# is converted to i386 for consistency with other x86
-+	# operating systems.
-+	if test "$cputype" = "386"; then
-+	    UNAME_MACHINE=i386
-+	else
-+	    UNAME_MACHINE="$cputype"
-+	fi
-+	echo ${UNAME_MACHINE}-unknown-plan9
-+	exit ;;
-+    *:TOPS-10:*:*)
-+	echo pdp10-unknown-tops10
-+	exit ;;
-+    *:TENEX:*:*)
-+	echo pdp10-unknown-tenex
-+	exit ;;
-+    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-+	echo pdp10-dec-tops20
-+	exit ;;
-+    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-+	echo pdp10-xkl-tops20
-+	exit ;;
-+    *:TOPS-20:*:*)
-+	echo pdp10-unknown-tops20
-+	exit ;;
-+    *:ITS:*:*)
-+	echo pdp10-unknown-its
-+	exit ;;
-+    SEI:*:*:SEIUX)
-+        echo mips-sei-seiux${UNAME_RELEASE}
-+	exit ;;
-+    *:DragonFly:*:*)
-+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-+	exit ;;
-+    *:*VMS:*:*)
-+    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-+	case "${UNAME_MACHINE}" in
-+	    A*) echo alpha-dec-vms ; exit ;;
-+	    I*) echo ia64-dec-vms ; exit ;;
-+	    V*) echo vax-dec-vms ; exit ;;
-+	esac ;;
-+    *:XENIX:*:SysV)
-+	echo i386-pc-xenix
-+	exit ;;
-+    i*86:skyos:*:*)
-+	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-+	exit ;;
-+    i*86:rdos:*:*)
-+	echo ${UNAME_MACHINE}-pc-rdos
-+	exit ;;
-+    i*86:AROS:*:*)
-+	echo ${UNAME_MACHINE}-pc-aros
-+	exit ;;
-+esac
-+
-+#echo '(No uname command or uname output not recognized.)' 1>&2
-+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-+
-+eval $set_cc_for_build
-+cat >$dummy.c <<EOF
-+#ifdef _SEQUENT_
-+# include <sys/types.h>
-+# include <sys/utsname.h>
-+#endif
-+main ()
-+{
-+#if defined (sony)
-+#if defined (MIPSEB)
-+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-+     I don't know....  */
-+  printf ("mips-sony-bsd\n"); exit (0);
-+#else
-+#include <sys/param.h>
-+  printf ("m68k-sony-newsos%s\n",
-+#ifdef NEWSOS4
-+          "4"
-+#else
-+	  ""
-+#endif
-+         ); exit (0);
-+#endif
-+#endif
-+
-+#if defined (__arm) && defined (__acorn) && defined (__unix)
-+  printf ("arm-acorn-riscix\n"); exit (0);
-+#endif
-+
-+#if defined (hp300) && !defined (hpux)
-+  printf ("m68k-hp-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (NeXT)
-+#if !defined (__ARCHITECTURE__)
-+#define __ARCHITECTURE__ "m68k"
-+#endif
-+  int version;
-+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-+  if (version < 4)
-+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-+  else
-+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-+  exit (0);
-+#endif
-+
-+#if defined (MULTIMAX) || defined (n16)
-+#if defined (UMAXV)
-+  printf ("ns32k-encore-sysv\n"); exit (0);
-+#else
-+#if defined (CMU)
-+  printf ("ns32k-encore-mach\n"); exit (0);
-+#else
-+  printf ("ns32k-encore-bsd\n"); exit (0);
-+#endif
-+#endif
-+#endif
-+
-+#if defined (__386BSD__)
-+  printf ("i386-pc-bsd\n"); exit (0);
-+#endif
-+
-+#if defined (sequent)
-+#if defined (i386)
-+  printf ("i386-sequent-dynix\n"); exit (0);
-+#endif
-+#if defined (ns32000)
-+  printf ("ns32k-sequent-dynix\n"); exit (0);
-+#endif
-+#endif
-+
-+#if defined (_SEQUENT_)
-+    struct utsname un;
-+
-+    uname(&un);
-+
-+    if (strncmp(un.version, "V2", 2) == 0) {
-+	printf ("i386-sequent-ptx2\n"); exit (0);
-+    }
-+    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-+	printf ("i386-sequent-ptx1\n"); exit (0);
-+    }
-+    printf ("i386-sequent-ptx\n"); exit (0);
-+
-+#endif
-+
-+#if defined (vax)
-+# if !defined (ultrix)
-+#  include <sys/param.h>
-+#  if defined (BSD)
-+#   if BSD == 43
-+      printf ("vax-dec-bsd4.3\n"); exit (0);
-+#   else
-+#    if BSD == 199006
-+      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-+#    else
-+      printf ("vax-dec-bsd\n"); exit (0);
-+#    endif
-+#   endif
-+#  else
-+    printf ("vax-dec-bsd\n"); exit (0);
-+#  endif
-+# else
-+    printf ("vax-dec-ultrix\n"); exit (0);
-+# endif
-+#endif
-+
-+#if defined (alliant) && defined (i860)
-+  printf ("i860-alliant-bsd\n"); exit (0);
-+#endif
-+
-+  exit (1);
-+}
-+EOF
-+
-+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-+	{ echo "$SYSTEM_NAME"; exit; }
-+
-+# Apollos put the system type in the environment.
-+
-+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-+
-+# Convex versions that predate uname can use getsysinfo(1)
-+
-+if [ -x /usr/convex/getsysinfo ]
-+then
-+    case `getsysinfo -f cpu_type` in
-+    c1*)
-+	echo c1-convex-bsd
-+	exit ;;
-+    c2*)
-+	if getsysinfo -f scalar_acc
-+	then echo c32-convex-bsd
-+	else echo c2-convex-bsd
-+	fi
-+	exit ;;
-+    c34*)
-+	echo c34-convex-bsd
-+	exit ;;
-+    c38*)
-+	echo c38-convex-bsd
-+	exit ;;
-+    c4*)
-+	echo c4-convex-bsd
-+	exit ;;
-+    esac
-+fi
-+
-+cat >&2 <<EOF
-+$0: unable to guess system type
-+
-+This script, last modified $timestamp, has failed to recognize
-+the operating system you are using. It is advised that you
-+download the most up to date version of the config scripts from
-+
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-+and
-+  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-+
-+If the version you run ($0) is already up to date, please
-+send the following data and any information you think might be
-+pertinent to <config-patches at gnu.org> in order to provide the needed
-+information to handle your system.
-+
-+config.guess timestamp = $timestamp
-+
-+uname -m = `(uname -m) 2>/dev/null || echo unknown`
-+uname -r = `(uname -r) 2>/dev/null || echo unknown`
-+uname -s = `(uname -s) 2>/dev/null || echo unknown`
-+uname -v = `(uname -v) 2>/dev/null || echo unknown`
-+
-+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-+/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-+
-+hostinfo               = `(hostinfo) 2>/dev/null`
-+/bin/universe          = `(/bin/universe) 2>/dev/null`
-+/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-+/bin/arch              = `(/bin/arch) 2>/dev/null`
-+/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-+
-+UNAME_MACHINE = ${UNAME_MACHINE}
-+UNAME_RELEASE = ${UNAME_RELEASE}
-+UNAME_SYSTEM  = ${UNAME_SYSTEM}
-+UNAME_VERSION = ${UNAME_VERSION}
-+EOF
-+
-+exit 1
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
---- /dev/null
+@@ -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, 2009
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-11-20'
++timestamp='2009-12-30'
+ 
+ # 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
+@@ -56,8 +56,9 @@ version="\
+ GNU config.guess ($timestamp)
+ 
+ Originally written by Per Bothner.
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+diff --git a/configure_aux/config.sub b/configure_aux/config.sub
+index 2a55a50..c2d1257 100755
+--- a/configure_aux/config.sub
 +++ b/configure_aux/config.sub
-@@ -0,0 +1,1693 @@
-+#! /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, 2009
-+#   Free Software Foundation, Inc.
-+
-+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
-+# can handle that machine.  It does not imply ALL GNU software can.
-+#
-+# 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
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-+# 02110-1301, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+
-+# Please send patches to <config-patches at gnu.org>.  Submit a context
-+# diff and a properly formatted ChangeLog entry.
-+#
-+# Configuration subroutine to validate and canonicalize a configuration type.
-+# Supply the specified configuration type as an argument.
-+# If it is invalid, we print an error message on stderr and exit with code 1.
-+# Otherwise, we print the canonical config type on stdout and succeed.
-+
-+# This file is supposed to be the same for all GNU packages
-+# and recognize all the CPU types, system types and aliases
-+# that are meaningful with *any* GNU software.
-+# Each package is responsible for reporting which valid configurations
-+# it does not support.  The user should be able to distinguish
-+# a failure to support a valid configuration from a meaningless
-+# configuration.
-+
-+# The goal of this file is to map all the various variations of a given
-+# machine specification into a single specification in the form:
-+#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-+# or in some cases, the newer four-part form:
-+#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-+# It is wrong to echo any other type of specification.
-+
-+me=`echo "$0" | sed -e 's,.*/,,'`
-+
-+usage="\
-+Usage: $0 [OPTION] CPU-MFR-OPSYS
-+       $0 [OPTION] ALIAS
-+
-+Canonicalize a configuration name.
-+
-+Operation modes:
-+  -h, --help         print this help, then exit
-+  -t, --time-stamp   print date of last modification, then exit
-+  -v, --version      print version number, then exit
-+
-+Report bugs and patches to <config-patches at gnu.org>."
-+
-+version="\
-+GNU config.sub ($timestamp)
-+
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+
-+This is free software; see the source for copying conditions.  There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-+
-+help="
-+Try \`$me --help' for more information."
-+
-+# Parse command line
-+while test $# -gt 0 ; do
-+  case $1 in
-+    --time-stamp | --time* | -t )
-+       echo "$timestamp" ; exit ;;
-+    --version | -v )
-+       echo "$version" ; exit ;;
-+    --help | --h* | -h )
-+       echo "$usage"; exit ;;
-+    -- )     # Stop option processing
-+       shift; break ;;
-+    - )	# Use stdin as input.
-+       break ;;
-+    -* )
-+       echo "$me: invalid option $1$help"
-+       exit 1 ;;
-+
-+    *local*)
-+       # First pass through any local machine types.
-+       echo $1
-+       exit ;;
-+
-+    * )
-+       break ;;
-+  esac
-+done
-+
-+case $# in
-+ 0) echo "$me: missing argument$help" >&2
-+    exit 1;;
-+ 1) ;;
-+ *) echo "$me: too many arguments$help" >&2
-+    exit 1;;
-+esac
-+
-+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-+# Here we must recognize all the valid KERNEL-OS combinations.
-+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-+case $maybe_os in
-+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-+  kopensolaris*-gnu* | \
-+  storm-chaos* | os2-emx* | rtmk-nova*)
-+    os=-$maybe_os
-+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-+    ;;
-+  *)
-+    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-+    if [ $basic_machine != $1 ]
-+    then os=`echo $1 | sed 's/.*-/-/'`
-+    else os=; fi
-+    ;;
-+esac
-+
-+### Let's recognize common machines as not being operating systems so
-+### that things like config.sub decstation-3100 work.  We also
-+### recognize some manufacturers as not being operating systems, so we
-+### can provide default operating systems below.
-+case $os in
-+	-sun*os*)
-+		# Prevent following clause from handling this invalid input.
-+		;;
-+	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-+	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-+	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-+	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-+	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-+	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-+	-apple | -axis | -knuth | -cray)
-+		os=
-+		basic_machine=$1
-+		;;
-+        -bluegene*)
-+	        os=-cnk
-+		;;
-+	-sim | -cisco | -oki | -wec | -winbond)
-+		os=
-+		basic_machine=$1
-+		;;
-+	-scout)
-+		;;
-+	-wrs)
-+		os=-vxworks
-+		basic_machine=$1
-+		;;
-+	-chorusos*)
-+		os=-chorusos
-+		basic_machine=$1
-+		;;
-+ 	-chorusrdb)
-+ 		os=-chorusrdb
-+		basic_machine=$1
-+ 		;;
-+	-hiux*)
-+		os=-hiuxwe2
-+		;;
-+	-sco6)
-+		os=-sco5v6
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco5)
-+		os=-sco3.2v5
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco4)
-+		os=-sco3.2v4
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco3.2.[4-9]*)
-+		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco3.2v[4-9]*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco5v6*)
-+		# Don't forget version if it is 3.2v4 or newer.
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-sco*)
-+		os=-sco3.2v2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-udk*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-isc)
-+		os=-isc2.2
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-clix*)
-+		basic_machine=clipper-intergraph
-+		;;
-+	-isc*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-+		;;
-+	-lynx*)
-+		os=-lynxos
-+		;;
-+	-ptx*)
-+		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-+		;;
-+	-windowsnt*)
-+		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-+		;;
-+	-psos*)
-+		os=-psos
-+		;;
-+	-mint | -mint[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
-+esac
-+
-+# Decode aliases for certain CPU-COMPANY combinations.
-+case $basic_machine in
-+	# Recognize the basic CPU types without company name.
-+	# Some are omitted here because they have special meanings below.
-+	1750a | 580 \
-+	| a29k \
-+	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-+	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-+	| am33_2.0 \
-+	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-+	| bfin \
-+	| c4x | clipper \
-+	| d10v | d30v | dlx | dsp16xx \
-+	| fido | fr30 | frv \
-+	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-+	| i370 | i860 | i960 | ia64 \
-+	| ip2k | iq2000 \
-+	| lm32 \
-+	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-+	| maxq | mb | microblaze | mcore | mep | metag \
-+	| mips | mipsbe | mipseb | mipsel | mipsle \
-+	| mips16 \
-+	| mips64 | mips64el \
-+	| mips64octeon | mips64octeonel \
-+	| mips64orion | mips64orionel \
-+	| mips64r5900 | mips64r5900el \
-+	| mips64vr | mips64vrel \
-+	| mips64vr4100 | mips64vr4100el \
-+	| mips64vr4300 | mips64vr4300el \
-+	| mips64vr5000 | mips64vr5000el \
-+	| mips64vr5900 | mips64vr5900el \
-+	| mipsisa32 | mipsisa32el \
-+	| mipsisa32r2 | mipsisa32r2el \
-+	| mipsisa64 | mipsisa64el \
-+	| mipsisa64r2 | mipsisa64r2el \
-+	| mipsisa64sb1 | mipsisa64sb1el \
-+	| mipsisa64sr71k | mipsisa64sr71kel \
-+	| mipstx39 | mipstx39el \
-+	| mn10200 | mn10300 \
-+	| moxie \
-+	| mt \
-+	| msp430 \
-+	| nios | nios2 \
-+	| ns16k | ns32k \
-+	| or32 \
-+	| pdp10 | pdp11 | pj | pjl \
-+	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-+	| pyramid \
-+	| score \
-+	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-+	| sh64 | sh64le \
-+	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-+	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-+	| spu | strongarm \
-+	| tahoe | thumb | tic4x | tic80 | tron \
-+	| v850 | v850e \
-+	| we32k \
-+	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-+	| z8k | z80)
-+		basic_machine=$basic_machine-unknown
-+		;;
-+	m6811 | m68hc11 | m6812 | m68hc12)
-+		# Motorola 68HC11/12.
-+		basic_machine=$basic_machine-unknown
-+		os=-none
-+		;;
-+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-+		;;
-+	ms1)
-+		basic_machine=mt-unknown
-+		;;
-+
-+	# We use `pc' rather than `unknown'
-+	# because (1) that's what they normally are, and
-+	# (2) the word "unknown" tends to confuse beginning users.
-+	i*86 | x86_64)
-+	  basic_machine=$basic_machine-pc
-+	  ;;
-+	# Object if more than one company name word.
-+	*-*-*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		exit 1
-+		;;
-+	# Recognize the basic CPU types with company name.
-+	580-* \
-+	| a29k-* \
-+	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-+	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-+	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-+	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-+	| avr-* | avr32-* \
-+	| bfin-* | bs2000-* \
-+	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-+	| clipper-* | craynv-* | cydra-* \
-+	| d10v-* | d30v-* | dlx-* \
-+	| elxsi-* \
-+	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-+	| h8300-* | h8500-* \
-+	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-+	| i*86-* | i860-* | i960-* | ia64-* \
-+	| ip2k-* | iq2000-* \
-+	| lm32-* \
-+	| m32c-* | m32r-* | m32rle-* \
-+	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
-+	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-+	| mips16-* \
-+	| mips64-* | mips64el-* \
-+	| mips64octeon-* | mips64octeonel-* \
-+	| mips64orion-* | mips64orionel-* \
-+	| mips64r5900-* | mips64r5900el-* \
-+	| mips64vr-* | mips64vrel-* \
-+	| mips64vr4100-* | mips64vr4100el-* \
-+	| mips64vr4300-* | mips64vr4300el-* \
-+	| mips64vr5000-* | mips64vr5000el-* \
-+	| mips64vr5900-* | mips64vr5900el-* \
-+	| mipsisa32-* | mipsisa32el-* \
-+	| mipsisa32r2-* | mipsisa32r2el-* \
-+	| mipsisa64-* | mipsisa64el-* \
-+	| mipsisa64r2-* | mipsisa64r2el-* \
-+	| mipsisa64sb1-* | mipsisa64sb1el-* \
-+	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-+	| mipstx39-* | mipstx39el-* \
-+	| mmix-* \
-+	| mt-* \
-+	| msp430-* \
-+	| nios-* | nios2-* \
-+	| none-* | np1-* | ns16k-* | ns32k-* \
-+	| orion-* \
-+	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-+	| pyramid-* \
-+	| romp-* | rs6000-* \
-+	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-+	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-+	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-+	| sparclite-* \
-+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-+	| tahoe-* | thumb-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
-+	| tron-* \
-+	| v850-* | v850e-* | vax-* \
-+	| we32k-* \
-+	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-+	| xstormy16-* | xtensa*-* \
-+	| ymp-* \
-+	| z8k-* | z80-*)
-+		;;
-+	# Recognize the basic CPU types without company name, with glob match.
-+	xtensa*)
-+		basic_machine=$basic_machine-unknown
-+		;;
-+	# Recognize the various machine names and aliases which stand
-+	# for a CPU type and a company and sometimes even an OS.
-+	386bsd)
-+		basic_machine=i386-unknown
-+		os=-bsd
-+		;;
-+	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-+		basic_machine=m68000-att
-+		;;
-+	3b*)
-+		basic_machine=we32k-att
-+		;;
-+	a29khif)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+    	abacus)
-+		basic_machine=abacus-unknown
-+		;;
-+	adobe68k)
-+		basic_machine=m68010-adobe
-+		os=-scout
-+		;;
-+	alliant | fx80)
-+		basic_machine=fx80-alliant
-+		;;
-+	altos | altos3068)
-+		basic_machine=m68k-altos
-+		;;
-+	am29k)
-+		basic_machine=a29k-none
-+		os=-bsd
-+		;;
-+	amd64)
-+		basic_machine=x86_64-pc
-+		;;
-+	amd64-*)
-+		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	amdahl)
-+		basic_machine=580-amdahl
-+		os=-sysv
-+		;;
-+	amiga | amiga-*)
-+		basic_machine=m68k-unknown
-+		;;
-+	amigaos | amigados)
-+		basic_machine=m68k-unknown
-+		os=-amigaos
-+		;;
-+	amigaunix | amix)
-+		basic_machine=m68k-unknown
-+		os=-sysv4
-+		;;
-+	apollo68)
-+		basic_machine=m68k-apollo
-+		os=-sysv
-+		;;
-+	apollo68bsd)
-+		basic_machine=m68k-apollo
-+		os=-bsd
-+		;;
-+	aros)
-+		basic_machine=i386-pc
-+		os=-aros
-+		;;
-+	aux)
-+		basic_machine=m68k-apple
-+		os=-aux
-+		;;
-+	balance)
-+		basic_machine=ns32k-sequent
-+		os=-dynix
-+		;;
-+	blackfin)
-+		basic_machine=bfin-unknown
-+		os=-linux
-+		;;
-+	blackfin-*)
-+		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	bluegene*)
-+		basic_machine=powerpc-ibm
-+		os=-cnk
-+		;;
-+	c90)
-+		basic_machine=c90-cray
-+		os=-unicos
-+		;;
-+        cegcc)
-+		basic_machine=arm-unknown
-+		os=-cegcc
-+		;;
-+	convex-c1)
-+		basic_machine=c1-convex
-+		os=-bsd
-+		;;
-+	convex-c2)
-+		basic_machine=c2-convex
-+		os=-bsd
-+		;;
-+	convex-c32)
-+		basic_machine=c32-convex
-+		os=-bsd
-+		;;
-+	convex-c34)
-+		basic_machine=c34-convex
-+		os=-bsd
-+		;;
-+	convex-c38)
-+		basic_machine=c38-convex
-+		os=-bsd
-+		;;
-+	cray | j90)
-+		basic_machine=j90-cray
-+		os=-unicos
-+		;;
-+	craynv)
-+		basic_machine=craynv-cray
-+		os=-unicosmp
-+		;;
-+	cr16)
-+		basic_machine=cr16-unknown
-+		os=-elf
-+		;;
-+	crds | unos)
-+		basic_machine=m68k-crds
-+		;;
-+	crisv32 | crisv32-* | etraxfs*)
-+		basic_machine=crisv32-axis
-+		;;
-+	cris | cris-* | etrax*)
-+		basic_machine=cris-axis
-+		;;
-+	crx)
-+		basic_machine=crx-unknown
-+		os=-elf
-+		;;
-+	da30 | da30-*)
-+		basic_machine=m68k-da30
-+		;;
-+	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-+		basic_machine=mips-dec
-+		;;
-+	decsystem10* | dec10*)
-+		basic_machine=pdp10-dec
-+		os=-tops10
-+		;;
-+	decsystem20* | dec20*)
-+		basic_machine=pdp10-dec
-+		os=-tops20
-+		;;
-+	delta | 3300 | motorola-3300 | motorola-delta \
-+	      | 3300-motorola | delta-motorola)
-+		basic_machine=m68k-motorola
-+		;;
-+	delta88)
-+		basic_machine=m88k-motorola
-+		os=-sysv3
-+		;;
-+	dicos)
-+		basic_machine=i686-pc
-+		os=-dicos
-+		;;
-+	djgpp)
-+		basic_machine=i586-pc
-+		os=-msdosdjgpp
-+		;;
-+	dpx20 | dpx20-*)
-+		basic_machine=rs6000-bull
-+		os=-bosx
-+		;;
-+	dpx2* | dpx2*-bull)
-+		basic_machine=m68k-bull
-+		os=-sysv3
-+		;;
-+	ebmon29k)
-+		basic_machine=a29k-amd
-+		os=-ebmon
-+		;;
-+	elxsi)
-+		basic_machine=elxsi-elxsi
-+		os=-bsd
-+		;;
-+	encore | umax | mmax)
-+		basic_machine=ns32k-encore
-+		;;
-+	es1800 | OSE68k | ose68k | ose | OSE)
-+		basic_machine=m68k-ericsson
-+		os=-ose
-+		;;
-+	fx2800)
-+		basic_machine=i860-alliant
-+		;;
-+	genix)
-+		basic_machine=ns32k-ns
-+		;;
-+	gmicro)
-+		basic_machine=tron-gmicro
-+		os=-sysv
-+		;;
-+	go32)
-+		basic_machine=i386-pc
-+		os=-go32
-+		;;
-+	h3050r* | hiux*)
-+		basic_machine=hppa1.1-hitachi
-+		os=-hiuxwe2
-+		;;
-+	h8300hms)
-+		basic_machine=h8300-hitachi
-+		os=-hms
-+		;;
-+	h8300xray)
-+		basic_machine=h8300-hitachi
-+		os=-xray
-+		;;
-+	h8500hms)
-+		basic_machine=h8500-hitachi
-+		os=-hms
-+		;;
-+	harris)
-+		basic_machine=m88k-harris
-+		os=-sysv3
-+		;;
-+	hp300-*)
-+		basic_machine=m68k-hp
-+		;;
-+	hp300bsd)
-+		basic_machine=m68k-hp
-+		os=-bsd
-+		;;
-+	hp300hpux)
-+		basic_machine=m68k-hp
-+		os=-hpux
-+		;;
-+	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hp9k2[0-9][0-9] | hp9k31[0-9])
-+		basic_machine=m68000-hp
-+		;;
-+	hp9k3[2-9][0-9])
-+		basic_machine=m68k-hp
-+		;;
-+	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k78[0-9] | hp78[0-9])
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-+		# FIXME: really hppa2.0-hp
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[0-9][13679] | hp8[0-9][13679])
-+		basic_machine=hppa1.1-hp
-+		;;
-+	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-+		basic_machine=hppa1.0-hp
-+		;;
-+	hppa-next)
-+		os=-nextstep3
-+		;;
-+	hppaosf)
-+		basic_machine=hppa1.1-hp
-+		os=-osf
-+		;;
-+	hppro)
-+		basic_machine=hppa1.1-hp
-+		os=-proelf
-+		;;
-+	i370-ibm* | ibm*)
-+		basic_machine=i370-ibm
-+		;;
-+# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-+	i*86v32)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv32
-+		;;
-+	i*86v4*)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv4
-+		;;
-+	i*86v)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-sysv
-+		;;
-+	i*86sol2)
-+		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-+		os=-solaris2
-+		;;
-+	i386mach)
-+		basic_machine=i386-mach
-+		os=-mach
-+		;;
-+	i386-vsta | vsta)
-+		basic_machine=i386-unknown
-+		os=-vsta
-+		;;
-+	iris | iris4d)
-+		basic_machine=mips-sgi
-+		case $os in
-+		    -irix*)
-+			;;
-+		    *)
-+			os=-irix4
-+			;;
-+		esac
-+		;;
-+	isi68 | isi)
-+		basic_machine=m68k-isi
-+		os=-sysv
-+		;;
-+	m68knommu)
-+		basic_machine=m68k-unknown
-+		os=-linux
-+		;;
-+	m68knommu-*)
-+		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	m88k-omron*)
-+		basic_machine=m88k-omron
-+		;;
-+	magnum | m3230)
-+		basic_machine=mips-mips
-+		os=-sysv
-+		;;
-+	merlin)
-+		basic_machine=ns32k-utek
-+		os=-sysv
-+		;;
-+	mingw32)
-+		basic_machine=i386-pc
-+		os=-mingw32
-+		;;
-+	mingw32ce)
-+		basic_machine=arm-unknown
-+		os=-mingw32ce
-+		;;
-+	miniframe)
-+		basic_machine=m68000-convergent
-+		;;
-+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-+		basic_machine=m68k-atari
-+		os=-mint
-+		;;
-+	mips3*-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-+		;;
-+	mips3*)
-+		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-+		;;
-+	monitor)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	morphos)
-+		basic_machine=powerpc-unknown
-+		os=-morphos
-+		;;
-+	msdos)
-+		basic_machine=i386-pc
-+		os=-msdos
-+		;;
-+	ms1-*)
-+		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-+		;;
-+	mvs)
-+		basic_machine=i370-ibm
-+		os=-mvs
-+		;;
-+	ncr3000)
-+		basic_machine=i486-ncr
-+		os=-sysv4
-+		;;
-+	netbsd386)
-+		basic_machine=i386-unknown
-+		os=-netbsd
-+		;;
-+	netwinder)
-+		basic_machine=armv4l-rebel
-+		os=-linux
-+		;;
-+	news | news700 | news800 | news900)
-+		basic_machine=m68k-sony
-+		os=-newsos
-+		;;
-+	news1000)
-+		basic_machine=m68030-sony
-+		os=-newsos
-+		;;
-+	news-3600 | risc-news)
-+		basic_machine=mips-sony
-+		os=-newsos
-+		;;
-+	necv70)
-+		basic_machine=v70-nec
-+		os=-sysv
-+		;;
-+	next | m*-next )
-+		basic_machine=m68k-next
-+		case $os in
-+		    -nextstep* )
-+			;;
-+		    -ns2*)
-+		      os=-nextstep2
-+			;;
-+		    *)
-+		      os=-nextstep3
-+			;;
-+		esac
-+		;;
-+	nh3000)
-+		basic_machine=m68k-harris
-+		os=-cxux
-+		;;
-+	nh[45]000)
-+		basic_machine=m88k-harris
-+		os=-cxux
-+		;;
-+	nindy960)
-+		basic_machine=i960-intel
-+		os=-nindy
-+		;;
-+	mon960)
-+		basic_machine=i960-intel
-+		os=-mon960
-+		;;
-+	nonstopux)
-+		basic_machine=mips-compaq
-+		os=-nonstopux
-+		;;
-+	np1)
-+		basic_machine=np1-gould
-+		;;
-+	nsr-tandem)
-+		basic_machine=nsr-tandem
-+		;;
-+	op50n-* | op60c-*)
-+		basic_machine=hppa1.1-oki
-+		os=-proelf
-+		;;
-+	openrisc | openrisc-*)
-+		basic_machine=or32-unknown
-+		;;
-+	os400)
-+		basic_machine=powerpc-ibm
-+		os=-os400
-+		;;
-+	OSE68000 | ose68000)
-+		basic_machine=m68000-ericsson
-+		os=-ose
-+		;;
-+	os68k)
-+		basic_machine=m68k-none
-+		os=-os68k
-+		;;
-+	pa-hitachi)
-+		basic_machine=hppa1.1-hitachi
-+		os=-hiuxwe2
-+		;;
-+	paragon)
-+		basic_machine=i860-intel
-+		os=-osf
-+		;;
-+	parisc)
-+		basic_machine=hppa-unknown
-+		os=-linux
-+		;;
-+	parisc-*)
-+		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		os=-linux
-+		;;
-+	pbd)
-+		basic_machine=sparc-tti
-+		;;
-+	pbb)
-+		basic_machine=m68k-tti
-+		;;
-+	pc532 | pc532-*)
-+		basic_machine=ns32k-pc532
-+		;;
-+	pc98)
-+		basic_machine=i386-pc
-+		;;
-+	pc98-*)
-+		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentium | p5 | k5 | k6 | nexgen | viac3)
-+		basic_machine=i586-pc
-+		;;
-+	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-+		basic_machine=i686-pc
-+		;;
-+	pentiumii | pentium2 | pentiumiii | pentium3)
-+		basic_machine=i686-pc
-+		;;
-+	pentium4)
-+		basic_machine=i786-pc
-+		;;
-+	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-+		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-+		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pentium4-*)
-+		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	pn)
-+		basic_machine=pn-gould
-+		;;
-+	power)	basic_machine=power-ibm
-+		;;
-+	ppc)	basic_machine=powerpc-unknown
-+		;;
-+	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppcle | powerpclittle | ppc-le | powerpc-little)
-+		basic_machine=powerpcle-unknown
-+		;;
-+	ppcle-* | powerpclittle-*)
-+		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64)	basic_machine=powerpc64-unknown
-+		;;
-+	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-+		basic_machine=powerpc64le-unknown
-+		;;
-+	ppc64le-* | powerpc64little-*)
-+		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-+		;;
-+	ps2)
-+		basic_machine=i386-ibm
-+		;;
-+	pw32)
-+		basic_machine=i586-unknown
-+		os=-pw32
-+		;;
-+	rdos)
-+		basic_machine=i386-pc
-+		os=-rdos
-+		;;
-+	rom68k)
-+		basic_machine=m68k-rom68k
-+		os=-coff
-+		;;
-+	rm[46]00)
-+		basic_machine=mips-siemens
-+		;;
-+	rtpc | rtpc-*)
-+		basic_machine=romp-ibm
-+		;;
-+	s390 | s390-*)
-+		basic_machine=s390-ibm
-+		;;
-+	s390x | s390x-*)
-+		basic_machine=s390x-ibm
-+		;;
-+	sa29200)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	sb1)
-+		basic_machine=mipsisa64sb1-unknown
-+		;;
-+	sb1el)
-+		basic_machine=mipsisa64sb1el-unknown
-+		;;
-+	sde)
-+		basic_machine=mipsisa32-sde
-+		os=-elf
-+		;;
-+	sei)
-+		basic_machine=mips-sei
-+		os=-seiux
-+		;;
-+	sequent)
-+		basic_machine=i386-sequent
-+		;;
-+	sh)
-+		basic_machine=sh-hitachi
-+		os=-hms
-+		;;
-+	sh5el)
-+		basic_machine=sh5le-unknown
-+		;;
-+	sh64)
-+		basic_machine=sh64-unknown
-+		;;
-+	sparclite-wrs | simso-wrs)
-+		basic_machine=sparclite-wrs
-+		os=-vxworks
-+		;;
-+	sps7)
-+		basic_machine=m68k-bull
-+		os=-sysv2
-+		;;
-+	spur)
-+		basic_machine=spur-unknown
-+		;;
-+	st2000)
-+		basic_machine=m68k-tandem
-+		;;
-+	stratus)
-+		basic_machine=i860-stratus
-+		os=-sysv4
-+		;;
-+	sun2)
-+		basic_machine=m68000-sun
-+		;;
-+	sun2os3)
-+		basic_machine=m68000-sun
-+		os=-sunos3
-+		;;
-+	sun2os4)
-+		basic_machine=m68000-sun
-+		os=-sunos4
-+		;;
-+	sun3os3)
-+		basic_machine=m68k-sun
-+		os=-sunos3
-+		;;
-+	sun3os4)
-+		basic_machine=m68k-sun
-+		os=-sunos4
-+		;;
-+	sun4os3)
-+		basic_machine=sparc-sun
-+		os=-sunos3
-+		;;
-+	sun4os4)
-+		basic_machine=sparc-sun
-+		os=-sunos4
-+		;;
-+	sun4sol2)
-+		basic_machine=sparc-sun
-+		os=-solaris2
-+		;;
-+	sun3 | sun3-*)
-+		basic_machine=m68k-sun
-+		;;
-+	sun4)
-+		basic_machine=sparc-sun
-+		;;
-+	sun386 | sun386i | roadrunner)
-+		basic_machine=i386-sun
-+		;;
-+	sv1)
-+		basic_machine=sv1-cray
-+		os=-unicos
-+		;;
-+	symmetry)
-+		basic_machine=i386-sequent
-+		os=-dynix
-+		;;
-+	t3e)
-+		basic_machine=alphaev5-cray
-+		os=-unicos
-+		;;
-+	t90)
-+		basic_machine=t90-cray
-+		os=-unicos
-+		;;
-+	tic54x | c54x*)
-+		basic_machine=tic54x-unknown
-+		os=-coff
-+		;;
-+	tic55x | c55x*)
-+		basic_machine=tic55x-unknown
-+		os=-coff
-+		;;
-+	tic6x | c6x*)
-+		basic_machine=tic6x-unknown
-+		os=-coff
-+		;;
-+	tile*)
-+		basic_machine=tile-unknown
+@@ -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, 2009
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+ #   Free Software Foundation, Inc.
+ 
+-timestamp='2009-11-20'
++timestamp='2010-01-22'
+ 
+ # This file is (in principle) common to ALL GNU software.
+ # The presence of a machine in this file suggests that SOME GNU software
+@@ -75,8 +75,9 @@ Report bugs and patches to <config-patches at gnu.org>."
+ version="\
+ GNU config.sub ($timestamp)
+ 
+-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
+ 
+ This is free software; see the source for copying conditions.  There is NO
+ warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+@@ -380,7 +381,8 @@ case $basic_machine in
+ 	| sparclite-* \
+ 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
+ 	| tahoe-* | thumb-* \
+-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
++	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile-* | tilegx-* \
+ 	| tron-* \
+ 	| ubicom32-* \
+ 	| v850-* | v850e-* | vax-* \
+@@ -1085,6 +1087,11 @@ case $basic_machine in
+ 		basic_machine=tic6x-unknown
+ 		os=-coff
+ 		;;
++        # This must be matched before tile*.
++        tilegx*)
++		basic_machine=tilegx-unknown
 +		os=-linux-gnu
 +		;;
-+	tx39)
-+		basic_machine=mipstx39-unknown
-+		;;
-+	tx39el)
-+		basic_machine=mipstx39el-unknown
-+		;;
-+	toad1)
-+		basic_machine=pdp10-xkl
-+		os=-tops20
-+		;;
-+	tower | tower-32)
-+		basic_machine=m68k-ncr
-+		;;
-+	tpf)
-+		basic_machine=s390x-ibm
-+		os=-tpf
-+		;;
-+	udi29k)
-+		basic_machine=a29k-amd
-+		os=-udi
-+		;;
-+	ultra3)
-+		basic_machine=a29k-nyu
-+		os=-sym1
-+		;;
-+	v810 | necv810)
-+		basic_machine=v810-nec
-+		os=-none
-+		;;
-+	vaxv)
-+		basic_machine=vax-dec
-+		os=-sysv
-+		;;
-+	vms)
-+		basic_machine=vax-dec
-+		os=-vms
-+		;;
-+	vpp*|vx|vx-*)
-+		basic_machine=f301-fujitsu
-+		;;
-+	vxworks960)
-+		basic_machine=i960-wrs
-+		os=-vxworks
-+		;;
-+	vxworks68)
-+		basic_machine=m68k-wrs
-+		os=-vxworks
-+		;;
-+	vxworks29k)
-+		basic_machine=a29k-wrs
-+		os=-vxworks
-+		;;
-+	w65*)
-+		basic_machine=w65-wdc
-+		os=-none
-+		;;
-+	w89k-*)
-+		basic_machine=hppa1.1-winbond
-+		os=-proelf
-+		;;
-+	xbox)
-+		basic_machine=i686-pc
-+		os=-mingw32
-+		;;
-+	xps | xps100)
-+		basic_machine=xps100-honeywell
-+		;;
-+	ymp)
-+		basic_machine=ymp-cray
-+		os=-unicos
-+		;;
-+	z8k-*-coff)
-+		basic_machine=z8k-unknown
-+		os=-sim
-+		;;
-+	z80-*-coff)
-+		basic_machine=z80-unknown
-+		os=-sim
-+		;;
-+	none)
-+		basic_machine=none-none
-+		os=-none
-+		;;
-+
-+# Here we handle the default manufacturer of certain CPU types.  It is in
-+# some cases the only manufacturer, in others, it is the most popular.
-+	w89k)
-+		basic_machine=hppa1.1-winbond
-+		;;
-+	op50n)
-+		basic_machine=hppa1.1-oki
-+		;;
-+	op60c)
-+		basic_machine=hppa1.1-oki
-+		;;
-+	romp)
-+		basic_machine=romp-ibm
-+		;;
-+	mmix)
-+		basic_machine=mmix-knuth
-+		;;
-+	rs6000)
-+		basic_machine=rs6000-ibm
-+		;;
-+	vax)
-+		basic_machine=vax-dec
-+		;;
-+	pdp10)
-+		# there are many clones, so DEC is not a safe bet
-+		basic_machine=pdp10-unknown
-+		;;
-+	pdp11)
-+		basic_machine=pdp11-dec
-+		;;
-+	we32k)
-+		basic_machine=we32k-att
-+		;;
-+	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
-+		basic_machine=sh-unknown
-+		;;
-+	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-+		basic_machine=sparc-sun
-+		;;
-+	cydra)
-+		basic_machine=cydra-cydrome
-+		;;
-+	orion)
-+		basic_machine=orion-highlevel
-+		;;
-+	orion105)
-+		basic_machine=clipper-highlevel
-+		;;
-+	mac | mpw | mac-mpw)
-+		basic_machine=m68k-apple
-+		;;
-+	pmac | pmac-mpw)
-+		basic_machine=powerpc-apple
-+		;;
-+	*-unknown)
-+		# Make sure to match an already-canonicalized machine name.
-+		;;
-+	*)
-+		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-+		exit 1
-+		;;
-+esac
-+
-+# Here we canonicalize certain aliases for manufacturers.
-+case $basic_machine in
-+	*-digital*)
-+		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-+		;;
-+	*-commodore*)
-+		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-+		;;
-+	*)
-+		;;
-+esac
-+
-+# Decode manufacturer-specific aliases for certain operating systems.
-+
-+if [ x"$os" != x"" ]
-+then
-+case $os in
-+        # First match some system type aliases
-+        # that might get confused with valid system types.
-+	# -solaris* is a basic system type, with this one exception.
-+	-solaris1 | -solaris1.*)
-+		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-+		;;
-+	-solaris)
-+		os=-solaris2
-+		;;
-+	-svr4*)
-+		os=-sysv4
-+		;;
-+	-unixware*)
-+		os=-sysv4.2uw
-+		;;
-+	-gnu/linux*)
-+		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-+		;;
-+	# First accept the basic system types.
-+	# The portable systems comes first.
-+	# 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* | -cnk* | -sunos | -sunos[34]*\
-+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -kopensolaris* \
-+	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-+	      | -aos* | -aros* \
-+	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-+	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-+	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-+	      | -openbsd* | -solidbsd* \
-+	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-+	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-+	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-+	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-+	      | -chorusos* | -chorusrdb* | -cegcc* \
-+	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-+	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -uxpv* | -beos* | -mpeix* | -udk* \
-+	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-+	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-+	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-+	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-+	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-+	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-+	# Remember, each alternative MUST END IN *, to match a version number.
-+		;;
-+	-qnx*)
-+		case $basic_machine in
-+		    x86-* | i*86-*)
-+			;;
-+		    *)
-+			os=-nto$os
-+			;;
-+		esac
-+		;;
-+	-nto-qnx*)
-+		;;
-+	-nto*)
-+		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-+		;;
-+	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-+	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-+		;;
-+	-mac*)
-+		os=`echo $os | sed -e 's|mac|macos|'`
-+		;;
-+	-linux-dietlibc)
-+		os=-linux-dietlibc
-+		;;
-+	-linux*)
-+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-+		;;
-+	-sunos5*)
-+		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-+		;;
-+	-sunos6*)
-+		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-+		;;
-+	-opened*)
-+		os=-openedition
-+		;;
-+        -os400*)
-+		os=-os400
-+		;;
-+	-wince*)
-+		os=-wince
-+		;;
-+	-osfrose*)
-+		os=-osfrose
-+		;;
-+	-osf*)
-+		os=-osf
-+		;;
-+	-utek*)
-+		os=-bsd
-+		;;
-+	-dynix*)
-+		os=-bsd
-+		;;
-+	-acis*)
-+		os=-aos
-+		;;
-+	-atheos*)
-+		os=-atheos
-+		;;
-+	-syllable*)
-+		os=-syllable
-+		;;
-+	-386bsd)
-+		os=-bsd
-+		;;
-+	-ctix* | -uts*)
-+		os=-sysv
-+		;;
-+	-nova*)
-+		os=-rtmk-nova
-+		;;
-+	-ns2 )
-+		os=-nextstep2
-+		;;
-+	-nsk*)
-+		os=-nsk
-+		;;
-+	# Preserve the version number of sinix5.
-+	-sinix5.*)
-+		os=`echo $os | sed -e 's|sinix|sysv|'`
-+		;;
-+	-sinix*)
-+		os=-sysv4
-+		;;
-+        -tpf*)
-+		os=-tpf
-+		;;
-+	-triton*)
-+		os=-sysv3
-+		;;
-+	-oss*)
-+		os=-sysv3
-+		;;
-+	-svr4)
-+		os=-sysv4
-+		;;
-+	-svr3)
-+		os=-sysv3
-+		;;
-+	-sysvr4)
-+		os=-sysv4
-+		;;
-+	# This must come after -sysvr4.
-+	-sysv*)
-+		;;
-+	-ose*)
-+		os=-ose
-+		;;
-+	-es1800*)
-+		os=-ose
-+		;;
-+	-xenix)
-+		os=-xenix
-+		;;
-+	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+		os=-mint
-+		;;
-+	-aros*)
-+		os=-aros
-+		;;
-+	-kaos*)
-+		os=-kaos
-+		;;
-+	-zvmoe)
-+		os=-zvmoe
-+		;;
-+	-dicos*)
-+		os=-dicos
-+		;;
-+	-none)
-+		;;
-+	*)
-+		# Get rid of the `-' at the beginning of $os.
-+		os=`echo $os | sed 's/[^-]*-//'`
-+		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-+		exit 1
-+		;;
-+esac
-+else
-+
-+# Here we handle the default operating systems that come with various machines.
-+# The value should be what the vendor currently ships out the door with their
-+# machine or put another way, the most popular os provided with the machine.
-+
-+# Note that if you're going to try to match "-MANUFACTURER" here (say,
-+# "-sun"), then you have to tell the case statement up towards the top
-+# that MANUFACTURER isn't an operating system.  Otherwise, code above
-+# will signal an error saying that MANUFACTURER isn't an operating
-+# system, and we'll never get to this point.
-+
-+case $basic_machine in
-+        score-*)
-+		os=-elf
-+		;;
-+        spu-*)
-+		os=-elf
-+		;;
-+	*-acorn)
-+		os=-riscix1.2
-+		;;
-+	arm*-rebel)
-+		os=-linux
-+		;;
-+	arm*-semi)
-+		os=-aout
-+		;;
-+        c4x-* | tic4x-*)
-+        	os=-coff
-+		;;
-+	# This must come before the *-dec entry.
-+	pdp10-*)
-+		os=-tops20
-+		;;
-+	pdp11-*)
-+		os=-none
-+		;;
-+	*-dec | vax-*)
-+		os=-ultrix4.2
-+		;;
-+	m68*-apollo)
-+		os=-domain
-+		;;
-+	i386-sun)
-+		os=-sunos4.0.2
-+		;;
-+	m68000-sun)
-+		os=-sunos3
-+		# This also exists in the configure program, but was not the
-+		# default.
-+		# os=-sunos4
-+		;;
-+	m68*-cisco)
-+		os=-aout
-+		;;
-+        mep-*)
-+		os=-elf
-+		;;
-+	mips*-cisco)
-+		os=-elf
-+		;;
-+	mips*-*)
-+		os=-elf
-+		;;
-+	or32-*)
-+		os=-coff
-+		;;
-+	*-tti)	# must be before sparc entry or we get the wrong os.
-+		os=-sysv3
-+		;;
-+	sparc-* | *-sun)
-+		os=-sunos4.1.1
-+		;;
-+	*-be)
-+		os=-beos
-+		;;
-+	*-haiku)
-+		os=-haiku
-+		;;
-+	*-ibm)
-+		os=-aix
-+		;;
-+    	*-knuth)
-+		os=-mmixware
-+		;;
-+	*-wec)
-+		os=-proelf
-+		;;
-+	*-winbond)
-+		os=-proelf
-+		;;
-+	*-oki)
-+		os=-proelf
-+		;;
-+	*-hp)
-+		os=-hpux
-+		;;
-+	*-hitachi)
-+		os=-hiux
-+		;;
-+	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-+		os=-sysv
-+		;;
-+	*-cbm)
-+		os=-amigaos
-+		;;
-+	*-dg)
-+		os=-dgux
-+		;;
-+	*-dolphin)
-+		os=-sysv3
-+		;;
-+	m68k-ccur)
-+		os=-rtu
-+		;;
-+	m88k-omron*)
-+		os=-luna
-+		;;
-+	*-next )
-+		os=-nextstep
-+		;;
-+	*-sequent)
-+		os=-ptx
-+		;;
-+	*-crds)
-+		os=-unos
-+		;;
-+	*-ns)
-+		os=-genix
-+		;;
-+	i370-*)
-+		os=-mvs
-+		;;
-+	*-next)
-+		os=-nextstep3
-+		;;
-+	*-gould)
-+		os=-sysv
-+		;;
-+	*-highlevel)
-+		os=-bsd
-+		;;
-+	*-encore)
-+		os=-bsd
-+		;;
-+	*-sgi)
-+		os=-irix
-+		;;
-+	*-siemens)
-+		os=-sysv4
-+		;;
-+	*-masscomp)
-+		os=-rtu
-+		;;
-+	f30[01]-fujitsu | f700-fujitsu)
-+		os=-uxpv
-+		;;
-+	*-rom68k)
-+		os=-coff
-+		;;
-+	*-*bug)
-+		os=-coff
-+		;;
-+	*-apple)
-+		os=-macos
-+		;;
-+	*-atari*)
-+		os=-mint
-+		;;
-+	*)
-+		os=-none
-+		;;
-+esac
-+fi
-+
-+# Here we handle the case where we know the os, and the CPU type, but not the
-+# manufacturer.  We pick the logical manufacturer.
-+vendor=unknown
-+case $basic_machine in
-+	*-unknown)
-+		case $os in
-+			-riscix*)
-+				vendor=acorn
-+				;;
-+			-sunos*)
-+				vendor=sun
-+				;;
-+			-cnk*|-aix*)
-+				vendor=ibm
-+				;;
-+			-beos*)
-+				vendor=be
-+				;;
-+			-hpux*)
-+				vendor=hp
-+				;;
-+			-mpeix*)
-+				vendor=hp
-+				;;
-+			-hiux*)
-+				vendor=hitachi
-+				;;
-+			-unos*)
-+				vendor=crds
-+				;;
-+			-dgux*)
-+				vendor=dg
-+				;;
-+			-luna*)
-+				vendor=omron
-+				;;
-+			-genix*)
-+				vendor=ns
-+				;;
-+			-mvs* | -opened*)
-+				vendor=ibm
-+				;;
-+			-os400*)
-+				vendor=ibm
-+				;;
-+			-ptx*)
-+				vendor=sequent
-+				;;
-+			-tpf*)
-+				vendor=ibm
-+				;;
-+			-vxsim* | -vxworks* | -windiss*)
-+				vendor=wrs
-+				;;
-+			-aux*)
-+				vendor=apple
-+				;;
-+			-hms*)
-+				vendor=hitachi
-+				;;
-+			-mpw* | -macos*)
-+				vendor=apple
-+				;;
-+			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-+				vendor=atari
-+				;;
-+			-vos*)
-+				vendor=stratus
-+				;;
-+		esac
-+		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-+		;;
-+esac
-+
-+echo $basic_machine$os
-+exit
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "timestamp='"
-+# time-stamp-format: "%:y-%02m-%02d"
-+# time-stamp-end: "'"
-+# End:
---- /dev/null
-+++ b/configure_aux/depcomp
-@@ -0,0 +1,630 @@
-+#! /bin/sh
-+# depcomp - compile a program generating dependencies as side-effects
-+
-+scriptversion=2009-04-28.21; # UTC
-+
-+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-+# Software Foundation, Inc.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+# Originally written by Alexandre Oliva <oliva at dcc.unicamp.br>.
-+
-+case $1 in
-+  '')
-+     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-+     exit 1;
-+     ;;
-+  -h | --h*)
-+    cat <<\EOF
-+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-+
-+Run PROGRAMS ARGS to compile a file, generating dependencies
-+as side-effects.
-+
-+Environment variables:
-+  depmode     Dependency tracking mode.
-+  source      Source file read by `PROGRAMS ARGS'.
-+  object      Object file output by `PROGRAMS ARGS'.
-+  DEPDIR      directory where to store dependencies.
-+  depfile     Dependency file to output.
-+  tmpdepfile  Temporary file to use when outputing dependencies.
-+  libtool     Whether libtool is used (yes/no).
-+
-+Report bugs to <bug-automake at gnu.org>.
-+EOF
-+    exit $?
-+    ;;
-+  -v | --v*)
-+    echo "depcomp $scriptversion"
-+    exit $?
-+    ;;
-+esac
-+
-+if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-+  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-+  exit 1
-+fi
-+
-+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-+depfile=${depfile-`echo "$object" |
-+  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-+tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-+
-+rm -f "$tmpdepfile"
-+
-+# Some modes work just like other modes, but use different flags.  We
-+# parameterize here, but still list the modes in the big case below,
-+# to make depend.m4 easier to write.  Note that we *cannot* use a case
-+# here, because this file can only contain one case statement.
-+if test "$depmode" = hp; then
-+  # HP compiler uses -M and no extra arg.
-+  gccflag=-M
-+  depmode=gcc
-+fi
-+
-+if test "$depmode" = dashXmstdout; then
-+   # This is just like dashmstdout with a different argument.
-+   dashmflag=-xM
-+   depmode=dashmstdout
-+fi
-+
-+cygpath_u="cygpath -u -f -"
-+if test "$depmode" = msvcmsys; then
-+   # This is just like msvisualcpp but w/o cygpath translation.
-+   # Just convert the backslash-escaped backslashes to single forward
-+   # slashes to satisfy depend.m4
-+   cygpath_u="sed s,\\\\\\\\,/,g"
-+   depmode=msvisualcpp
-+fi
-+
-+case "$depmode" in
-+gcc3)
-+## gcc 3 implements dependency tracking that does exactly what
-+## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-+## it if -MD -MP comes after the -MF stuff.  Hmm.
-+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-+## the command line argument order; so add the flags where they
-+## appear in depend2.am.  Note that the slowdown incurred here
-+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
-+  for arg
-+  do
-+    case $arg in
-+    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
-+    *)  set fnord "$@" "$arg" ;;
-+    esac
-+    shift # fnord
-+    shift # $arg
-+  done
-+  "$@"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  mv "$tmpdepfile" "$depfile"
-+  ;;
-+
-+gcc)
-+## There are various ways to get dependency output from gcc.  Here's
-+## why we pick this rather obscure method:
-+## - Don't want to use -MD because we'd like the dependencies to end
-+##   up in a subdir.  Having to rename by hand is ugly.
-+##   (We might end up doing this anyway to support other compilers.)
-+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-+##   -MM, not -M (despite what the docs say).
-+## - Using -M directly means running the compiler twice (even worse
-+##   than renaming).
-+  if test -z "$gccflag"; then
-+    gccflag=-MD,
-+  fi
-+  "$@" -Wp,"$gccflag$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-+## The second -e expression handles DOS-style file names with drive letters.
-+  sed -e 's/^[^:]*: / /' \
-+      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-+## This next piece of magic avoids the `deleted header file' problem.
-+## The problem is that when a header file which appears in a .P file
-+## is deleted, the dependency causes make to die (because there is
-+## typically no way to rebuild the header).  We avoid this by adding
-+## dummy dependencies for each header file.  Too bad gcc doesn't do
-+## this for us directly.
-+  tr ' ' '
-+' < "$tmpdepfile" |
-+## Some versions of gcc put a space before the `:'.  On the theory
-+## that the space means something, we add a space to the output as
-+## well.
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+hp)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
-+sgi)
-+  if test "$libtool" = yes; then
-+    "$@" "-Wp,-MDupdate,$tmpdepfile"
-+  else
-+    "$@" -MDupdate "$tmpdepfile"
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+
-+  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-+    echo "$object : \\" > "$depfile"
-+
-+    # Clip off the initial element (the dependent).  Don't try to be
-+    # clever and replace this with sed code, as IRIX sed won't handle
-+    # lines with more than a fixed number of characters (4096 in
-+    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-+    # the IRIX cc adds comments like `#:fec' to the end of the
-+    # dependency line.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-+    tr '
-+' ' ' >> "$depfile"
-+    echo >> "$depfile"
-+
-+    # The second pass generates a dummy entry for each header file.
-+    tr ' ' '
-+' < "$tmpdepfile" \
-+   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-+   >> "$depfile"
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+aix)
-+  # The C for AIX Compiler uses -M and outputs the dependencies
-+  # in a .u file.  In older versions, this file always lives in the
-+  # current directory.  Also, the AIX compiler puts `$object:' at the
-+  # start of each line; $object doesn't have directory information.
-+  # Version 6 uses the directory in both cases.
-+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+  test "x$dir" = "x$object" && dir=
-+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+  if test "$libtool" = yes; then
-+    tmpdepfile1=$dir$base.u
-+    tmpdepfile2=$base.u
-+    tmpdepfile3=$dir.libs/$base.u
-+    "$@" -Wc,-M
-+  else
-+    tmpdepfile1=$dir$base.u
-+    tmpdepfile2=$dir$base.u
-+    tmpdepfile3=$dir$base.u
-+    "$@" -M
-+  fi
-+  stat=$?
-+
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-+    exit $stat
-+  fi
-+
-+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
-+  do
-+    test -f "$tmpdepfile" && break
-+  done
-+  if test -f "$tmpdepfile"; then
-+    # Each line is of the form `foo.o: dependent.h'.
-+    # Do two passes, one to just change these to
-+    # `$object: dependent.h' and one to simply `dependent.h:'.
-+    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+    # That's a tab and a space in the [].
-+    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+  else
-+    # The sourcefile does not contain any dependencies, so just
-+    # store a dummy comment line, to avoid errors with the Makefile
-+    # "include basename.Plo" scheme.
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+icc)
-+  # Intel's C compiler understands `-MD -MF file'.  However on
-+  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-+  # ICC 7.0 will fill foo.d with something like
-+  #    foo.o: sub/foo.c
-+  #    foo.o: sub/foo.h
-+  # which is wrong.  We want:
-+  #    sub/foo.o: sub/foo.c
-+  #    sub/foo.o: sub/foo.h
-+  #    sub/foo.c:
-+  #    sub/foo.h:
-+  # ICC 7.1 will output
-+  #    foo.o: sub/foo.c sub/foo.h
-+  # and will wrap long lines using \ :
-+  #    foo.o: sub/foo.c ... \
-+  #     sub/foo.h ... \
-+  #     ...
-+
-+  "$@" -MD -MF "$tmpdepfile"
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+    rm -f "$tmpdepfile"
-+    exit $stat
-+  fi
-+  rm -f "$depfile"
-+  # Each line is of the form `foo.o: dependent.h',
-+  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-+  # Do two passes, one to just change these to
-+  # `$object: dependent.h' and one to simply `dependent.h:'.
-+  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-+  # Some versions of the HPUX 10.20 sed can't process this invocation
-+  # correctly.  Breaking it into two sed invocations is a workaround.
-+  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-+    sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+hp2)
-+  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
-+  # compilers, which have integrated preprocessors.  The correct option
-+  # to use with these is +Maked; it writes dependencies to a file named
-+  # 'foo.d', which lands next to the object file, wherever that
-+  # happens to be.
-+  # Much of this is similar to the tru64 case; see comments there.
-+  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+  test "x$dir" = "x$object" && dir=
-+  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+  if test "$libtool" = yes; then
-+    tmpdepfile1=$dir$base.d
-+    tmpdepfile2=$dir.libs/$base.d
-+    "$@" -Wc,+Maked
-+  else
-+    tmpdepfile1=$dir$base.d
-+    tmpdepfile2=$dir$base.d
-+    "$@" +Maked
-+  fi
-+  stat=$?
-+  if test $stat -eq 0; then :
-+  else
-+     rm -f "$tmpdepfile1" "$tmpdepfile2"
-+     exit $stat
-+  fi
-+
-+  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
-+  do
-+    test -f "$tmpdepfile" && break
-+  done
-+  if test -f "$tmpdepfile"; then
-+    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-+    # Add `dependent.h:' lines.
-+    sed -ne '2,${
-+	       s/^ *//
-+	       s/ \\*$//
-+	       s/$/:/
-+	       p
-+	     }' "$tmpdepfile" >> "$depfile"
-+  else
-+    echo "#dummy" > "$depfile"
-+  fi
-+  rm -f "$tmpdepfile" "$tmpdepfile2"
-+  ;;
-+
-+tru64)
-+   # The Tru64 compiler uses -MD to generate dependencies as a side
-+   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-+   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-+   # dependencies in `foo.d' instead, so we check for that too.
-+   # Subdirectories are respected.
-+   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-+   test "x$dir" = "x$object" && dir=
-+   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-+
-+   if test "$libtool" = yes; then
-+      # With Tru64 cc, shared objects can also be used to make a
-+      # static library.  This mechanism is used in libtool 1.4 series to
-+      # handle both shared and static libraries in a single compilation.
-+      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-+      #
-+      # With libtool 1.5 this exception was removed, and libtool now
-+      # generates 2 separate objects for the 2 libraries.  These two
-+      # compilations output dependencies in $dir.libs/$base.o.d and
-+      # in $dir$base.o.d.  We have to check for both files, because
-+      # one of the two compilations can be disabled.  We should prefer
-+      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-+      # automatically cleaned when .libs/ is deleted, while ignoring
-+      # the former would cause a distcleancheck panic.
-+      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-+      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-+      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-+      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-+      "$@" -Wc,-MD
-+   else
-+      tmpdepfile1=$dir$base.o.d
-+      tmpdepfile2=$dir$base.d
-+      tmpdepfile3=$dir$base.d
-+      tmpdepfile4=$dir$base.d
-+      "$@" -MD
-+   fi
-+
-+   stat=$?
-+   if test $stat -eq 0; then :
-+   else
-+      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+      exit $stat
-+   fi
-+
-+   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-+   do
-+     test -f "$tmpdepfile" && break
-+   done
-+   if test -f "$tmpdepfile"; then
-+      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-+      # That's a tab and a space in the [].
-+      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-+   else
-+      echo "#dummy" > "$depfile"
-+   fi
-+   rm -f "$tmpdepfile"
-+   ;;
-+
-+#nosideeffect)
-+  # This comment above is used by automake to tell side-effect
-+  # dependency tracking mechanisms from slower ones.
-+
-+dashmstdout)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout, regardless of -o.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test "X$1" != 'X--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  test -z "$dashmflag" && dashmflag=-M
-+  # Require at least two characters before searching for `:'
-+  # in the target name.  This is to cope with DOS-style filenames:
-+  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-+  "$@" $dashmflag |
-+    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  tr ' ' '
-+' < "$tmpdepfile" | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+dashXmstdout)
-+  # This case only exists to satisfy depend.m4.  It is never actually
-+  # run, as this mode is specially recognized in the preamble.
-+  exit 1
-+  ;;
-+
-+makedepend)
-+  "$@" || exit $?
-+  # Remove any Libtool call
-+  if test "$libtool" = yes; then
-+    while test "X$1" != 'X--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+  # X makedepend
-+  shift
-+  cleared=no eat=no
-+  for arg
-+  do
-+    case $cleared in
-+    no)
-+      set ""; shift
-+      cleared=yes ;;
-+    esac
-+    if test $eat = yes; then
-+      eat=no
-+      continue
-+    fi
-+    case "$arg" in
-+    -D*|-I*)
-+      set fnord "$@" "$arg"; shift ;;
-+    # Strip any option that makedepend may not understand.  Remove
-+    # the object too, otherwise makedepend will parse it as a source file.
-+    -arch)
-+      eat=yes ;;
-+    -*|$object)
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"; shift ;;
-+    esac
-+  done
-+  obj_suffix=`echo "$object" | sed 's/^.*\././'`
-+  touch "$tmpdepfile"
-+  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-+  rm -f "$depfile"
-+  cat < "$tmpdepfile" > "$depfile"
-+  sed '1,2d' "$tmpdepfile" | tr ' ' '
-+' | \
-+## Some versions of the HPUX 10.20 sed can't process this invocation
-+## correctly.  Breaking it into two sed invocations is a workaround.
-+    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile" "$tmpdepfile".bak
-+  ;;
-+
-+cpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test "X$1" != 'X--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  # Remove `-o $object'.
-+  IFS=" "
-+  for arg
-+  do
-+    case $arg in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    *)
-+      set fnord "$@" "$arg"
-+      shift # fnord
-+      shift # $arg
-+      ;;
-+    esac
-+  done
-+
-+  "$@" -E |
-+    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
-+       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-+    sed '$ s: \\$::' > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  cat < "$tmpdepfile" >> "$depfile"
-+  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+msvisualcpp)
-+  # Important note: in order to support this mode, a compiler *must*
-+  # always write the preprocessed file to stdout.
-+  "$@" || exit $?
-+
-+  # Remove the call to Libtool.
-+  if test "$libtool" = yes; then
-+    while test "X$1" != 'X--mode=compile'; do
-+      shift
-+    done
-+    shift
-+  fi
-+
-+  IFS=" "
-+  for arg
-+  do
-+    case "$arg" in
-+    -o)
-+      shift
-+      ;;
-+    $object)
-+      shift
-+      ;;
-+    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-+	set fnord "$@"
-+	shift
-+	shift
-+	;;
-+    *)
-+	set fnord "$@" "$arg"
-+	shift
-+	shift
-+	;;
-+    esac
-+  done
-+  "$@" -E 2>/dev/null |
-+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
-+  rm -f "$depfile"
-+  echo "$object : \\" > "$depfile"
-+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-+  echo "	" >> "$depfile"
-+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-+  rm -f "$tmpdepfile"
-+  ;;
-+
-+msvcmsys)
-+  # This case exists only to let depend.m4 do its work.  It works by
-+  # looking at the text of this script.  This case will never be run,
-+  # since it is checked for above.
-+  exit 1
-+  ;;
-+
-+none)
-+  exec "$@"
-+  ;;
-+
-+*)
-+  echo "Unknown depmode $depmode" 1>&2
-+  exit 1
-+  ;;
-+esac
-+
-+exit 0
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End:
---- /dev/null
-+++ b/configure_aux/install-sh
-@@ -0,0 +1,520 @@
-+#!/bin/sh
-+# install - install a program, script, or datafile
-+
-+scriptversion=2009-04-28.21; # UTC
-+
-+# This originates from X11R5 (mit/util/scripts/install.sh), which was
-+# later released in X11R6 (xc/config/util/install.sh) with the
-+# following copyright and license.
-+#
-+# Copyright (C) 1994 X Consortium
-+#
-+# Permission is hereby granted, free of charge, to any person obtaining a copy
-+# of this software and associated documentation files (the "Software"), to
-+# deal in the Software without restriction, including without limitation the
-+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-+# sell copies of the Software, and to permit persons to whom the Software is
-+# furnished to do so, subject to the following conditions:
-+#
-+# The above copyright notice and this permission notice shall be included in
-+# all copies or substantial portions of the Software.
-+#
-+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+#
-+# Except as contained in this notice, the name of the X Consortium shall not
-+# be used in advertising or otherwise to promote the sale, use or other deal-
-+# ings in this Software without prior written authorization from the X Consor-
-+# tium.
-+#
-+#
-+# FSF changes to this file are in the public domain.
-+#
-+# Calling this script install-sh is preferred over install.sh, to prevent
-+# `make' implicit rules from creating a file called install from it
-+# when there is no Makefile.
-+#
-+# This script is compatible with the BSD install script, but was written
-+# from scratch.
-+
-+nl='
-+'
-+IFS=" ""	$nl"
-+
-+# set DOITPROG to echo to test this script
-+
-+# Don't use :- since 4.3BSD and earlier shells don't like it.
-+doit=${DOITPROG-}
-+if test -z "$doit"; then
-+  doit_exec=exec
-+else
-+  doit_exec=$doit
-+fi
-+
-+# Put in absolute file names if you don't have them in your path;
-+# or use environment vars.
-+
-+chgrpprog=${CHGRPPROG-chgrp}
-+chmodprog=${CHMODPROG-chmod}
-+chownprog=${CHOWNPROG-chown}
-+cmpprog=${CMPPROG-cmp}
-+cpprog=${CPPROG-cp}
-+mkdirprog=${MKDIRPROG-mkdir}
-+mvprog=${MVPROG-mv}
-+rmprog=${RMPROG-rm}
-+stripprog=${STRIPPROG-strip}
-+
-+posix_glob='?'
-+initialize_posix_glob='
-+  test "$posix_glob" != "?" || {
-+    if (set -f) 2>/dev/null; then
-+      posix_glob=
-+    else
-+      posix_glob=:
-+    fi
-+  }
-+'
-+
-+posix_mkdir=
-+
-+# Desired mode of installed file.
-+mode=0755
-+
-+chgrpcmd=
-+chmodcmd=$chmodprog
-+chowncmd=
-+mvcmd=$mvprog
-+rmcmd="$rmprog -f"
-+stripcmd=
-+
-+src=
-+dst=
-+dir_arg=
-+dst_arg=
-+
-+copy_on_change=false
-+no_target_directory=
-+
-+usage="\
-+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-+   or: $0 [OPTION]... SRCFILES... DIRECTORY
-+   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-+   or: $0 [OPTION]... -d DIRECTORIES...
-+
-+In the 1st form, copy SRCFILE to DSTFILE.
-+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-+In the 4th, create DIRECTORIES.
-+
-+Options:
-+     --help     display this help and exit.
-+     --version  display version info and exit.
-+
-+  -c            (ignored)
-+  -C            install only if different (preserve the last data modification time)
-+  -d            create directories instead of installing files.
-+  -g GROUP      $chgrpprog installed files to GROUP.
-+  -m MODE       $chmodprog installed files to MODE.
-+  -o USER       $chownprog installed files to USER.
-+  -s            $stripprog installed files.
-+  -t DIRECTORY  install into DIRECTORY.
-+  -T            report an error if DSTFILE is a directory.
-+
-+Environment variables override the default commands:
-+  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
-+  RMPROG STRIPPROG
-+"
-+
-+while test $# -ne 0; do
-+  case $1 in
-+    -c) ;;
-+
-+    -C) copy_on_change=true;;
-+
-+    -d) dir_arg=true;;
-+
-+    -g) chgrpcmd="$chgrpprog $2"
-+	shift;;
-+
-+    --help) echo "$usage"; exit $?;;
-+
-+    -m) mode=$2
-+	case $mode in
-+	  *' '* | *'	'* | *'
-+'*	  | *'*'* | *'?'* | *'['*)
-+	    echo "$0: invalid mode: $mode" >&2
-+	    exit 1;;
-+	esac
-+	shift;;
-+
-+    -o) chowncmd="$chownprog $2"
-+	shift;;
-+
-+    -s) stripcmd=$stripprog;;
-+
-+    -t) dst_arg=$2
-+	shift;;
-+
-+    -T) no_target_directory=true;;
-+
-+    --version) echo "$0 $scriptversion"; exit $?;;
-+
-+    --)	shift
-+	break;;
-+
-+    -*)	echo "$0: invalid option: $1" >&2
-+	exit 1;;
-+
-+    *)  break;;
-+  esac
-+  shift
-+done
-+
-+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
-+  # When -d is used, all remaining arguments are directories to create.
-+  # When -t is used, the destination is already specified.
-+  # Otherwise, the last argument is the destination.  Remove it from $@.
-+  for arg
-+  do
-+    if test -n "$dst_arg"; then
-+      # $@ is not empty: it contains at least $arg.
-+      set fnord "$@" "$dst_arg"
-+      shift # fnord
-+    fi
-+    shift # arg
-+    dst_arg=$arg
-+  done
-+fi
-+
-+if test $# -eq 0; then
-+  if test -z "$dir_arg"; then
-+    echo "$0: no input file specified." >&2
-+    exit 1
-+  fi
-+  # It's OK to call `install-sh -d' without argument.
-+  # This can happen when creating conditional directories.
-+  exit 0
-+fi
-+
-+if test -z "$dir_arg"; then
-+  trap '(exit $?); exit' 1 2 13 15
-+
-+  # Set umask so as not to create temps with too-generous modes.
-+  # However, 'strip' requires both read and write access to temps.
-+  case $mode in
-+    # Optimize common cases.
-+    *644) cp_umask=133;;
-+    *755) cp_umask=22;;
-+
-+    *[0-7])
-+      if test -z "$stripcmd"; then
-+	u_plus_rw=
-+      else
-+	u_plus_rw='% 200'
-+      fi
-+      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
-+    *)
-+      if test -z "$stripcmd"; then
-+	u_plus_rw=
-+      else
-+	u_plus_rw=,u+rw
-+      fi
-+      cp_umask=$mode$u_plus_rw;;
-+  esac
-+fi
-+
-+for src
-+do
-+  # Protect names starting with `-'.
-+  case $src in
-+    -*) src=./$src;;
-+  esac
-+
-+  if test -n "$dir_arg"; then
-+    dst=$src
-+    dstdir=$dst
-+    test -d "$dstdir"
-+    dstdir_status=$?
-+  else
-+
-+    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-+    # might cause directories to be created, which would be especially bad
-+    # if $src (and thus $dsttmp) contains '*'.
-+    if test ! -f "$src" && test ! -d "$src"; then
-+      echo "$0: $src does not exist." >&2
-+      exit 1
-+    fi
-+
-+    if test -z "$dst_arg"; then
-+      echo "$0: no destination specified." >&2
-+      exit 1
-+    fi
-+
-+    dst=$dst_arg
-+    # Protect names starting with `-'.
-+    case $dst in
-+      -*) dst=./$dst;;
-+    esac
-+
-+    # If destination is a directory, append the input filename; won't work
-+    # if double slashes aren't ignored.
-+    if test -d "$dst"; then
-+      if test -n "$no_target_directory"; then
-+	echo "$0: $dst_arg: Is a directory" >&2
-+	exit 1
-+      fi
-+      dstdir=$dst
-+      dst=$dstdir/`basename "$src"`
-+      dstdir_status=0
-+    else
-+      # Prefer dirname, but fall back on a substitute if dirname fails.
-+      dstdir=`
-+	(dirname "$dst") 2>/dev/null ||
-+	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-+	     X"$dst" : 'X\(//\)[^/]' \| \
-+	     X"$dst" : 'X\(//\)$' \| \
-+	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
-+	echo X"$dst" |
-+	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\/\)[^/].*/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\/\)$/{
-+		   s//\1/
-+		   q
-+		 }
-+		 /^X\(\/\).*/{
-+		   s//\1/
-+		   q
-+		 }
-+		 s/.*/./; q'
-+      `
-+
-+      test -d "$dstdir"
-+      dstdir_status=$?
-+    fi
-+  fi
-+
-+  obsolete_mkdir_used=false
-+
-+  if test $dstdir_status != 0; then
-+    case $posix_mkdir in
-+      '')
-+	# Create intermediate dirs using mode 755 as modified by the umask.
-+	# This is like FreeBSD 'install' as of 1997-10-28.
-+	umask=`umask`
-+	case $stripcmd.$umask in
-+	  # Optimize common cases.
-+	  *[2367][2367]) mkdir_umask=$umask;;
-+	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
-+
-+	  *[0-7])
-+	    mkdir_umask=`expr $umask + 22 \
-+	      - $umask % 100 % 40 + $umask % 20 \
-+	      - $umask % 10 % 4 + $umask % 2
-+	    `;;
-+	  *) mkdir_umask=$umask,go-w;;
-+	esac
-+
-+	# With -d, create the new directory with the user-specified mode.
-+	# Otherwise, rely on $mkdir_umask.
-+	if test -n "$dir_arg"; then
-+	  mkdir_mode=-m$mode
-+	else
-+	  mkdir_mode=
-+	fi
-+
-+	posix_mkdir=false
-+	case $umask in
-+	  *[123567][0-7][0-7])
-+	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
-+	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
-+	    ;;
-+	  *)
-+	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
-+	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
-+
-+	    if (umask $mkdir_umask &&
-+		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
-+	    then
-+	      if test -z "$dir_arg" || {
-+		   # Check for POSIX incompatibilities with -m.
-+		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-+		   # other-writeable bit of parent directory when it shouldn't.
-+		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
-+		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
-+		   case $ls_ld_tmpdir in
-+		     d????-?r-*) different_mode=700;;
-+		     d????-?--*) different_mode=755;;
-+		     *) false;;
-+		   esac &&
-+		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
-+		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
-+		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
-+		   }
-+		 }
-+	      then posix_mkdir=:
-+	      fi
-+	      rmdir "$tmpdir/d" "$tmpdir"
-+	    else
-+	      # Remove any dirs left behind by ancient mkdir implementations.
-+	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
-+	    fi
-+	    trap '' 0;;
-+	esac;;
-+    esac
-+
-+    if
-+      $posix_mkdir && (
-+	umask $mkdir_umask &&
-+	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
-+      )
-+    then :
-+    else
-+
-+      # The umask is ridiculous, or mkdir does not conform to POSIX,
-+      # or it failed possibly due to a race condition.  Create the
-+      # directory the slow way, step by step, checking for races as we go.
-+
-+      case $dstdir in
-+	/*) prefix='/';;
-+	-*) prefix='./';;
-+	*)  prefix='';;
-+      esac
-+
-+      eval "$initialize_posix_glob"
-+
-+      oIFS=$IFS
-+      IFS=/
-+      $posix_glob set -f
-+      set fnord $dstdir
-+      shift
-+      $posix_glob set +f
-+      IFS=$oIFS
-+
-+      prefixes=
-+
-+      for d
-+      do
-+	test -z "$d" && continue
-+
-+	prefix=$prefix$d
-+	if test -d "$prefix"; then
-+	  prefixes=
-+	else
-+	  if $posix_mkdir; then
-+	    (umask=$mkdir_umask &&
-+	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
-+	    # Don't fail if two instances are running concurrently.
-+	    test -d "$prefix" || exit 1
-+	  else
-+	    case $prefix in
-+	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
-+	      *) qprefix=$prefix;;
-+	    esac
-+	    prefixes="$prefixes '$qprefix'"
-+	  fi
-+	fi
-+	prefix=$prefix/
-+      done
-+
-+      if test -n "$prefixes"; then
-+	# Don't fail if two instances are running concurrently.
-+	(umask $mkdir_umask &&
-+	 eval "\$doit_exec \$mkdirprog $prefixes") ||
-+	  test -d "$dstdir" || exit 1
-+	obsolete_mkdir_used=true
-+      fi
-+    fi
-+  fi
-+
-+  if test -n "$dir_arg"; then
-+    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
-+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
-+    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
-+      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
-+  else
-+
-+    # Make a couple of temp file names in the proper directory.
-+    dsttmp=$dstdir/_inst.$$_
-+    rmtmp=$dstdir/_rm.$$_
-+
-+    # Trap to clean up those temp files at exit.
-+    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-+
-+    # Copy the file name to the temp name.
-+    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
-+
-+    # and set any options; do chmod last to preserve setuid bits.
-+    #
-+    # If any of these fail, we abort the whole thing.  If we want to
-+    # ignore errors from any of these, just make sure not to ignore
-+    # errors from the above "$doit $cpprog $src $dsttmp" command.
-+    #
-+    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
-+    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
-+    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
-+    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
-+
-+    # If -C, don't bother to copy if it wouldn't change the file.
-+    if $copy_on_change &&
-+       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
-+       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
-+
-+       eval "$initialize_posix_glob" &&
-+       $posix_glob set -f &&
-+       set X $old && old=:$2:$4:$5:$6 &&
-+       set X $new && new=:$2:$4:$5:$6 &&
-+       $posix_glob set +f &&
-+
-+       test "$old" = "$new" &&
-+       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
-+    then
-+      rm -f "$dsttmp"
-+    else
-+      # Rename the file to the real destination.
-+      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
-+
-+      # The rename failed, perhaps because mv can't rename something else
-+      # to itself, or perhaps because mv is so ancient that it does not
-+      # support -f.
-+      {
-+	# Now remove or move aside any old file at destination location.
-+	# We try this two ways since rm can't unlink itself on some
-+	# systems and the destination file might be busy for other
-+	# reasons.  In this case, the final cleanup might fail but the new
-+	# file should still install successfully.
-+	{
-+	  test ! -f "$dst" ||
-+	  $doit $rmcmd -f "$dst" 2>/dev/null ||
-+	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
-+	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
-+	  } ||
-+	  { echo "$0: cannot unlink or rename $dst" >&2
-+	    (exit 1); exit 1
-+	  }
-+	} &&
-+
-+	# Now rename the file to the real destination.
-+	$doit $mvcmd "$dsttmp" "$dst"
-+      }
-+    fi || exit 1
-+
-+    trap '' 0
-+  fi
-+done
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End:
---- /dev/null
-+++ b/configure_aux/missing
-@@ -0,0 +1,376 @@
-+#! /bin/sh
-+# Common stub for a few missing GNU programs while installing.
-+
-+scriptversion=2009-04-28.21; # UTC
-+
-+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-+# 2008, 2009 Free Software Foundation, Inc.
-+# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
-+
-+# This program is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2, or (at your option)
-+# any later version.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+
-+# You should have received a copy of the GNU General Public License
-+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+
-+if test $# -eq 0; then
-+  echo 1>&2 "Try \`$0 --help' for more information"
-+  exit 1
-+fi
-+
-+run=:
-+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
-+
-+# In the cases where this matters, `missing' is being run in the
-+# srcdir already.
-+if test -f configure.ac; then
-+  configure_ac=configure.ac
-+else
-+  configure_ac=configure.in
-+fi
-+
-+msg="missing on your system"
-+
-+case $1 in
-+--run)
-+  # Try to run requested program, and just exit if it succeeds.
-+  run=
-+  shift
-+  "$@" && exit 0
-+  # Exit code 63 means version mismatch.  This often happens
-+  # when the user try to use an ancient version of a tool on
-+  # a file that requires a minimum version.  In this case we
-+  # we should proceed has if the program had been absent, or
-+  # if --run hadn't been passed.
-+  if test $? = 63; then
-+    run=:
-+    msg="probably too old"
-+  fi
-+  ;;
-+
-+  -h|--h|--he|--hel|--help)
-+    echo "\
-+$0 [OPTION]... PROGRAM [ARGUMENT]...
-+
-+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-+error status if there is no known handling for PROGRAM.
-+
-+Options:
-+  -h, --help      display this help and exit
-+  -v, --version   output version information and exit
-+  --run           try to run the given command, and emulate it if it fails
-+
-+Supported PROGRAM values:
-+  aclocal      touch file \`aclocal.m4'
-+  autoconf     touch file \`configure'
-+  autoheader   touch file \`config.h.in'
-+  autom4te     touch the output file, or create a stub one
-+  automake     touch all \`Makefile.in' files
-+  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-+  flex         create \`lex.yy.c', if possible, from existing .c
-+  help2man     touch the output file
-+  lex          create \`lex.yy.c', if possible, from existing .c
-+  makeinfo     touch the output file
-+  tar          try tar, gnutar, gtar, then tar without non-portable flags
-+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-+
-+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-+\`g' are ignored when checking the name.
-+
-+Send bug reports to <bug-automake at gnu.org>."
-+    exit $?
-+    ;;
-+
-+  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-+    echo "missing $scriptversion (GNU Automake)"
-+    exit $?
-+    ;;
-+
-+  -*)
-+    echo 1>&2 "$0: Unknown \`$1' option"
-+    echo 1>&2 "Try \`$0 --help' for more information"
-+    exit 1
-+    ;;
-+
-+esac
-+
-+# normalize program name to check for.
-+program=`echo "$1" | sed '
-+  s/^gnu-//; t
-+  s/^gnu//; t
-+  s/^g//; t'`
-+
-+# Now exit if we have it, but it failed.  Also exit now if we
-+# don't have it and --version was passed (most likely to detect
-+# the program).  This is about non-GNU programs, so use $1 not
-+# $program.
-+case $1 in
-+  lex*|yacc*)
-+    # Not GNU programs, they don't have --version.
-+    ;;
-+
-+  tar*)
-+    if test -n "$run"; then
-+       echo 1>&2 "ERROR: \`tar' requires --run"
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       exit 1
-+    fi
-+    ;;
-+
-+  *)
-+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-+       # We have it, but it failed.
-+       exit 1
-+    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-+       # Could not run --version or --help.  This is probably someone
-+       # running `$TOOL --version' or `$TOOL --help' to check whether
-+       # $TOOL exists and not knowing $TOOL uses missing.
-+       exit 1
-+    fi
-+    ;;
-+esac
-+
-+# If it does not exist, or fails to run (possibly an outdated version),
-+# try to emulate it.
-+case $program in
-+  aclocal*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-+         to install the \`Automake' and \`Perl' packages.  Grab them from
-+         any GNU archive site."
-+    touch aclocal.m4
-+    ;;
-+
-+  autoconf*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`${configure_ac}'.  You might want to install the
-+         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-+         archive site."
-+    touch configure
-+    ;;
-+
-+  autoheader*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-+         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-+         from any GNU archive site."
-+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-+    test -z "$files" && files="config.h"
-+    touch_files=
-+    for f in $files; do
-+      case $f in
-+      *:*) touch_files="$touch_files "`echo "$f" |
-+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-+      *) touch_files="$touch_files $f.in";;
-+      esac
-+    done
-+    touch $touch_files
-+    ;;
-+
-+  automake*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-+         You might want to install the \`Automake' and \`Perl' packages.
-+         Grab them from any GNU archive site."
-+    find . -type f -name Makefile.am -print |
-+	   sed 's/\.am$/.in/' |
-+	   while read f; do touch "$f"; done
-+    ;;
-+
-+  autom4te*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, but is $msg.
-+         You might have modified some files without having the
-+         proper tools for further handling them.
-+         You can get \`$1' as part of \`Autoconf' from any GNU
-+         archive site."
-+
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+    if test -f "$file"; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo "#! /bin/sh"
-+	echo "# Created by GNU Automake missing as a replacement of"
-+	echo "#  $ $@"
-+	echo "exit 0"
-+	chmod +x $file
-+	exit 1
-+    fi
-+    ;;
-+
-+  bison*|yacc*)
-+    echo 1>&2 "\
-+WARNING: \`$1' $msg.  You should only need it if
-+         you modified a \`.y' file.  You may need the \`Bison' package
-+         in order for those modifications to take effect.  You can get
-+         \`Bison' from any GNU archive site."
-+    rm -f y.tab.c y.tab.h
-+    if test $# -ne 1; then
-+        eval LASTARG="\${$#}"
-+	case $LASTARG in
-+	*.y)
-+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-+	    if test -f "$SRCFILE"; then
-+	         cp "$SRCFILE" y.tab.c
-+	    fi
-+	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-+	    if test -f "$SRCFILE"; then
-+	         cp "$SRCFILE" y.tab.h
-+	    fi
-+	  ;;
-+	esac
-+    fi
-+    if test ! -f y.tab.h; then
-+	echo >y.tab.h
-+    fi
-+    if test ! -f y.tab.c; then
-+	echo 'main() { return 0; }' >y.tab.c
-+    fi
-+    ;;
-+
-+  lex*|flex*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified a \`.l' file.  You may need the \`Flex' package
-+         in order for those modifications to take effect.  You can get
-+         \`Flex' from any GNU archive site."
-+    rm -f lex.yy.c
-+    if test $# -ne 1; then
-+        eval LASTARG="\${$#}"
-+	case $LASTARG in
-+	*.l)
-+	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-+	    if test -f "$SRCFILE"; then
-+	         cp "$SRCFILE" lex.yy.c
-+	    fi
-+	  ;;
-+	esac
-+    fi
-+    if test ! -f lex.yy.c; then
-+	echo 'main() { return 0; }' >lex.yy.c
-+    fi
-+    ;;
-+
-+  help2man*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+	 you modified a dependency of a manual page.  You may need the
-+	 \`Help2man' package in order for those modifications to take
-+	 effect.  You can get \`Help2man' from any GNU archive site."
-+
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+    if test -f "$file"; then
-+	touch $file
-+    else
-+	test -z "$file" || exec >$file
-+	echo ".ab help2man is required to generate this page"
-+	exit $?
-+    fi
-+    ;;
-+
-+  makeinfo*)
-+    echo 1>&2 "\
-+WARNING: \`$1' is $msg.  You should only need it if
-+         you modified a \`.texi' or \`.texinfo' file, or any other file
-+         indirectly affecting the aspect of the manual.  The spurious
-+         call might also be the consequence of using a buggy \`make' (AIX,
-+         DU, IRIX).  You might want to install the \`Texinfo' package or
-+         the \`GNU make' package.  Grab either from any GNU archive site."
-+    # The file to touch is that specified with -o ...
-+    file=`echo "$*" | sed -n "$sed_output"`
-+    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
-+    if test -z "$file"; then
-+      # ... or it is the one specified with @setfilename ...
-+      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-+      file=`sed -n '
-+	/^@setfilename/{
-+	  s/.* \([^ ]*\) *$/\1/
-+	  p
-+	  q
-+	}' $infile`
-+      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-+      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-+    fi
-+    # If the file does not exist, the user really needs makeinfo;
-+    # let's fail without touching anything.
-+    test -f $file || exit 1
-+    touch $file
-+    ;;
-+
-+  tar*)
-+    shift
-+
-+    # We have already tried tar in the generic part.
-+    # Look for gnutar/gtar before invocation to avoid ugly error
-+    # messages.
-+    if (gnutar --version > /dev/null 2>&1); then
-+       gnutar "$@" && exit 0
-+    fi
-+    if (gtar --version > /dev/null 2>&1); then
-+       gtar "$@" && exit 0
-+    fi
-+    firstarg="$1"
-+    if shift; then
-+	case $firstarg in
-+	*o*)
-+	    firstarg=`echo "$firstarg" | sed s/o//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+	case $firstarg in
-+	*h*)
-+	    firstarg=`echo "$firstarg" | sed s/h//`
-+	    tar "$firstarg" "$@" && exit 0
-+	    ;;
-+	esac
-+    fi
-+
-+    echo 1>&2 "\
-+WARNING: I can't seem to be able to run \`tar' with the given arguments.
-+         You may want to install GNU tar or Free paxutils, or check the
-+         command line arguments."
-+    exit 1
-+    ;;
-+
-+  *)
-+    echo 1>&2 "\
-+WARNING: \`$1' is needed, and is $msg.
-+         You might have modified some files without having the
-+         proper tools for further handling them.  Check the \`README' file,
-+         it often tells you about the needed prerequisites for installing
-+         this package.  You may also peek at any GNU archive site, in case
-+         some other package would contain this missing \`$1' program."
-+    exit 1
-+    ;;
-+esac
-+
-+exit 0
-+
-+# Local variables:
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-time-zone: "UTC"
-+# time-stamp-end: "; # UTC"
-+# End:
---- /dev/null
+ 	tile*)
+ 		basic_machine=tile-unknown
+ 		os=-linux-gnu
+@@ -1435,6 +1442,8 @@ case $os in
+ 	-dicos*)
+ 		os=-dicos
+ 		;;
++        -nacl*)
++	        ;;
+ 	-none)
+ 		;;
+ 	*)
+diff --git a/doc/Makefile.in b/doc/Makefile.in
+index eaff5ae..eb7841a 100644
+--- a/doc/Makefile.in
 +++ b/doc/Makefile.in
-@@ -0,0 +1,576 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = doc
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/autoconfig.h \
-+	$(top_builddir)/tombupnp/upnp/inc/upnpconfig.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+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 = $(man1_MANS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMTAR = @AMTAR@
-+ATOMIC_OPTION_ENABLED = @ATOMIC_OPTION_ENABLED@
-+ATOMIC_OPTION_REQUESTED = @ATOMIC_OPTION_REQUESTED@
-+ATOMIC_X86_SINGLE_OPTION_ENABLED = @ATOMIC_X86_SINGLE_OPTION_ENABLED@
-+ATOMIC_X86_SINGLE_OPTION_REQUESTED = @ATOMIC_X86_SINGLE_OPTION_REQUESTED@
-+ATRAILERS_OPTION_ENABLED = @ATRAILERS_OPTION_ENABLED@
-+ATRAILERS_OPTION_REQUESTED = @ATRAILERS_OPTION_REQUESTED@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@
-+AVFORMAT_LDFLAGS = @AVFORMAT_LDFLAGS@
-+AVFORMAT_LIBS = @AVFORMAT_LIBS@
-+AVFORMAT_STATUS = @AVFORMAT_STATUS@
-+AVUTIL_LDFLAGS = @AVUTIL_LDFLAGS@
-+AVUTIL_LIBS = @AVUTIL_LIBS@
-+AVUTIL_STATUS = @AVUTIL_STATUS@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
-+DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-+DEBUG_LOG_OPTION_ENABLED = @DEBUG_LOG_OPTION_ENABLED@
-+DEBUG_LOG_OPTION_REQUESTED = @DEBUG_LOG_OPTION_REQUESTED@
-+DEBUG_MALLOC0_OPTION_ENABLED = @DEBUG_MALLOC0_OPTION_ENABLED@
-+DEBUG_MALLOC0_OPTION_REQUESTED = @DEBUG_MALLOC0_OPTION_REQUESTED@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+EXPAT_CFLAGS = @EXPAT_CFLAGS@
-+EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
-+EXPAT_LIBS = @EXPAT_LIBS@
-+EXPAT_STATUS = @EXPAT_STATUS@
-+EXTERNAL_TRANSCODING_OPTION_ENABLED = @EXTERNAL_TRANSCODING_OPTION_ENABLED@
-+EXTERNAL_TRANSCODING_OPTION_REQUESTED = @EXTERNAL_TRANSCODING_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_CFLAGS = @FFMPEGTHUMBNAILER_CFLAGS@
-+FFMPEGTHUMBNAILER_LDFLAGS = @FFMPEGTHUMBNAILER_LDFLAGS@
-+FFMPEGTHUMBNAILER_LIBS = @FFMPEGTHUMBNAILER_LIBS@
-+FFMPEGTHUMBNAILER_OPTION_ENABLED = @FFMPEGTHUMBNAILER_OPTION_ENABLED@
-+FFMPEGTHUMBNAILER_OPTION_REQUESTED = @FFMPEGTHUMBNAILER_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_STATUS = @FFMPEGTHUMBNAILER_STATUS@
-+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@
-+FFMPEG_LIBS = @FFMPEG_LIBS@
-+FFMPEG_OPTION_ENABLED = @FFMPEG_OPTION_ENABLED@
-+FFMPEG_OPTION_REQUESTED = @FFMPEG_OPTION_REQUESTED@
-+FSEEKO_CHECK_OPTION_ENABLED = @FSEEKO_CHECK_OPTION_ENABLED@
-+FSEEKO_CHECK_OPTION_REQUESTED = @FSEEKO_CHECK_OPTION_REQUESTED@
-+GREP = @GREP@
-+ICONV_CXXFLAGS = @ICONV_CXXFLAGS@
-+ICONV_LIBS = @ICONV_LIBS@
-+ICONV_LIB_OPTION_ENABLED = @ICONV_LIB_OPTION_ENABLED@
-+ICONV_LIB_OPTION_REQUESTED = @ICONV_LIB_OPTION_REQUESTED@
-+ID3LIB_CFLAGS = @ID3LIB_CFLAGS@
-+ID3LIB_LDFLAGS = @ID3LIB_LDFLAGS@
-+ID3LIB_LIBS = @ID3LIB_LIBS@
-+ID3LIB_OPTION_ENABLED = @ID3LIB_OPTION_ENABLED@
-+ID3LIB_OPTION_REQUESTED = @ID3LIB_OPTION_REQUESTED@
-+ID3LIB_STATUS = @ID3LIB_STATUS@
-+ID3LIB_VERSION = @ID3LIB_VERSION@
-+INOTIFY_CFLAGS = @INOTIFY_CFLAGS@
-+INOTIFY_OPTION_ENABLED = @INOTIFY_OPTION_ENABLED@
-+INOTIFY_OPTION_REQUESTED = @INOTIFY_OPTION_REQUESTED@
-+INOTIFY_STATUS = @INOTIFY_STATUS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JS_CXXFLAGS = @JS_CXXFLAGS@
-+JS_LIBS = @JS_LIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBDVDNAV_CFLAGS = @LIBDVDNAV_CFLAGS@
-+LIBDVDNAV_LIBS = @LIBDVDNAV_LIBS@
-+LIBDVDNAV_OPTION_ENABLED = @LIBDVDNAV_OPTION_ENABLED@
-+LIBDVDNAV_OPTION_REQUESTED = @LIBDVDNAV_OPTION_REQUESTED@
-+LIBDVDNAV_STATUS = @LIBDVDNAV_STATUS@
-+LIBDVDNAV_VERSION = @LIBDVDNAV_VERSION@
-+LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-+LIBEXIF_LDFLAGS = @LIBEXIF_LDFLAGS@
-+LIBEXIF_LIBS = @LIBEXIF_LIBS@
-+LIBEXIF_OPTION_ENABLED = @LIBEXIF_OPTION_ENABLED@
-+LIBEXIF_OPTION_REQUESTED = @LIBEXIF_OPTION_REQUESTED@
-+LIBEXIF_STATUS = @LIBEXIF_STATUS@
-+LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@
-+LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@
-+LIBEXTRACTOR_OPTION_ENABLED = @LIBEXTRACTOR_OPTION_ENABLED@
-+LIBEXTRACTOR_OPTION_REQUESTED = @LIBEXTRACTOR_OPTION_REQUESTED@
-+LIBEXTRACTOR_STATUS = @LIBEXTRACTOR_STATUS@
-+LIBEXTRACTOR_VERSION = @LIBEXTRACTOR_VERSION@
-+LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@
-+LIBMAGIC_LDFLAGS = @LIBMAGIC_LDFLAGS@
-+LIBMAGIC_LIBS = @LIBMAGIC_LIBS@
-+LIBMAGIC_OPTION_ENABLED = @LIBMAGIC_OPTION_ENABLED@
-+LIBMAGIC_OPTION_REQUESTED = @LIBMAGIC_OPTION_REQUESTED@
-+LIBMAGIC_STATUS = @LIBMAGIC_STATUS@
-+LIBMAGIC_VERSION = @LIBMAGIC_VERSION@
-+LIBMP4V2_CFLAGS = @LIBMP4V2_CFLAGS@
-+LIBMP4V2_LDFLAGS = @LIBMP4V2_LDFLAGS@
-+LIBMP4V2_LIBS = @LIBMP4V2_LIBS@
-+LIBMP4V2_OPTION_ENABLED = @LIBMP4V2_OPTION_ENABLED@
-+LIBMP4V2_OPTION_REQUESTED = @LIBMP4V2_OPTION_REQUESTED@
-+LIBMP4V2_STATUS = @LIBMP4V2_STATUS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LOG_OPTION_ENABLED = @LOG_OPTION_ENABLED@
-+LOG_OPTION_REQUESTED = @LOG_OPTION_REQUESTED@
-+LTLIBOBJS = @LTLIBOBJS@
-+LWRES_LIBS = @LWRES_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+MRREG_SERVICE_OPTION_ENABLED = @MRREG_SERVICE_OPTION_ENABLED@
-+MRREG_SERVICE_OPTION_REQUESTED = @MRREG_SERVICE_OPTION_REQUESTED@
-+MT_SEARCHPATH = @MT_SEARCHPATH@
-+MT_SEARCHPATH_HEADERS = @MT_SEARCHPATH_HEADERS@
-+MT_SEARCHPATH_LIBS = @MT_SEARCHPATH_LIBS@
-+MT_SEARCHPATH_PROGS = @MT_SEARCHPATH_PROGS@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+MYSQL_OPTION_ENABLED = @MYSQL_OPTION_ENABLED@
-+MYSQL_OPTION_REQUESTED = @MYSQL_OPTION_REQUESTED@
-+MYSQL_STATUS = @MYSQL_STATUS@
-+MYSQL_VERSION = @MYSQL_VERSION@
-+NSL_LIBS = @NSL_LIBS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+@@ -217,6 +217,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@
-+POW_LIB = @POW_LIB@
-+PROTOCOLINFO_EXTENSION_OPTION_ENABLED = @PROTOCOLINFO_EXTENSION_OPTION_ENABLED@
-+PROTOCOLINFO_EXTENSION_OPTION_REQUESTED = @PROTOCOLINFO_EXTENSION_OPTION_REQUESTED@
-+PTHREAD_CC = @PTHREAD_CC@
-+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-+PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
-+PTHREAD_LIBS = @PTHREAD_LIBS@
-+PTHREAD_LIB_OPTION_ENABLED = @PTHREAD_LIB_OPTION_ENABLED@
-+PTHREAD_LIB_OPTION_REQUESTED = @PTHREAD_LIB_OPTION_REQUESTED@
-+PTHREAD_STATUS = @PTHREAD_STATUS@
-+RANLIB = @RANLIB@
-+RT_LDFLAGS = @RT_LDFLAGS@
-+RT_LIBS = @RT_LIBS@
-+RT_STATUS = @RT_STATUS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SOPCAST_OPTION_ENABLED = @SOPCAST_OPTION_ENABLED@
-+SOPCAST_OPTION_REQUESTED = @SOPCAST_OPTION_REQUESTED@
-+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
-+SQLITE3_LDFLAGS = @SQLITE3_LDFLAGS@
-+SQLITE3_LIBS = @SQLITE3_LIBS@
-+SQLITE3_OPTION_ENABLED = @SQLITE3_OPTION_ENABLED@
-+SQLITE3_OPTION_REQUESTED = @SQLITE3_OPTION_REQUESTED@
-+SQLITE3_STATUS = @SQLITE3_STATUS@
-+SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED = @SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED@
-+SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED = @SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED@
-+STATIC_OPTION_ENABLED = @STATIC_OPTION_ENABLED@
-+STATIC_OPTION_REQUESTED = @STATIC_OPTION_REQUESTED@
-+STRIP = @STRIP@
-+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
-+TAGLIB_LIBS = @TAGLIB_LIBS@
-+TAGLIB_OPTION_ENABLED = @TAGLIB_OPTION_ENABLED@
-+TAGLIB_OPTION_REQUESTED = @TAGLIB_OPTION_REQUESTED@
-+TAGLIB_STATUS = @TAGLIB_STATUS@
-+TAGLIB_VERSION = @TAGLIB_VERSION@
-+TOMBDEBUG_OPTION_ENABLED = @TOMBDEBUG_OPTION_ENABLED@
-+TOMBDEBUG_OPTION_REQUESTED = @TOMBDEBUG_OPTION_REQUESTED@
-+UPNPDEBUG_OPTION_ENABLED = @UPNPDEBUG_OPTION_ENABLED@
-+UPNPDEBUG_OPTION_REQUESTED = @UPNPDEBUG_OPTION_REQUESTED@
-+VERSION = @VERSION@
-+WEBORAMA_OPTION_ENABLED = @WEBORAMA_OPTION_ENABLED@
-+WEBORAMA_OPTION_REQUESTED = @WEBORAMA_OPTION_REQUESTED@
-+YOUTUBE_OPTION_ENABLED = @YOUTUBE_OPTION_ENABLED@
-+YOUTUBE_OPTION_REQUESTED = @YOUTUBE_OPTION_REQUESTED@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+ZLIB_OPTION_ENABLED = @ZLIB_OPTION_ENABLED@
-+ZLIB_OPTION_REQUESTED = @ZLIB_OPTION_REQUESTED@
-+ZLIB_STATUS = @ZLIB_STATUS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+acx_pthread_config = @acx_pthread_config@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+curlconfig = @curlconfig@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+mt_libdvdnav_config = @mt_libdvdnav_config@
-+mt_mysql_config = @mt_mysql_config@
-+mt_taglib_config = @mt_taglib_config@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+_DIST_FILES_CONF = \
-+    doxygen.conf \
-+    scripting.txt \
-+    scripting_utf8.txt \
-+    transcoding.txt \
-+    transcoding_utf8.txt \
-+    ui.txt \
-+    ui_utf8.txt \
-+    manpage.xml
-+
-+man1_MANS = mediatomb.1
-+EXTRA_DIST = $(_DIST_FILES_CONF) $(man1_MANS)
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu doc/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+install-man1: $(man1_MANS)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-+	@list='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-+	{ for i in $$list; do echo "$$i"; done; \
-+	} | 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='$(man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-+	files=`{ for i in $$list; do echo "$$i"; done; \
-+	} | 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; }
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+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
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(MANS)
-+installdirs:
-+	for dir in "$(DESTDIR)$(man1dir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-man
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man: install-man1
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-man
-+
-+uninstall-man: uninstall-man1
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am html html-am info info-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-man1 install-pdf install-pdf-am install-ps \
-+	install-ps-am install-strip installcheck installcheck-am \
-+	installdirs maintainer-clean maintainer-clean-generic \
-+	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-+	uninstall-am uninstall-man uninstall-man1
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- /dev/null
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POW_LIB = @POW_LIB@
+diff --git a/scripts/Makefile.in b/scripts/Makefile.in
+index 75d296b..7833173 100644
+--- a/scripts/Makefile.in
 +++ b/scripts/Makefile.in
-@@ -0,0 +1,699 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = scripts
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+	$(srcdir)/mediatomb-service-optware.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/autoconfig.h \
-+	$(top_builddir)/tombupnp/upnp/inc/upnpconfig.h
-+CONFIG_CLEAN_FILES = mediatomb-service-optware
-+CONFIG_CLEAN_VPATH_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
-+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+	distdir
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+am__relativize = \
-+  dir0=`pwd`; \
-+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-+  sed_rest='s,^[^/]*/*,,'; \
-+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-+  sed_butlast='s,/*[^/]*$$,,'; \
-+  while test -n "$$dir1"; do \
-+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+    if test "$$first" != "."; then \
-+      if test "$$first" = ".."; then \
-+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+      else \
-+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+        if test "$$first2" = "$$first"; then \
-+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+        else \
-+          dir2="../$$dir2"; \
-+        fi; \
-+        dir0="$$dir0"/"$$first"; \
-+      fi; \
-+    fi; \
-+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+  done; \
-+  reldir="$$dir2"
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMTAR = @AMTAR@
-+ATOMIC_OPTION_ENABLED = @ATOMIC_OPTION_ENABLED@
-+ATOMIC_OPTION_REQUESTED = @ATOMIC_OPTION_REQUESTED@
-+ATOMIC_X86_SINGLE_OPTION_ENABLED = @ATOMIC_X86_SINGLE_OPTION_ENABLED@
-+ATOMIC_X86_SINGLE_OPTION_REQUESTED = @ATOMIC_X86_SINGLE_OPTION_REQUESTED@
-+ATRAILERS_OPTION_ENABLED = @ATRAILERS_OPTION_ENABLED@
-+ATRAILERS_OPTION_REQUESTED = @ATRAILERS_OPTION_REQUESTED@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@
-+AVFORMAT_LDFLAGS = @AVFORMAT_LDFLAGS@
-+AVFORMAT_LIBS = @AVFORMAT_LIBS@
-+AVFORMAT_STATUS = @AVFORMAT_STATUS@
-+AVUTIL_LDFLAGS = @AVUTIL_LDFLAGS@
-+AVUTIL_LIBS = @AVUTIL_LIBS@
-+AVUTIL_STATUS = @AVUTIL_STATUS@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
-+DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-+DEBUG_LOG_OPTION_ENABLED = @DEBUG_LOG_OPTION_ENABLED@
-+DEBUG_LOG_OPTION_REQUESTED = @DEBUG_LOG_OPTION_REQUESTED@
-+DEBUG_MALLOC0_OPTION_ENABLED = @DEBUG_MALLOC0_OPTION_ENABLED@
-+DEBUG_MALLOC0_OPTION_REQUESTED = @DEBUG_MALLOC0_OPTION_REQUESTED@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+EXPAT_CFLAGS = @EXPAT_CFLAGS@
-+EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
-+EXPAT_LIBS = @EXPAT_LIBS@
-+EXPAT_STATUS = @EXPAT_STATUS@
-+EXTERNAL_TRANSCODING_OPTION_ENABLED = @EXTERNAL_TRANSCODING_OPTION_ENABLED@
-+EXTERNAL_TRANSCODING_OPTION_REQUESTED = @EXTERNAL_TRANSCODING_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_CFLAGS = @FFMPEGTHUMBNAILER_CFLAGS@
-+FFMPEGTHUMBNAILER_LDFLAGS = @FFMPEGTHUMBNAILER_LDFLAGS@
-+FFMPEGTHUMBNAILER_LIBS = @FFMPEGTHUMBNAILER_LIBS@
-+FFMPEGTHUMBNAILER_OPTION_ENABLED = @FFMPEGTHUMBNAILER_OPTION_ENABLED@
-+FFMPEGTHUMBNAILER_OPTION_REQUESTED = @FFMPEGTHUMBNAILER_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_STATUS = @FFMPEGTHUMBNAILER_STATUS@
-+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@
-+FFMPEG_LIBS = @FFMPEG_LIBS@
-+FFMPEG_OPTION_ENABLED = @FFMPEG_OPTION_ENABLED@
-+FFMPEG_OPTION_REQUESTED = @FFMPEG_OPTION_REQUESTED@
-+FSEEKO_CHECK_OPTION_ENABLED = @FSEEKO_CHECK_OPTION_ENABLED@
-+FSEEKO_CHECK_OPTION_REQUESTED = @FSEEKO_CHECK_OPTION_REQUESTED@
-+GREP = @GREP@
-+ICONV_CXXFLAGS = @ICONV_CXXFLAGS@
-+ICONV_LIBS = @ICONV_LIBS@
-+ICONV_LIB_OPTION_ENABLED = @ICONV_LIB_OPTION_ENABLED@
-+ICONV_LIB_OPTION_REQUESTED = @ICONV_LIB_OPTION_REQUESTED@
-+ID3LIB_CFLAGS = @ID3LIB_CFLAGS@
-+ID3LIB_LDFLAGS = @ID3LIB_LDFLAGS@
-+ID3LIB_LIBS = @ID3LIB_LIBS@
-+ID3LIB_OPTION_ENABLED = @ID3LIB_OPTION_ENABLED@
-+ID3LIB_OPTION_REQUESTED = @ID3LIB_OPTION_REQUESTED@
-+ID3LIB_STATUS = @ID3LIB_STATUS@
-+ID3LIB_VERSION = @ID3LIB_VERSION@
-+INOTIFY_CFLAGS = @INOTIFY_CFLAGS@
-+INOTIFY_OPTION_ENABLED = @INOTIFY_OPTION_ENABLED@
-+INOTIFY_OPTION_REQUESTED = @INOTIFY_OPTION_REQUESTED@
-+INOTIFY_STATUS = @INOTIFY_STATUS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JS_CXXFLAGS = @JS_CXXFLAGS@
-+JS_LIBS = @JS_LIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBDVDNAV_CFLAGS = @LIBDVDNAV_CFLAGS@
-+LIBDVDNAV_LIBS = @LIBDVDNAV_LIBS@
-+LIBDVDNAV_OPTION_ENABLED = @LIBDVDNAV_OPTION_ENABLED@
-+LIBDVDNAV_OPTION_REQUESTED = @LIBDVDNAV_OPTION_REQUESTED@
-+LIBDVDNAV_STATUS = @LIBDVDNAV_STATUS@
-+LIBDVDNAV_VERSION = @LIBDVDNAV_VERSION@
-+LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-+LIBEXIF_LDFLAGS = @LIBEXIF_LDFLAGS@
-+LIBEXIF_LIBS = @LIBEXIF_LIBS@
-+LIBEXIF_OPTION_ENABLED = @LIBEXIF_OPTION_ENABLED@
-+LIBEXIF_OPTION_REQUESTED = @LIBEXIF_OPTION_REQUESTED@
-+LIBEXIF_STATUS = @LIBEXIF_STATUS@
-+LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@
-+LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@
-+LIBEXTRACTOR_OPTION_ENABLED = @LIBEXTRACTOR_OPTION_ENABLED@
-+LIBEXTRACTOR_OPTION_REQUESTED = @LIBEXTRACTOR_OPTION_REQUESTED@
-+LIBEXTRACTOR_STATUS = @LIBEXTRACTOR_STATUS@
-+LIBEXTRACTOR_VERSION = @LIBEXTRACTOR_VERSION@
-+LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@
-+LIBMAGIC_LDFLAGS = @LIBMAGIC_LDFLAGS@
-+LIBMAGIC_LIBS = @LIBMAGIC_LIBS@
-+LIBMAGIC_OPTION_ENABLED = @LIBMAGIC_OPTION_ENABLED@
-+LIBMAGIC_OPTION_REQUESTED = @LIBMAGIC_OPTION_REQUESTED@
-+LIBMAGIC_STATUS = @LIBMAGIC_STATUS@
-+LIBMAGIC_VERSION = @LIBMAGIC_VERSION@
-+LIBMP4V2_CFLAGS = @LIBMP4V2_CFLAGS@
-+LIBMP4V2_LDFLAGS = @LIBMP4V2_LDFLAGS@
-+LIBMP4V2_LIBS = @LIBMP4V2_LIBS@
-+LIBMP4V2_OPTION_ENABLED = @LIBMP4V2_OPTION_ENABLED@
-+LIBMP4V2_OPTION_REQUESTED = @LIBMP4V2_OPTION_REQUESTED@
-+LIBMP4V2_STATUS = @LIBMP4V2_STATUS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LOG_OPTION_ENABLED = @LOG_OPTION_ENABLED@
-+LOG_OPTION_REQUESTED = @LOG_OPTION_REQUESTED@
-+LTLIBOBJS = @LTLIBOBJS@
-+LWRES_LIBS = @LWRES_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+MRREG_SERVICE_OPTION_ENABLED = @MRREG_SERVICE_OPTION_ENABLED@
-+MRREG_SERVICE_OPTION_REQUESTED = @MRREG_SERVICE_OPTION_REQUESTED@
-+MT_SEARCHPATH = @MT_SEARCHPATH@
-+MT_SEARCHPATH_HEADERS = @MT_SEARCHPATH_HEADERS@
-+MT_SEARCHPATH_LIBS = @MT_SEARCHPATH_LIBS@
-+MT_SEARCHPATH_PROGS = @MT_SEARCHPATH_PROGS@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+MYSQL_OPTION_ENABLED = @MYSQL_OPTION_ENABLED@
-+MYSQL_OPTION_REQUESTED = @MYSQL_OPTION_REQUESTED@
-+MYSQL_STATUS = @MYSQL_STATUS@
-+MYSQL_VERSION = @MYSQL_VERSION@
-+NSL_LIBS = @NSL_LIBS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+@@ -233,6 +233,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@
-+POW_LIB = @POW_LIB@
-+PROTOCOLINFO_EXTENSION_OPTION_ENABLED = @PROTOCOLINFO_EXTENSION_OPTION_ENABLED@
-+PROTOCOLINFO_EXTENSION_OPTION_REQUESTED = @PROTOCOLINFO_EXTENSION_OPTION_REQUESTED@
-+PTHREAD_CC = @PTHREAD_CC@
-+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-+PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
-+PTHREAD_LIBS = @PTHREAD_LIBS@
-+PTHREAD_LIB_OPTION_ENABLED = @PTHREAD_LIB_OPTION_ENABLED@
-+PTHREAD_LIB_OPTION_REQUESTED = @PTHREAD_LIB_OPTION_REQUESTED@
-+PTHREAD_STATUS = @PTHREAD_STATUS@
-+RANLIB = @RANLIB@
-+RT_LDFLAGS = @RT_LDFLAGS@
-+RT_LIBS = @RT_LIBS@
-+RT_STATUS = @RT_STATUS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SOPCAST_OPTION_ENABLED = @SOPCAST_OPTION_ENABLED@
-+SOPCAST_OPTION_REQUESTED = @SOPCAST_OPTION_REQUESTED@
-+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
-+SQLITE3_LDFLAGS = @SQLITE3_LDFLAGS@
-+SQLITE3_LIBS = @SQLITE3_LIBS@
-+SQLITE3_OPTION_ENABLED = @SQLITE3_OPTION_ENABLED@
-+SQLITE3_OPTION_REQUESTED = @SQLITE3_OPTION_REQUESTED@
-+SQLITE3_STATUS = @SQLITE3_STATUS@
-+SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED = @SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED@
-+SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED = @SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED@
-+STATIC_OPTION_ENABLED = @STATIC_OPTION_ENABLED@
-+STATIC_OPTION_REQUESTED = @STATIC_OPTION_REQUESTED@
-+STRIP = @STRIP@
-+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
-+TAGLIB_LIBS = @TAGLIB_LIBS@
-+TAGLIB_OPTION_ENABLED = @TAGLIB_OPTION_ENABLED@
-+TAGLIB_OPTION_REQUESTED = @TAGLIB_OPTION_REQUESTED@
-+TAGLIB_STATUS = @TAGLIB_STATUS@
-+TAGLIB_VERSION = @TAGLIB_VERSION@
-+TOMBDEBUG_OPTION_ENABLED = @TOMBDEBUG_OPTION_ENABLED@
-+TOMBDEBUG_OPTION_REQUESTED = @TOMBDEBUG_OPTION_REQUESTED@
-+UPNPDEBUG_OPTION_ENABLED = @UPNPDEBUG_OPTION_ENABLED@
-+UPNPDEBUG_OPTION_REQUESTED = @UPNPDEBUG_OPTION_REQUESTED@
-+VERSION = @VERSION@
-+WEBORAMA_OPTION_ENABLED = @WEBORAMA_OPTION_ENABLED@
-+WEBORAMA_OPTION_REQUESTED = @WEBORAMA_OPTION_REQUESTED@
-+YOUTUBE_OPTION_ENABLED = @YOUTUBE_OPTION_ENABLED@
-+YOUTUBE_OPTION_REQUESTED = @YOUTUBE_OPTION_REQUESTED@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+ZLIB_OPTION_ENABLED = @ZLIB_OPTION_ENABLED@
-+ZLIB_OPTION_REQUESTED = @ZLIB_OPTION_REQUESTED@
-+ZLIB_STATUS = @ZLIB_STATUS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+acx_pthread_config = @acx_pthread_config@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+curlconfig = @curlconfig@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+mt_libdvdnav_config = @mt_libdvdnav_config@
-+mt_mysql_config = @mt_mysql_config@
-+mt_taglib_config = @mt_taglib_config@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+SUBDIRS = js
-+_DIST_FILES = \
-+    demo_toggle.py \
-+    mediatomb-service-fedora \
-+	mediatomb-service-optware \
-+	mediatomb-prerm-optware
-+
-+EXTRA_DIST = $(_DIST_FILES)
-+all: all-recursive
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu scripts/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+mediatomb-service-optware: $(top_builddir)/config.status $(srcdir)/mediatomb-service-optware.in
-+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+$(RECURSIVE_CLEAN_TARGETS):
-+	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	set x; \
-+	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	shift; \
-+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  if test $$# -gt 0; then \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      "$$@" $$unique; \
-+	  else \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      $$unique; \
-+	  fi; \
-+	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	test -z "$(CTAGS_ARGS)$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && $(am__cd) $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) "$$here"
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-+	    $(am__relativize); \
-+	    new_distdir=$$reldir; \
-+	    dir1=$$subdir; dir2="$(top_distdir)"; \
-+	    $(am__relativize); \
-+	    new_top_distdir=$$reldir; \
-+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-+	    ($(am__cd) $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$new_top_distdir" \
-+	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
-+		am__skip_mode_fix=: \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile
-+installdirs: installdirs-recursive
-+installdirs-am:
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-recursive
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+html: html-recursive
-+
-+html-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-recursive
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-recursive
-+
-+install-html-am:
-+
-+install-info: install-info-recursive
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-recursive
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-recursive
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am:
-+
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-+	install-am install-strip tags-recursive
-+
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic ctags \
-+	ctags-recursive distclean distclean-generic distclean-tags \
-+	distdir dvi dvi-am html html-am info info-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 pdf pdf-am ps ps-am tags \
-+	tags-recursive uninstall uninstall-am
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- /dev/null
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POW_LIB = @POW_LIB@
+diff --git a/scripts/js/Makefile.in b/scripts/js/Makefile.in
+index 1f38362..b1c543d 100644
+--- a/scripts/js/Makefile.in
 +++ b/scripts/js/Makefile.in
-@@ -0,0 +1,543 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = scripts/js
-+DIST_COMMON = $(dist_js_DATA) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/autoconfig.h \
-+	$(top_builddir)/tombupnp/upnp/inc/upnpconfig.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+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'
-+am__installdirs = "$(DESTDIR)$(jsdir)"
-+DATA = $(dist_js_DATA)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMTAR = @AMTAR@
-+ATOMIC_OPTION_ENABLED = @ATOMIC_OPTION_ENABLED@
-+ATOMIC_OPTION_REQUESTED = @ATOMIC_OPTION_REQUESTED@
-+ATOMIC_X86_SINGLE_OPTION_ENABLED = @ATOMIC_X86_SINGLE_OPTION_ENABLED@
-+ATOMIC_X86_SINGLE_OPTION_REQUESTED = @ATOMIC_X86_SINGLE_OPTION_REQUESTED@
-+ATRAILERS_OPTION_ENABLED = @ATRAILERS_OPTION_ENABLED@
-+ATRAILERS_OPTION_REQUESTED = @ATRAILERS_OPTION_REQUESTED@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@
-+AVFORMAT_LDFLAGS = @AVFORMAT_LDFLAGS@
-+AVFORMAT_LIBS = @AVFORMAT_LIBS@
-+AVFORMAT_STATUS = @AVFORMAT_STATUS@
-+AVUTIL_LDFLAGS = @AVUTIL_LDFLAGS@
-+AVUTIL_LIBS = @AVUTIL_LIBS@
-+AVUTIL_STATUS = @AVUTIL_STATUS@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
-+DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-+DEBUG_LOG_OPTION_ENABLED = @DEBUG_LOG_OPTION_ENABLED@
-+DEBUG_LOG_OPTION_REQUESTED = @DEBUG_LOG_OPTION_REQUESTED@
-+DEBUG_MALLOC0_OPTION_ENABLED = @DEBUG_MALLOC0_OPTION_ENABLED@
-+DEBUG_MALLOC0_OPTION_REQUESTED = @DEBUG_MALLOC0_OPTION_REQUESTED@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+EXPAT_CFLAGS = @EXPAT_CFLAGS@
-+EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
-+EXPAT_LIBS = @EXPAT_LIBS@
-+EXPAT_STATUS = @EXPAT_STATUS@
-+EXTERNAL_TRANSCODING_OPTION_ENABLED = @EXTERNAL_TRANSCODING_OPTION_ENABLED@
-+EXTERNAL_TRANSCODING_OPTION_REQUESTED = @EXTERNAL_TRANSCODING_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_CFLAGS = @FFMPEGTHUMBNAILER_CFLAGS@
-+FFMPEGTHUMBNAILER_LDFLAGS = @FFMPEGTHUMBNAILER_LDFLAGS@
-+FFMPEGTHUMBNAILER_LIBS = @FFMPEGTHUMBNAILER_LIBS@
-+FFMPEGTHUMBNAILER_OPTION_ENABLED = @FFMPEGTHUMBNAILER_OPTION_ENABLED@
-+FFMPEGTHUMBNAILER_OPTION_REQUESTED = @FFMPEGTHUMBNAILER_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_STATUS = @FFMPEGTHUMBNAILER_STATUS@
-+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@
-+FFMPEG_LIBS = @FFMPEG_LIBS@
-+FFMPEG_OPTION_ENABLED = @FFMPEG_OPTION_ENABLED@
-+FFMPEG_OPTION_REQUESTED = @FFMPEG_OPTION_REQUESTED@
-+FSEEKO_CHECK_OPTION_ENABLED = @FSEEKO_CHECK_OPTION_ENABLED@
-+FSEEKO_CHECK_OPTION_REQUESTED = @FSEEKO_CHECK_OPTION_REQUESTED@
-+GREP = @GREP@
-+ICONV_CXXFLAGS = @ICONV_CXXFLAGS@
-+ICONV_LIBS = @ICONV_LIBS@
-+ICONV_LIB_OPTION_ENABLED = @ICONV_LIB_OPTION_ENABLED@
-+ICONV_LIB_OPTION_REQUESTED = @ICONV_LIB_OPTION_REQUESTED@
-+ID3LIB_CFLAGS = @ID3LIB_CFLAGS@
-+ID3LIB_LDFLAGS = @ID3LIB_LDFLAGS@
-+ID3LIB_LIBS = @ID3LIB_LIBS@
-+ID3LIB_OPTION_ENABLED = @ID3LIB_OPTION_ENABLED@
-+ID3LIB_OPTION_REQUESTED = @ID3LIB_OPTION_REQUESTED@
-+ID3LIB_STATUS = @ID3LIB_STATUS@
-+ID3LIB_VERSION = @ID3LIB_VERSION@
-+INOTIFY_CFLAGS = @INOTIFY_CFLAGS@
-+INOTIFY_OPTION_ENABLED = @INOTIFY_OPTION_ENABLED@
-+INOTIFY_OPTION_REQUESTED = @INOTIFY_OPTION_REQUESTED@
-+INOTIFY_STATUS = @INOTIFY_STATUS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JS_CXXFLAGS = @JS_CXXFLAGS@
-+JS_LIBS = @JS_LIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBDVDNAV_CFLAGS = @LIBDVDNAV_CFLAGS@
-+LIBDVDNAV_LIBS = @LIBDVDNAV_LIBS@
-+LIBDVDNAV_OPTION_ENABLED = @LIBDVDNAV_OPTION_ENABLED@
-+LIBDVDNAV_OPTION_REQUESTED = @LIBDVDNAV_OPTION_REQUESTED@
-+LIBDVDNAV_STATUS = @LIBDVDNAV_STATUS@
-+LIBDVDNAV_VERSION = @LIBDVDNAV_VERSION@
-+LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-+LIBEXIF_LDFLAGS = @LIBEXIF_LDFLAGS@
-+LIBEXIF_LIBS = @LIBEXIF_LIBS@
-+LIBEXIF_OPTION_ENABLED = @LIBEXIF_OPTION_ENABLED@
-+LIBEXIF_OPTION_REQUESTED = @LIBEXIF_OPTION_REQUESTED@
-+LIBEXIF_STATUS = @LIBEXIF_STATUS@
-+LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@
-+LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@
-+LIBEXTRACTOR_OPTION_ENABLED = @LIBEXTRACTOR_OPTION_ENABLED@
-+LIBEXTRACTOR_OPTION_REQUESTED = @LIBEXTRACTOR_OPTION_REQUESTED@
-+LIBEXTRACTOR_STATUS = @LIBEXTRACTOR_STATUS@
-+LIBEXTRACTOR_VERSION = @LIBEXTRACTOR_VERSION@
-+LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@
-+LIBMAGIC_LDFLAGS = @LIBMAGIC_LDFLAGS@
-+LIBMAGIC_LIBS = @LIBMAGIC_LIBS@
-+LIBMAGIC_OPTION_ENABLED = @LIBMAGIC_OPTION_ENABLED@
-+LIBMAGIC_OPTION_REQUESTED = @LIBMAGIC_OPTION_REQUESTED@
-+LIBMAGIC_STATUS = @LIBMAGIC_STATUS@
-+LIBMAGIC_VERSION = @LIBMAGIC_VERSION@
-+LIBMP4V2_CFLAGS = @LIBMP4V2_CFLAGS@
-+LIBMP4V2_LDFLAGS = @LIBMP4V2_LDFLAGS@
-+LIBMP4V2_LIBS = @LIBMP4V2_LIBS@
-+LIBMP4V2_OPTION_ENABLED = @LIBMP4V2_OPTION_ENABLED@
-+LIBMP4V2_OPTION_REQUESTED = @LIBMP4V2_OPTION_REQUESTED@
-+LIBMP4V2_STATUS = @LIBMP4V2_STATUS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LOG_OPTION_ENABLED = @LOG_OPTION_ENABLED@
-+LOG_OPTION_REQUESTED = @LOG_OPTION_REQUESTED@
-+LTLIBOBJS = @LTLIBOBJS@
-+LWRES_LIBS = @LWRES_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+MRREG_SERVICE_OPTION_ENABLED = @MRREG_SERVICE_OPTION_ENABLED@
-+MRREG_SERVICE_OPTION_REQUESTED = @MRREG_SERVICE_OPTION_REQUESTED@
-+MT_SEARCHPATH = @MT_SEARCHPATH@
-+MT_SEARCHPATH_HEADERS = @MT_SEARCHPATH_HEADERS@
-+MT_SEARCHPATH_LIBS = @MT_SEARCHPATH_LIBS@
-+MT_SEARCHPATH_PROGS = @MT_SEARCHPATH_PROGS@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+MYSQL_OPTION_ENABLED = @MYSQL_OPTION_ENABLED@
-+MYSQL_OPTION_REQUESTED = @MYSQL_OPTION_REQUESTED@
-+MYSQL_STATUS = @MYSQL_STATUS@
-+MYSQL_VERSION = @MYSQL_VERSION@
-+NSL_LIBS = @NSL_LIBS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+@@ -217,6 +217,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@
-+POW_LIB = @POW_LIB@
-+PROTOCOLINFO_EXTENSION_OPTION_ENABLED = @PROTOCOLINFO_EXTENSION_OPTION_ENABLED@
-+PROTOCOLINFO_EXTENSION_OPTION_REQUESTED = @PROTOCOLINFO_EXTENSION_OPTION_REQUESTED@
-+PTHREAD_CC = @PTHREAD_CC@
-+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-+PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
-+PTHREAD_LIBS = @PTHREAD_LIBS@
-+PTHREAD_LIB_OPTION_ENABLED = @PTHREAD_LIB_OPTION_ENABLED@
-+PTHREAD_LIB_OPTION_REQUESTED = @PTHREAD_LIB_OPTION_REQUESTED@
-+PTHREAD_STATUS = @PTHREAD_STATUS@
-+RANLIB = @RANLIB@
-+RT_LDFLAGS = @RT_LDFLAGS@
-+RT_LIBS = @RT_LIBS@
-+RT_STATUS = @RT_STATUS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SOPCAST_OPTION_ENABLED = @SOPCAST_OPTION_ENABLED@
-+SOPCAST_OPTION_REQUESTED = @SOPCAST_OPTION_REQUESTED@
-+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
-+SQLITE3_LDFLAGS = @SQLITE3_LDFLAGS@
-+SQLITE3_LIBS = @SQLITE3_LIBS@
-+SQLITE3_OPTION_ENABLED = @SQLITE3_OPTION_ENABLED@
-+SQLITE3_OPTION_REQUESTED = @SQLITE3_OPTION_REQUESTED@
-+SQLITE3_STATUS = @SQLITE3_STATUS@
-+SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED = @SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED@
-+SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED = @SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED@
-+STATIC_OPTION_ENABLED = @STATIC_OPTION_ENABLED@
-+STATIC_OPTION_REQUESTED = @STATIC_OPTION_REQUESTED@
-+STRIP = @STRIP@
-+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
-+TAGLIB_LIBS = @TAGLIB_LIBS@
-+TAGLIB_OPTION_ENABLED = @TAGLIB_OPTION_ENABLED@
-+TAGLIB_OPTION_REQUESTED = @TAGLIB_OPTION_REQUESTED@
-+TAGLIB_STATUS = @TAGLIB_STATUS@
-+TAGLIB_VERSION = @TAGLIB_VERSION@
-+TOMBDEBUG_OPTION_ENABLED = @TOMBDEBUG_OPTION_ENABLED@
-+TOMBDEBUG_OPTION_REQUESTED = @TOMBDEBUG_OPTION_REQUESTED@
-+UPNPDEBUG_OPTION_ENABLED = @UPNPDEBUG_OPTION_ENABLED@
-+UPNPDEBUG_OPTION_REQUESTED = @UPNPDEBUG_OPTION_REQUESTED@
-+VERSION = @VERSION@
-+WEBORAMA_OPTION_ENABLED = @WEBORAMA_OPTION_ENABLED@
-+WEBORAMA_OPTION_REQUESTED = @WEBORAMA_OPTION_REQUESTED@
-+YOUTUBE_OPTION_ENABLED = @YOUTUBE_OPTION_ENABLED@
-+YOUTUBE_OPTION_REQUESTED = @YOUTUBE_OPTION_REQUESTED@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+ZLIB_OPTION_ENABLED = @ZLIB_OPTION_ENABLED@
-+ZLIB_OPTION_REQUESTED = @ZLIB_OPTION_REQUESTED@
-+ZLIB_STATUS = @ZLIB_STATUS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+acx_pthread_config = @acx_pthread_config@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+curlconfig = @curlconfig@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+mt_libdvdnav_config = @mt_libdvdnav_config@
-+mt_mysql_config = @mt_mysql_config@
-+mt_taglib_config = @mt_taglib_config@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+_DIST_FILES_JS = \
-+    import.js \
-+    import-dvd.js \
-+    playlists.js \
-+    common.js
-+
-+jsdir = $(pkgdatadir)/js
-+dist_js_DATA = $(_DIST_FILES_JS)
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu scripts/js/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu scripts/js/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+install-dist_jsDATA: $(dist_js_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(jsdir)" || $(MKDIR_P) "$(DESTDIR)$(jsdir)"
-+	@list='$(dist_js_DATA)'; test -n "$(jsdir)" || list=; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(jsdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(jsdir)" || exit $$?; \
-+	done
-+
-+uninstall-dist_jsDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_js_DATA)'; test -n "$(jsdir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(jsdir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(jsdir)" && rm -f $$files
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(DATA)
-+installdirs:
-+	for dir in "$(DESTDIR)$(jsdir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-dist_jsDATA
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-dist_jsDATA
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am \
-+	install-dist_jsDATA 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 maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-+	pdf-am ps ps-am uninstall uninstall-am uninstall-dist_jsDATA
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- /dev/null
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POW_LIB = @POW_LIB@
+diff --git a/tombupnp/Makefile.in b/tombupnp/Makefile.in
+index d80d770..8d4cd6d 100644
+--- a/tombupnp/Makefile.in
 +++ b/tombupnp/Makefile.in
-@@ -0,0 +1,690 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = tombupnp
-+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+	AUTHORS COPYING ChangeLog INSTALL NEWS THANKS TODO
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/autoconfig.h \
-+	$(top_builddir)/tombupnp/upnp/inc/upnpconfig.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-dvi-recursive install-exec-recursive \
-+	install-html-recursive install-info-recursive \
-+	install-pdf-recursive install-ps-recursive install-recursive \
-+	installcheck-recursive installdirs-recursive pdf-recursive \
-+	ps-recursive uninstall-recursive
-+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
-+  distclean-recursive maintainer-clean-recursive
-+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
-+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
-+	distdir
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+am__relativize = \
-+  dir0=`pwd`; \
-+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
-+  sed_rest='s,^[^/]*/*,,'; \
-+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
-+  sed_butlast='s,/*[^/]*$$,,'; \
-+  while test -n "$$dir1"; do \
-+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+    if test "$$first" != "."; then \
-+      if test "$$first" = ".."; then \
-+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+      else \
-+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+        if test "$$first2" = "$$first"; then \
-+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+        else \
-+          dir2="../$$dir2"; \
-+        fi; \
-+        dir0="$$dir0"/"$$first"; \
-+      fi; \
-+    fi; \
-+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+  done; \
-+  reldir="$$dir2"
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMTAR = @AMTAR@
-+ATOMIC_OPTION_ENABLED = @ATOMIC_OPTION_ENABLED@
-+ATOMIC_OPTION_REQUESTED = @ATOMIC_OPTION_REQUESTED@
-+ATOMIC_X86_SINGLE_OPTION_ENABLED = @ATOMIC_X86_SINGLE_OPTION_ENABLED@
-+ATOMIC_X86_SINGLE_OPTION_REQUESTED = @ATOMIC_X86_SINGLE_OPTION_REQUESTED@
-+ATRAILERS_OPTION_ENABLED = @ATRAILERS_OPTION_ENABLED@
-+ATRAILERS_OPTION_REQUESTED = @ATRAILERS_OPTION_REQUESTED@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@
-+AVFORMAT_LDFLAGS = @AVFORMAT_LDFLAGS@
-+AVFORMAT_LIBS = @AVFORMAT_LIBS@
-+AVFORMAT_STATUS = @AVFORMAT_STATUS@
-+AVUTIL_LDFLAGS = @AVUTIL_LDFLAGS@
-+AVUTIL_LIBS = @AVUTIL_LIBS@
-+AVUTIL_STATUS = @AVUTIL_STATUS@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
-+DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-+DEBUG_LOG_OPTION_ENABLED = @DEBUG_LOG_OPTION_ENABLED@
-+DEBUG_LOG_OPTION_REQUESTED = @DEBUG_LOG_OPTION_REQUESTED@
-+DEBUG_MALLOC0_OPTION_ENABLED = @DEBUG_MALLOC0_OPTION_ENABLED@
-+DEBUG_MALLOC0_OPTION_REQUESTED = @DEBUG_MALLOC0_OPTION_REQUESTED@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+EXPAT_CFLAGS = @EXPAT_CFLAGS@
-+EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
-+EXPAT_LIBS = @EXPAT_LIBS@
-+EXPAT_STATUS = @EXPAT_STATUS@
-+EXTERNAL_TRANSCODING_OPTION_ENABLED = @EXTERNAL_TRANSCODING_OPTION_ENABLED@
-+EXTERNAL_TRANSCODING_OPTION_REQUESTED = @EXTERNAL_TRANSCODING_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_CFLAGS = @FFMPEGTHUMBNAILER_CFLAGS@
-+FFMPEGTHUMBNAILER_LDFLAGS = @FFMPEGTHUMBNAILER_LDFLAGS@
-+FFMPEGTHUMBNAILER_LIBS = @FFMPEGTHUMBNAILER_LIBS@
-+FFMPEGTHUMBNAILER_OPTION_ENABLED = @FFMPEGTHUMBNAILER_OPTION_ENABLED@
-+FFMPEGTHUMBNAILER_OPTION_REQUESTED = @FFMPEGTHUMBNAILER_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_STATUS = @FFMPEGTHUMBNAILER_STATUS@
-+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@
-+FFMPEG_LIBS = @FFMPEG_LIBS@
-+FFMPEG_OPTION_ENABLED = @FFMPEG_OPTION_ENABLED@
-+FFMPEG_OPTION_REQUESTED = @FFMPEG_OPTION_REQUESTED@
-+FSEEKO_CHECK_OPTION_ENABLED = @FSEEKO_CHECK_OPTION_ENABLED@
-+FSEEKO_CHECK_OPTION_REQUESTED = @FSEEKO_CHECK_OPTION_REQUESTED@
-+GREP = @GREP@
-+ICONV_CXXFLAGS = @ICONV_CXXFLAGS@
-+ICONV_LIBS = @ICONV_LIBS@
-+ICONV_LIB_OPTION_ENABLED = @ICONV_LIB_OPTION_ENABLED@
-+ICONV_LIB_OPTION_REQUESTED = @ICONV_LIB_OPTION_REQUESTED@
-+ID3LIB_CFLAGS = @ID3LIB_CFLAGS@
-+ID3LIB_LDFLAGS = @ID3LIB_LDFLAGS@
-+ID3LIB_LIBS = @ID3LIB_LIBS@
-+ID3LIB_OPTION_ENABLED = @ID3LIB_OPTION_ENABLED@
-+ID3LIB_OPTION_REQUESTED = @ID3LIB_OPTION_REQUESTED@
-+ID3LIB_STATUS = @ID3LIB_STATUS@
-+ID3LIB_VERSION = @ID3LIB_VERSION@
-+INOTIFY_CFLAGS = @INOTIFY_CFLAGS@
-+INOTIFY_OPTION_ENABLED = @INOTIFY_OPTION_ENABLED@
-+INOTIFY_OPTION_REQUESTED = @INOTIFY_OPTION_REQUESTED@
-+INOTIFY_STATUS = @INOTIFY_STATUS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JS_CXXFLAGS = @JS_CXXFLAGS@
-+JS_LIBS = @JS_LIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBDVDNAV_CFLAGS = @LIBDVDNAV_CFLAGS@
-+LIBDVDNAV_LIBS = @LIBDVDNAV_LIBS@
-+LIBDVDNAV_OPTION_ENABLED = @LIBDVDNAV_OPTION_ENABLED@
-+LIBDVDNAV_OPTION_REQUESTED = @LIBDVDNAV_OPTION_REQUESTED@
-+LIBDVDNAV_STATUS = @LIBDVDNAV_STATUS@
-+LIBDVDNAV_VERSION = @LIBDVDNAV_VERSION@
-+LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-+LIBEXIF_LDFLAGS = @LIBEXIF_LDFLAGS@
-+LIBEXIF_LIBS = @LIBEXIF_LIBS@
-+LIBEXIF_OPTION_ENABLED = @LIBEXIF_OPTION_ENABLED@
-+LIBEXIF_OPTION_REQUESTED = @LIBEXIF_OPTION_REQUESTED@
-+LIBEXIF_STATUS = @LIBEXIF_STATUS@
-+LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@
-+LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@
-+LIBEXTRACTOR_OPTION_ENABLED = @LIBEXTRACTOR_OPTION_ENABLED@
-+LIBEXTRACTOR_OPTION_REQUESTED = @LIBEXTRACTOR_OPTION_REQUESTED@
-+LIBEXTRACTOR_STATUS = @LIBEXTRACTOR_STATUS@
-+LIBEXTRACTOR_VERSION = @LIBEXTRACTOR_VERSION@
-+LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@
-+LIBMAGIC_LDFLAGS = @LIBMAGIC_LDFLAGS@
-+LIBMAGIC_LIBS = @LIBMAGIC_LIBS@
-+LIBMAGIC_OPTION_ENABLED = @LIBMAGIC_OPTION_ENABLED@
-+LIBMAGIC_OPTION_REQUESTED = @LIBMAGIC_OPTION_REQUESTED@
-+LIBMAGIC_STATUS = @LIBMAGIC_STATUS@
-+LIBMAGIC_VERSION = @LIBMAGIC_VERSION@
-+LIBMP4V2_CFLAGS = @LIBMP4V2_CFLAGS@
-+LIBMP4V2_LDFLAGS = @LIBMP4V2_LDFLAGS@
-+LIBMP4V2_LIBS = @LIBMP4V2_LIBS@
-+LIBMP4V2_OPTION_ENABLED = @LIBMP4V2_OPTION_ENABLED@
-+LIBMP4V2_OPTION_REQUESTED = @LIBMP4V2_OPTION_REQUESTED@
-+LIBMP4V2_STATUS = @LIBMP4V2_STATUS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LOG_OPTION_ENABLED = @LOG_OPTION_ENABLED@
-+LOG_OPTION_REQUESTED = @LOG_OPTION_REQUESTED@
-+LTLIBOBJS = @LTLIBOBJS@
-+LWRES_LIBS = @LWRES_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+MRREG_SERVICE_OPTION_ENABLED = @MRREG_SERVICE_OPTION_ENABLED@
-+MRREG_SERVICE_OPTION_REQUESTED = @MRREG_SERVICE_OPTION_REQUESTED@
-+MT_SEARCHPATH = @MT_SEARCHPATH@
-+MT_SEARCHPATH_HEADERS = @MT_SEARCHPATH_HEADERS@
-+MT_SEARCHPATH_LIBS = @MT_SEARCHPATH_LIBS@
-+MT_SEARCHPATH_PROGS = @MT_SEARCHPATH_PROGS@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+MYSQL_OPTION_ENABLED = @MYSQL_OPTION_ENABLED@
-+MYSQL_OPTION_REQUESTED = @MYSQL_OPTION_REQUESTED@
-+MYSQL_STATUS = @MYSQL_STATUS@
-+MYSQL_VERSION = @MYSQL_VERSION@
-+NSL_LIBS = @NSL_LIBS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+@@ -233,6 +233,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@
-+POW_LIB = @POW_LIB@
-+PROTOCOLINFO_EXTENSION_OPTION_ENABLED = @PROTOCOLINFO_EXTENSION_OPTION_ENABLED@
-+PROTOCOLINFO_EXTENSION_OPTION_REQUESTED = @PROTOCOLINFO_EXTENSION_OPTION_REQUESTED@
-+PTHREAD_CC = @PTHREAD_CC@
-+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-+PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
-+PTHREAD_LIBS = @PTHREAD_LIBS@
-+PTHREAD_LIB_OPTION_ENABLED = @PTHREAD_LIB_OPTION_ENABLED@
-+PTHREAD_LIB_OPTION_REQUESTED = @PTHREAD_LIB_OPTION_REQUESTED@
-+PTHREAD_STATUS = @PTHREAD_STATUS@
-+RANLIB = @RANLIB@
-+RT_LDFLAGS = @RT_LDFLAGS@
-+RT_LIBS = @RT_LIBS@
-+RT_STATUS = @RT_STATUS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SOPCAST_OPTION_ENABLED = @SOPCAST_OPTION_ENABLED@
-+SOPCAST_OPTION_REQUESTED = @SOPCAST_OPTION_REQUESTED@
-+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
-+SQLITE3_LDFLAGS = @SQLITE3_LDFLAGS@
-+SQLITE3_LIBS = @SQLITE3_LIBS@
-+SQLITE3_OPTION_ENABLED = @SQLITE3_OPTION_ENABLED@
-+SQLITE3_OPTION_REQUESTED = @SQLITE3_OPTION_REQUESTED@
-+SQLITE3_STATUS = @SQLITE3_STATUS@
-+SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED = @SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED@
-+SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED = @SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED@
-+STATIC_OPTION_ENABLED = @STATIC_OPTION_ENABLED@
-+STATIC_OPTION_REQUESTED = @STATIC_OPTION_REQUESTED@
-+STRIP = @STRIP@
-+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
-+TAGLIB_LIBS = @TAGLIB_LIBS@
-+TAGLIB_OPTION_ENABLED = @TAGLIB_OPTION_ENABLED@
-+TAGLIB_OPTION_REQUESTED = @TAGLIB_OPTION_REQUESTED@
-+TAGLIB_STATUS = @TAGLIB_STATUS@
-+TAGLIB_VERSION = @TAGLIB_VERSION@
-+TOMBDEBUG_OPTION_ENABLED = @TOMBDEBUG_OPTION_ENABLED@
-+TOMBDEBUG_OPTION_REQUESTED = @TOMBDEBUG_OPTION_REQUESTED@
-+UPNPDEBUG_OPTION_ENABLED = @UPNPDEBUG_OPTION_ENABLED@
-+UPNPDEBUG_OPTION_REQUESTED = @UPNPDEBUG_OPTION_REQUESTED@
-+VERSION = @VERSION@
-+WEBORAMA_OPTION_ENABLED = @WEBORAMA_OPTION_ENABLED@
-+WEBORAMA_OPTION_REQUESTED = @WEBORAMA_OPTION_REQUESTED@
-+YOUTUBE_OPTION_ENABLED = @YOUTUBE_OPTION_ENABLED@
-+YOUTUBE_OPTION_REQUESTED = @YOUTUBE_OPTION_REQUESTED@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+ZLIB_OPTION_ENABLED = @ZLIB_OPTION_ENABLED@
-+ZLIB_OPTION_REQUESTED = @ZLIB_OPTION_REQUESTED@
-+ZLIB_STATUS = @ZLIB_STATUS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+acx_pthread_config = @acx_pthread_config@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+curlconfig = @curlconfig@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+mt_libdvdnav_config = @mt_libdvdnav_config@
-+mt_mysql_config = @mt_mysql_config@
-+mt_taglib_config = @mt_taglib_config@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+SUBDIRS = build
-+all: all-recursive
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tombupnp/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu tombupnp/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+
-+# This directory's subdirectories are mostly independent; you can cd
-+# into them and run `make' without going through this Makefile.
-+# To change the values of `make' variables: instead of editing Makefiles,
-+# (1) if the variable is set in `config.status', edit `config.status'
-+#     (which will cause the Makefiles to be regenerated when you run `make');
-+# (2) otherwise, pass the desired values on the `make' command line.
-+$(RECURSIVE_TARGETS):
-+	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    dot_seen=yes; \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done; \
-+	if test "$$dot_seen" = "no"; then \
-+	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-+	fi; test -z "$$fail"
-+
-+$(RECURSIVE_CLEAN_TARGETS):
-+	@fail= failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
-+	dot_seen=no; \
-+	case "$@" in \
-+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-+	  *) list='$(SUBDIRS)' ;; \
-+	esac; \
-+	rev=''; for subdir in $$list; do \
-+	  if test "$$subdir" = "."; then :; else \
-+	    rev="$$subdir $$rev"; \
-+	  fi; \
-+	done; \
-+	rev="$$rev ."; \
-+	target=`echo $@ | sed s/-recursive//`; \
-+	for subdir in $$rev; do \
-+	  echo "Making $$target in $$subdir"; \
-+	  if test "$$subdir" = "."; then \
-+	    local_target="$$target-am"; \
-+	  else \
-+	    local_target="$$target"; \
-+	  fi; \
-+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-+	  || eval $$failcom; \
-+	done && test -z "$$fail"
-+tags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-+	done
-+ctags-recursive:
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-+	done
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	set x; \
-+	here=`pwd`; \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-+	  include_option=--etags-include; \
-+	  empty_fix=.; \
-+	else \
-+	  include_option=--include; \
-+	  empty_fix=; \
-+	fi; \
-+	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test ! -f $$subdir/TAGS || \
-+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
-+	  fi; \
-+	done; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	shift; \
-+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  if test $$# -gt 0; then \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      "$$@" $$unique; \
-+	  else \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      $$unique; \
-+	  fi; \
-+	fi
-+ctags: CTAGS
-+CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	test -z "$(CTAGS_ARGS)$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && $(am__cd) $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) "$$here"
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-+	  if test "$$subdir" = .; then :; else \
-+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
-+	    $(am__relativize); \
-+	    new_distdir=$$reldir; \
-+	    dir1=$$subdir; dir2="$(top_distdir)"; \
-+	    $(am__relativize); \
-+	    new_top_distdir=$$reldir; \
-+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
-+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
-+	    ($(am__cd) $$subdir && \
-+	      $(MAKE) $(AM_MAKEFLAGS) \
-+	        top_distdir="$$new_top_distdir" \
-+	        distdir="$$new_distdir" \
-+		am__remove_distdir=: \
-+		am__skip_length_check=: \
-+		am__skip_mode_fix=: \
-+	        distdir) \
-+	      || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-recursive
-+all-am: Makefile
-+installdirs: installdirs-recursive
-+installdirs-am:
-+install: install-recursive
-+install-exec: install-exec-recursive
-+install-data: install-data-recursive
-+uninstall: uninstall-recursive
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-recursive
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-recursive
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-recursive
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic distclean-tags
-+
-+dvi: dvi-recursive
-+
-+dvi-am:
-+
-+html: html-recursive
-+
-+html-am:
-+
-+info: info-recursive
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-recursive
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-recursive
-+
-+install-html-am:
-+
-+install-info: install-info-recursive
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-recursive
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-recursive
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-recursive
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-recursive
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-recursive
-+
-+pdf-am:
-+
-+ps: ps-recursive
-+
-+ps-am:
-+
-+uninstall-am:
-+
-+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
-+	install-am install-strip tags-recursive
-+
-+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-+	all all-am check check-am clean clean-generic ctags \
-+	ctags-recursive distclean distclean-generic distclean-tags \
-+	distdir dvi dvi-am html html-am info info-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 pdf pdf-am ps ps-am tags \
-+	tags-recursive uninstall uninstall-am
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- /dev/null
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POW_LIB = @POW_LIB@
+diff --git a/tombupnp/build/Makefile.in b/tombupnp/build/Makefile.in
+index eec0e67..c50e9d3 100644
+--- a/tombupnp/build/Makefile.in
 +++ b/tombupnp/build/Makefile.in
-@@ -0,0 +1,1426 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-+	$(srcdir)/libtombupnp_src
-+subdir = tombupnp/build
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/autoconfig.h \
-+	$(top_builddir)/tombupnp/upnp/inc/upnpconfig.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+LIBRARIES = $(noinst_LIBRARIES)
-+AR = ar
-+ARFLAGS = cru
-+libtombupnp_a_AR = $(AR) $(ARFLAGS)
-+libtombupnp_a_LIBADD =
-+am_libtombupnp_a_OBJECTS = libtombupnp_a-attr.$(OBJEXT) \
-+	libtombupnp_a-document.$(OBJEXT) \
-+	libtombupnp_a-element.$(OBJEXT) libtombupnp_a-ixml.$(OBJEXT) \
-+	libtombupnp_a-ixmlmembuf.$(OBJEXT) \
-+	libtombupnp_a-ixmlparser.$(OBJEXT) \
-+	libtombupnp_a-namedNodeMap.$(OBJEXT) \
-+	libtombupnp_a-node.$(OBJEXT) libtombupnp_a-nodeList.$(OBJEXT) \
-+	libtombupnp_a-FreeList.$(OBJEXT) \
-+	libtombupnp_a-iasnprintf.$(OBJEXT) \
-+	libtombupnp_a-LinkedList.$(OBJEXT) \
-+	libtombupnp_a-ThreadPool.$(OBJEXT) \
-+	libtombupnp_a-TimerThread.$(OBJEXT) \
-+	libtombupnp_a-upnpapi.$(OBJEXT) \
-+	libtombupnp_a-upnpdebug.$(OBJEXT) \
-+	libtombupnp_a-upnptools.$(OBJEXT) \
-+	libtombupnp_a-gena_callback2.$(OBJEXT) \
-+	libtombupnp_a-gena_ctrlpt.$(OBJEXT) \
-+	libtombupnp_a-gena_device.$(OBJEXT) \
-+	libtombupnp_a-client_table.$(OBJEXT) \
-+	libtombupnp_a-miniserver.$(OBJEXT) \
-+	libtombupnp_a-httpparser.$(OBJEXT) \
-+	libtombupnp_a-httpreadwrite.$(OBJEXT) \
-+	libtombupnp_a-parsetools.$(OBJEXT) \
-+	libtombupnp_a-statcodes.$(OBJEXT) \
-+	libtombupnp_a-webserver.$(OBJEXT) libtombupnp_a-sock.$(OBJEXT) \
-+	libtombupnp_a-uri.$(OBJEXT) \
-+	libtombupnp_a-service_table.$(OBJEXT) \
-+	libtombupnp_a-membuffer.$(OBJEXT) \
-+	libtombupnp_a-strintmap.$(OBJEXT) \
-+	libtombupnp_a-strtoofft.$(OBJEXT) \
-+	libtombupnp_a-upnp_timeout.$(OBJEXT) \
-+	libtombupnp_a-util.$(OBJEXT) libtombupnp_a-inet_pton.$(OBJEXT) \
-+	libtombupnp_a-soap_common.$(OBJEXT) \
-+	libtombupnp_a-soap_ctrlpt.$(OBJEXT) \
-+	libtombupnp_a-soap_device.$(OBJEXT) \
-+	libtombupnp_a-ssdp_ctrlpt.$(OBJEXT) \
-+	libtombupnp_a-ssdp_device.$(OBJEXT) \
-+	libtombupnp_a-ssdp_server.$(OBJEXT) \
-+	libtombupnp_a-urlconfig.$(OBJEXT) \
-+	libtombupnp_a-sysdep.$(OBJEXT) \
-+	libtombupnp_a-upnp_md5.$(OBJEXT) \
-+	libtombupnp_a-upnp_uuid.$(OBJEXT)
-+libtombupnp_a_OBJECTS = $(am_libtombupnp_a_OBJECTS)
-+DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir) -I$(top_builddir)/tombupnp/upnp/inc
-+depcomp = $(SHELL) $(top_srcdir)/configure_aux/depcomp
-+am__depfiles_maybe = depfiles
-+am__mv = mv -f
-+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+CCLD = $(CC)
-+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-+SOURCES = $(libtombupnp_a_SOURCES)
-+DIST_SOURCES = $(libtombupnp_a_SOURCES)
-+ETAGS = etags
-+CTAGS = ctags
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMTAR = @AMTAR@
-+ATOMIC_OPTION_ENABLED = @ATOMIC_OPTION_ENABLED@
-+ATOMIC_OPTION_REQUESTED = @ATOMIC_OPTION_REQUESTED@
-+ATOMIC_X86_SINGLE_OPTION_ENABLED = @ATOMIC_X86_SINGLE_OPTION_ENABLED@
-+ATOMIC_X86_SINGLE_OPTION_REQUESTED = @ATOMIC_X86_SINGLE_OPTION_REQUESTED@
-+ATRAILERS_OPTION_ENABLED = @ATRAILERS_OPTION_ENABLED@
-+ATRAILERS_OPTION_REQUESTED = @ATRAILERS_OPTION_REQUESTED@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@
-+AVFORMAT_LDFLAGS = @AVFORMAT_LDFLAGS@
-+AVFORMAT_LIBS = @AVFORMAT_LIBS@
-+AVFORMAT_STATUS = @AVFORMAT_STATUS@
-+AVUTIL_LDFLAGS = @AVUTIL_LDFLAGS@
-+AVUTIL_LIBS = @AVUTIL_LIBS@
-+AVUTIL_STATUS = @AVUTIL_STATUS@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
-+DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-+DEBUG_LOG_OPTION_ENABLED = @DEBUG_LOG_OPTION_ENABLED@
-+DEBUG_LOG_OPTION_REQUESTED = @DEBUG_LOG_OPTION_REQUESTED@
-+DEBUG_MALLOC0_OPTION_ENABLED = @DEBUG_MALLOC0_OPTION_ENABLED@
-+DEBUG_MALLOC0_OPTION_REQUESTED = @DEBUG_MALLOC0_OPTION_REQUESTED@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+EXPAT_CFLAGS = @EXPAT_CFLAGS@
-+EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
-+EXPAT_LIBS = @EXPAT_LIBS@
-+EXPAT_STATUS = @EXPAT_STATUS@
-+EXTERNAL_TRANSCODING_OPTION_ENABLED = @EXTERNAL_TRANSCODING_OPTION_ENABLED@
-+EXTERNAL_TRANSCODING_OPTION_REQUESTED = @EXTERNAL_TRANSCODING_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_CFLAGS = @FFMPEGTHUMBNAILER_CFLAGS@
-+FFMPEGTHUMBNAILER_LDFLAGS = @FFMPEGTHUMBNAILER_LDFLAGS@
-+FFMPEGTHUMBNAILER_LIBS = @FFMPEGTHUMBNAILER_LIBS@
-+FFMPEGTHUMBNAILER_OPTION_ENABLED = @FFMPEGTHUMBNAILER_OPTION_ENABLED@
-+FFMPEGTHUMBNAILER_OPTION_REQUESTED = @FFMPEGTHUMBNAILER_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_STATUS = @FFMPEGTHUMBNAILER_STATUS@
-+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@
-+FFMPEG_LIBS = @FFMPEG_LIBS@
-+FFMPEG_OPTION_ENABLED = @FFMPEG_OPTION_ENABLED@
-+FFMPEG_OPTION_REQUESTED = @FFMPEG_OPTION_REQUESTED@
-+FSEEKO_CHECK_OPTION_ENABLED = @FSEEKO_CHECK_OPTION_ENABLED@
-+FSEEKO_CHECK_OPTION_REQUESTED = @FSEEKO_CHECK_OPTION_REQUESTED@
-+GREP = @GREP@
-+ICONV_CXXFLAGS = @ICONV_CXXFLAGS@
-+ICONV_LIBS = @ICONV_LIBS@
-+ICONV_LIB_OPTION_ENABLED = @ICONV_LIB_OPTION_ENABLED@
-+ICONV_LIB_OPTION_REQUESTED = @ICONV_LIB_OPTION_REQUESTED@
-+ID3LIB_CFLAGS = @ID3LIB_CFLAGS@
-+ID3LIB_LDFLAGS = @ID3LIB_LDFLAGS@
-+ID3LIB_LIBS = @ID3LIB_LIBS@
-+ID3LIB_OPTION_ENABLED = @ID3LIB_OPTION_ENABLED@
-+ID3LIB_OPTION_REQUESTED = @ID3LIB_OPTION_REQUESTED@
-+ID3LIB_STATUS = @ID3LIB_STATUS@
-+ID3LIB_VERSION = @ID3LIB_VERSION@
-+INOTIFY_CFLAGS = @INOTIFY_CFLAGS@
-+INOTIFY_OPTION_ENABLED = @INOTIFY_OPTION_ENABLED@
-+INOTIFY_OPTION_REQUESTED = @INOTIFY_OPTION_REQUESTED@
-+INOTIFY_STATUS = @INOTIFY_STATUS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JS_CXXFLAGS = @JS_CXXFLAGS@
-+JS_LIBS = @JS_LIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBDVDNAV_CFLAGS = @LIBDVDNAV_CFLAGS@
-+LIBDVDNAV_LIBS = @LIBDVDNAV_LIBS@
-+LIBDVDNAV_OPTION_ENABLED = @LIBDVDNAV_OPTION_ENABLED@
-+LIBDVDNAV_OPTION_REQUESTED = @LIBDVDNAV_OPTION_REQUESTED@
-+LIBDVDNAV_STATUS = @LIBDVDNAV_STATUS@
-+LIBDVDNAV_VERSION = @LIBDVDNAV_VERSION@
-+LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-+LIBEXIF_LDFLAGS = @LIBEXIF_LDFLAGS@
-+LIBEXIF_LIBS = @LIBEXIF_LIBS@
-+LIBEXIF_OPTION_ENABLED = @LIBEXIF_OPTION_ENABLED@
-+LIBEXIF_OPTION_REQUESTED = @LIBEXIF_OPTION_REQUESTED@
-+LIBEXIF_STATUS = @LIBEXIF_STATUS@
-+LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@
-+LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@
-+LIBEXTRACTOR_OPTION_ENABLED = @LIBEXTRACTOR_OPTION_ENABLED@
-+LIBEXTRACTOR_OPTION_REQUESTED = @LIBEXTRACTOR_OPTION_REQUESTED@
-+LIBEXTRACTOR_STATUS = @LIBEXTRACTOR_STATUS@
-+LIBEXTRACTOR_VERSION = @LIBEXTRACTOR_VERSION@
-+LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@
-+LIBMAGIC_LDFLAGS = @LIBMAGIC_LDFLAGS@
-+LIBMAGIC_LIBS = @LIBMAGIC_LIBS@
-+LIBMAGIC_OPTION_ENABLED = @LIBMAGIC_OPTION_ENABLED@
-+LIBMAGIC_OPTION_REQUESTED = @LIBMAGIC_OPTION_REQUESTED@
-+LIBMAGIC_STATUS = @LIBMAGIC_STATUS@
-+LIBMAGIC_VERSION = @LIBMAGIC_VERSION@
-+LIBMP4V2_CFLAGS = @LIBMP4V2_CFLAGS@
-+LIBMP4V2_LDFLAGS = @LIBMP4V2_LDFLAGS@
-+LIBMP4V2_LIBS = @LIBMP4V2_LIBS@
-+LIBMP4V2_OPTION_ENABLED = @LIBMP4V2_OPTION_ENABLED@
-+LIBMP4V2_OPTION_REQUESTED = @LIBMP4V2_OPTION_REQUESTED@
-+LIBMP4V2_STATUS = @LIBMP4V2_STATUS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LOG_OPTION_ENABLED = @LOG_OPTION_ENABLED@
-+LOG_OPTION_REQUESTED = @LOG_OPTION_REQUESTED@
-+LTLIBOBJS = @LTLIBOBJS@
-+LWRES_LIBS = @LWRES_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+MRREG_SERVICE_OPTION_ENABLED = @MRREG_SERVICE_OPTION_ENABLED@
-+MRREG_SERVICE_OPTION_REQUESTED = @MRREG_SERVICE_OPTION_REQUESTED@
-+MT_SEARCHPATH = @MT_SEARCHPATH@
-+MT_SEARCHPATH_HEADERS = @MT_SEARCHPATH_HEADERS@
-+MT_SEARCHPATH_LIBS = @MT_SEARCHPATH_LIBS@
-+MT_SEARCHPATH_PROGS = @MT_SEARCHPATH_PROGS@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+MYSQL_OPTION_ENABLED = @MYSQL_OPTION_ENABLED@
-+MYSQL_OPTION_REQUESTED = @MYSQL_OPTION_REQUESTED@
-+MYSQL_STATUS = @MYSQL_STATUS@
-+MYSQL_VERSION = @MYSQL_VERSION@
-+NSL_LIBS = @NSL_LIBS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+@@ -252,6 +252,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@
-+POW_LIB = @POW_LIB@
-+PROTOCOLINFO_EXTENSION_OPTION_ENABLED = @PROTOCOLINFO_EXTENSION_OPTION_ENABLED@
-+PROTOCOLINFO_EXTENSION_OPTION_REQUESTED = @PROTOCOLINFO_EXTENSION_OPTION_REQUESTED@
-+PTHREAD_CC = @PTHREAD_CC@
-+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-+PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
-+PTHREAD_LIBS = @PTHREAD_LIBS@
-+PTHREAD_LIB_OPTION_ENABLED = @PTHREAD_LIB_OPTION_ENABLED@
-+PTHREAD_LIB_OPTION_REQUESTED = @PTHREAD_LIB_OPTION_REQUESTED@
-+PTHREAD_STATUS = @PTHREAD_STATUS@
-+RANLIB = @RANLIB@
-+RT_LDFLAGS = @RT_LDFLAGS@
-+RT_LIBS = @RT_LIBS@
-+RT_STATUS = @RT_STATUS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SOPCAST_OPTION_ENABLED = @SOPCAST_OPTION_ENABLED@
-+SOPCAST_OPTION_REQUESTED = @SOPCAST_OPTION_REQUESTED@
-+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
-+SQLITE3_LDFLAGS = @SQLITE3_LDFLAGS@
-+SQLITE3_LIBS = @SQLITE3_LIBS@
-+SQLITE3_OPTION_ENABLED = @SQLITE3_OPTION_ENABLED@
-+SQLITE3_OPTION_REQUESTED = @SQLITE3_OPTION_REQUESTED@
-+SQLITE3_STATUS = @SQLITE3_STATUS@
-+SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED = @SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED@
-+SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED = @SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED@
-+STATIC_OPTION_ENABLED = @STATIC_OPTION_ENABLED@
-+STATIC_OPTION_REQUESTED = @STATIC_OPTION_REQUESTED@
-+STRIP = @STRIP@
-+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
-+TAGLIB_LIBS = @TAGLIB_LIBS@
-+TAGLIB_OPTION_ENABLED = @TAGLIB_OPTION_ENABLED@
-+TAGLIB_OPTION_REQUESTED = @TAGLIB_OPTION_REQUESTED@
-+TAGLIB_STATUS = @TAGLIB_STATUS@
-+TAGLIB_VERSION = @TAGLIB_VERSION@
-+TOMBDEBUG_OPTION_ENABLED = @TOMBDEBUG_OPTION_ENABLED@
-+TOMBDEBUG_OPTION_REQUESTED = @TOMBDEBUG_OPTION_REQUESTED@
-+UPNPDEBUG_OPTION_ENABLED = @UPNPDEBUG_OPTION_ENABLED@
-+UPNPDEBUG_OPTION_REQUESTED = @UPNPDEBUG_OPTION_REQUESTED@
-+VERSION = @VERSION@
-+WEBORAMA_OPTION_ENABLED = @WEBORAMA_OPTION_ENABLED@
-+WEBORAMA_OPTION_REQUESTED = @WEBORAMA_OPTION_REQUESTED@
-+YOUTUBE_OPTION_ENABLED = @YOUTUBE_OPTION_ENABLED@
-+YOUTUBE_OPTION_REQUESTED = @YOUTUBE_OPTION_REQUESTED@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+ZLIB_OPTION_ENABLED = @ZLIB_OPTION_ENABLED@
-+ZLIB_OPTION_REQUESTED = @ZLIB_OPTION_REQUESTED@
-+ZLIB_STATUS = @ZLIB_STATUS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+acx_pthread_config = @acx_pthread_config@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+curlconfig = @curlconfig@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+mt_libdvdnav_config = @mt_libdvdnav_config@
-+mt_mysql_config = @mt_mysql_config@
-+mt_taglib_config = @mt_taglib_config@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+EXTRA_DIST = gen_libtombupnp_src.sh
-+noinst_LIBRARIES = libtombupnp.a
-+libtombupnp_a_SOURCES = \
-+../build/dummy.h \
-+../ixml/inc/ixml.h \
-+../ixml/src/attr.c \
-+../ixml/src/document.c \
-+../ixml/src/element.c \
-+../ixml/src/inc/ixmlmembuf.h \
-+../ixml/src/inc/ixmlparser.h \
-+../ixml/src/ixml.c \
-+../ixml/src/ixmlmembuf.c \
-+../ixml/src/ixmlparser.c \
-+../ixml/src/namedNodeMap.c \
-+../ixml/src/node.c \
-+../ixml/src/nodeList.c \
-+../threadutil/inc/FreeList.h \
-+../threadutil/inc/iasnprintf.h \
-+../threadutil/inc/ithread.h \
-+../threadutil/inc/LinkedList.h \
-+../threadutil/inc/ThreadPool.h \
-+../threadutil/inc/TimerThread.h \
-+../threadutil/src/FreeList.c \
-+../threadutil/src/iasnprintf.c \
-+../threadutil/src/LinkedList.c \
-+../threadutil/src/ThreadPool.c \
-+../threadutil/src/TimerThread.c \
-+../upnp/inc/upnpconfig.h \
-+../upnp/inc/upnpdebug.h \
-+../upnp/inc/upnp.h \
-+../upnp/inc/upnptools.h \
-+../upnp/src/api/upnpapi.c \
-+../upnp/src/api/upnpdebug.c \
-+../upnp/src/api/upnptools.c \
-+../upnp/src/gena/gena_callback2.c \
-+../upnp/src/gena/gena_ctrlpt.c \
-+../upnp/src/gena/gena_device.c \
-+../upnp/src/genlib/client_table/client_table.c \
-+../upnp/src/genlib/miniserver/miniserver.c \
-+../upnp/src/genlib/net/http/httpparser.c \
-+../upnp/src/genlib/net/http/httpreadwrite.c \
-+../upnp/src/genlib/net/http/parsetools.c \
-+../upnp/src/genlib/net/http/statcodes.c \
-+../upnp/src/genlib/net/http/webserver.c \
-+../upnp/src/genlib/net/sock.c \
-+../upnp/src/genlib/net/uri/uri.c \
-+../upnp/src/genlib/service_table/service_table.c \
-+../upnp/src/genlib/util/membuffer.c \
-+../upnp/src/genlib/util/strintmap.c \
-+../upnp/src/genlib/util/strtoofft.c \
-+../upnp/src/genlib/util/upnp_timeout.c \
-+../upnp/src/genlib/util/util.c \
-+../upnp/src/inc/client_table.h \
-+../upnp/src/inc/config.h \
-+../upnp/src/inc/gena_ctrlpt.h \
-+../upnp/src/inc/gena_device.h \
-+../upnp/src/inc/gena.h \
-+../upnp/src/inc/global.h \
-+../upnp/src/inc/gmtdate.h \
-+../upnp/src/inc/http_client.h \
-+../upnp/src/inc/httpparser.h \
-+../upnp/src/inc/httpreadwrite.h \
-+../upnp/src/inc/inet_pton.h \
-+../upnp/src/inc/membuffer.h \
-+../upnp/src/inc/miniserver.h \
-+../upnp/src/inc/netall.h \
-+../upnp/src/inc/parsetools.h \
-+../upnp/src/inc/server.h \
-+../upnp/src/inc/service_table.h \
-+../upnp/src/inc/soaplib.h \
-+../upnp/src/inc/sock.h \
-+../upnp/src/inc/ssdplib.h \
-+../upnp/src/inc/statcodes.h \
-+../upnp/src/inc/statuscodes.h \
-+../upnp/src/inc/strintmap.h \
-+../upnp/src/inc/strtoofft.h \
-+../upnp/src/inc/sysdep.h \
-+../upnp/src/inc/unixutil.h \
-+../upnp/src/inc/upnpapi.h \
-+../upnp/src/inc/upnpclosesocket.h \
-+../upnp/src/inc/upnp_md5.h \
-+../upnp/src/inc/upnp_timeout.h \
-+../upnp/src/inc/upnp_uuid.h \
-+../upnp/src/inc/uri.h \
-+../upnp/src/inc/urlconfig.h \
-+../upnp/src/inc/utilall.h \
-+../upnp/src/inc/util.h \
-+../upnp/src/inc/webserver.h \
-+../upnp/src/inet_pton.c \
-+../upnp/src/soap/soap_common.c \
-+../upnp/src/soap/soap_ctrlpt.c \
-+../upnp/src/soap/soap_device.c \
-+../upnp/src/ssdp/ssdp_ctrlpt.c \
-+../upnp/src/ssdp/ssdp_device.c \
-+../upnp/src/ssdp/ssdp_server.c \
-+../upnp/src/urlconfig/urlconfig.c \
-+../upnp/src/uuid/sysdep.c \
-+../upnp/src/uuid/upnp_md5.c \
-+../upnp/src/uuid/upnp_uuid.c \
-+dummy.h
-+
-+libtombupnp_a_CFLAGS = \
-+          -I$(top_srcdir)/tombupnp/ixml/src/inc \
-+          -I$(top_srcdir)/tombupnp/ixml/inc \
-+          -I$(top_srcdir)/tombupnp/threadutil/inc \
-+          -I$(top_srcdir)/tombupnp/upnp/src/inc \
-+          -I$(top_srcdir)/tombupnp/upnp/inc \
-+          -I$(top_srcdir)
-+
-+all: all-am
-+
-+.SUFFIXES:
-+.SUFFIXES: .c .o .obj
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am $(srcdir)/libtombupnp_src $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tombupnp/build/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu tombupnp/build/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+
-+clean-noinstLIBRARIES:
-+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-+libtombupnp.a: $(libtombupnp_a_OBJECTS) $(libtombupnp_a_DEPENDENCIES) 
-+	-rm -f libtombupnp.a
-+	$(libtombupnp_a_AR) libtombupnp.a $(libtombupnp_a_OBJECTS) $(libtombupnp_a_LIBADD)
-+	$(RANLIB) libtombupnp.a
-+
-+mostlyclean-compile:
-+	-rm -f *.$(OBJEXT)
-+
-+distclean-compile:
-+	-rm -f *.tab.c
-+
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-FreeList.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-LinkedList.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-ThreadPool.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-TimerThread.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-attr.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-client_table.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-document.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-element.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-gena_callback2.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-gena_ctrlpt.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-gena_device.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-httpparser.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-httpreadwrite.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-iasnprintf.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-inet_pton.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-ixml.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-ixmlmembuf.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-ixmlparser.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-membuffer.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-miniserver.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-namedNodeMap.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-node.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-nodeList.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-parsetools.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-service_table.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-soap_common.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-soap_ctrlpt.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-soap_device.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-sock.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-ssdp_ctrlpt.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-ssdp_device.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-ssdp_server.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-statcodes.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-strintmap.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-strtoofft.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-sysdep.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-upnp_md5.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-upnp_timeout.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-upnp_uuid.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-upnpapi.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-upnpdebug.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-upnptools.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-uri.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-urlconfig.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-util.Po at am__quote@
-+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/libtombupnp_a-webserver.Po at am__quote@
-+
-+.c.o:
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(COMPILE) -c $<
-+
-+.c.obj:
-+ at am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-+
-+libtombupnp_a-attr.o: ../ixml/src/attr.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-attr.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-attr.Tpo -c -o libtombupnp_a-attr.o `test -f '../ixml/src/attr.c' || echo '$(srcdir)/'`../ixml/src/attr.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-attr.Tpo $(DEPDIR)/libtombupnp_a-attr.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/attr.c' object='libtombupnp_a-attr.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-attr.o `test -f '../ixml/src/attr.c' || echo '$(srcdir)/'`../ixml/src/attr.c
-+
-+libtombupnp_a-attr.obj: ../ixml/src/attr.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-attr.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-attr.Tpo -c -o libtombupnp_a-attr.obj `if test -f '../ixml/src/attr.c'; then $(CYGPATH_W) '../ixml/src/attr.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/attr.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-attr.Tpo $(DEPDIR)/libtombupnp_a-attr.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/attr.c' object='libtombupnp_a-attr.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-attr.obj `if test -f '../ixml/src/attr.c'; then $(CYGPATH_W) '../ixml/src/attr.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/attr.c'; fi`
-+
-+libtombupnp_a-document.o: ../ixml/src/document.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-document.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-document.Tpo -c -o libtombupnp_a-document.o `test -f '../ixml/src/document.c' || echo '$(srcdir)/'`../ixml/src/document.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-document.Tpo $(DEPDIR)/libtombupnp_a-document.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/document.c' object='libtombupnp_a-document.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-document.o `test -f '../ixml/src/document.c' || echo '$(srcdir)/'`../ixml/src/document.c
-+
-+libtombupnp_a-document.obj: ../ixml/src/document.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-document.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-document.Tpo -c -o libtombupnp_a-document.obj `if test -f '../ixml/src/document.c'; then $(CYGPATH_W) '../ixml/src/document.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/document.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-document.Tpo $(DEPDIR)/libtombupnp_a-document.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/document.c' object='libtombupnp_a-document.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-document.obj `if test -f '../ixml/src/document.c'; then $(CYGPATH_W) '../ixml/src/document.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/document.c'; fi`
-+
-+libtombupnp_a-element.o: ../ixml/src/element.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-element.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-element.Tpo -c -o libtombupnp_a-element.o `test -f '../ixml/src/element.c' || echo '$(srcdir)/'`../ixml/src/element.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-element.Tpo $(DEPDIR)/libtombupnp_a-element.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/element.c' object='libtombupnp_a-element.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-element.o `test -f '../ixml/src/element.c' || echo '$(srcdir)/'`../ixml/src/element.c
-+
-+libtombupnp_a-element.obj: ../ixml/src/element.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-element.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-element.Tpo -c -o libtombupnp_a-element.obj `if test -f '../ixml/src/element.c'; then $(CYGPATH_W) '../ixml/src/element.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/element.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-element.Tpo $(DEPDIR)/libtombupnp_a-element.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/element.c' object='libtombupnp_a-element.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-element.obj `if test -f '../ixml/src/element.c'; then $(CYGPATH_W) '../ixml/src/element.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/element.c'; fi`
-+
-+libtombupnp_a-ixml.o: ../ixml/src/ixml.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ixml.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-ixml.Tpo -c -o libtombupnp_a-ixml.o `test -f '../ixml/src/ixml.c' || echo '$(srcdir)/'`../ixml/src/ixml.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ixml.Tpo $(DEPDIR)/libtombupnp_a-ixml.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/ixml.c' object='libtombupnp_a-ixml.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ixml.o `test -f '../ixml/src/ixml.c' || echo '$(srcdir)/'`../ixml/src/ixml.c
-+
-+libtombupnp_a-ixml.obj: ../ixml/src/ixml.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ixml.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-ixml.Tpo -c -o libtombupnp_a-ixml.obj `if test -f '../ixml/src/ixml.c'; then $(CYGPATH_W) '../ixml/src/ixml.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/ixml.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ixml.Tpo $(DEPDIR)/libtombupnp_a-ixml.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/ixml.c' object='libtombupnp_a-ixml.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ixml.obj `if test -f '../ixml/src/ixml.c'; then $(CYGPATH_W) '../ixml/src/ixml.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/ixml.c'; fi`
-+
-+libtombupnp_a-ixmlmembuf.o: ../ixml/src/ixmlmembuf.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ixmlmembuf.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-ixmlmembuf.Tpo -c -o libtombupnp_a-ixmlmembuf.o `test -f '../ixml/src/ixmlmembuf.c' || echo '$(srcdir)/'`../ixml/src/ixmlmembuf.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ixmlmembuf.Tpo $(DEPDIR)/libtombupnp_a-ixmlmembuf.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/ixmlmembuf.c' object='libtombupnp_a-ixmlmembuf.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ixmlmembuf.o `test -f '../ixml/src/ixmlmembuf.c' || echo '$(srcdir)/'`../ixml/src/ixmlmembuf.c
-+
-+libtombupnp_a-ixmlmembuf.obj: ../ixml/src/ixmlmembuf.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ixmlmembuf.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-ixmlmembuf.Tpo -c -o libtombupnp_a-ixmlmembuf.obj `if test -f '../ixml/src/ixmlmembuf.c'; then $(CYGPATH_W) '../ixml/src/ixmlmembuf.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/ixmlmembuf.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ixmlmembuf.Tpo $(DEPDIR)/libtombupnp_a-ixmlmembuf.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/ixmlmembuf.c' object='libtombupnp_a-ixmlmembuf.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ixmlmembuf.obj `if test -f '../ixml/src/ixmlmembuf.c'; then $(CYGPATH_W) '../ixml/src/ixmlmembuf.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/ixmlmembuf.c'; fi`
-+
-+libtombupnp_a-ixmlparser.o: ../ixml/src/ixmlparser.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ixmlparser.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-ixmlparser.Tpo -c -o libtombupnp_a-ixmlparser.o `test -f '../ixml/src/ixmlparser.c' || echo '$(srcdir)/'`../ixml/src/ixmlparser.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ixmlparser.Tpo $(DEPDIR)/libtombupnp_a-ixmlparser.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/ixmlparser.c' object='libtombupnp_a-ixmlparser.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ixmlparser.o `test -f '../ixml/src/ixmlparser.c' || echo '$(srcdir)/'`../ixml/src/ixmlparser.c
-+
-+libtombupnp_a-ixmlparser.obj: ../ixml/src/ixmlparser.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ixmlparser.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-ixmlparser.Tpo -c -o libtombupnp_a-ixmlparser.obj `if test -f '../ixml/src/ixmlparser.c'; then $(CYGPATH_W) '../ixml/src/ixmlparser.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/ixmlparser.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ixmlparser.Tpo $(DEPDIR)/libtombupnp_a-ixmlparser.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/ixmlparser.c' object='libtombupnp_a-ixmlparser.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ixmlparser.obj `if test -f '../ixml/src/ixmlparser.c'; then $(CYGPATH_W) '../ixml/src/ixmlparser.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/ixmlparser.c'; fi`
-+
-+libtombupnp_a-namedNodeMap.o: ../ixml/src/namedNodeMap.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-namedNodeMap.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-namedNodeMap.Tpo -c -o libtombupnp_a-namedNodeMap.o `test -f '../ixml/src/namedNodeMap.c' || echo '$(srcdir)/'`../ixml/src/namedNodeMap.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-namedNodeMap.Tpo $(DEPDIR)/libtombupnp_a-namedNodeMap.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/namedNodeMap.c' object='libtombupnp_a-namedNodeMap.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-namedNodeMap.o `test -f '../ixml/src/namedNodeMap.c' || echo '$(srcdir)/'`../ixml/src/namedNodeMap.c
-+
-+libtombupnp_a-namedNodeMap.obj: ../ixml/src/namedNodeMap.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-namedNodeMap.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-namedNodeMap.Tpo -c -o libtombupnp_a-namedNodeMap.obj `if test -f '../ixml/src/namedNodeMap.c'; then $(CYGPATH_W) '../ixml/src/namedNodeMap.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/namedNodeMap.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-namedNodeMap.Tpo $(DEPDIR)/libtombupnp_a-namedNodeMap.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/namedNodeMap.c' object='libtombupnp_a-namedNodeMap.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-namedNodeMap.obj `if test -f '../ixml/src/namedNodeMap.c'; then $(CYGPATH_W) '../ixml/src/namedNodeMap.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/namedNodeMap.c'; fi`
-+
-+libtombupnp_a-node.o: ../ixml/src/node.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-node.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-node.Tpo -c -o libtombupnp_a-node.o `test -f '../ixml/src/node.c' || echo '$(srcdir)/'`../ixml/src/node.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-node.Tpo $(DEPDIR)/libtombupnp_a-node.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/node.c' object='libtombupnp_a-node.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-node.o `test -f '../ixml/src/node.c' || echo '$(srcdir)/'`../ixml/src/node.c
-+
-+libtombupnp_a-node.obj: ../ixml/src/node.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-node.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-node.Tpo -c -o libtombupnp_a-node.obj `if test -f '../ixml/src/node.c'; then $(CYGPATH_W) '../ixml/src/node.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/node.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-node.Tpo $(DEPDIR)/libtombupnp_a-node.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/node.c' object='libtombupnp_a-node.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-node.obj `if test -f '../ixml/src/node.c'; then $(CYGPATH_W) '../ixml/src/node.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/node.c'; fi`
-+
-+libtombupnp_a-nodeList.o: ../ixml/src/nodeList.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-nodeList.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-nodeList.Tpo -c -o libtombupnp_a-nodeList.o `test -f '../ixml/src/nodeList.c' || echo '$(srcdir)/'`../ixml/src/nodeList.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-nodeList.Tpo $(DEPDIR)/libtombupnp_a-nodeList.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/nodeList.c' object='libtombupnp_a-nodeList.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-nodeList.o `test -f '../ixml/src/nodeList.c' || echo '$(srcdir)/'`../ixml/src/nodeList.c
-+
-+libtombupnp_a-nodeList.obj: ../ixml/src/nodeList.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-nodeList.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-nodeList.Tpo -c -o libtombupnp_a-nodeList.obj `if test -f '../ixml/src/nodeList.c'; then $(CYGPATH_W) '../ixml/src/nodeList.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/nodeList.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-nodeList.Tpo $(DEPDIR)/libtombupnp_a-nodeList.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../ixml/src/nodeList.c' object='libtombupnp_a-nodeList.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-nodeList.obj `if test -f '../ixml/src/nodeList.c'; then $(CYGPATH_W) '../ixml/src/nodeList.c'; else $(CYGPATH_W) '$(srcdir)/../ixml/src/nodeList.c'; fi`
-+
-+libtombupnp_a-FreeList.o: ../threadutil/src/FreeList.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-FreeList.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-FreeList.Tpo -c -o libtombupnp_a-FreeList.o `test -f '../threadutil/src/FreeList.c' || echo '$(srcdir)/'`../threadutil/src/FreeList.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-FreeList.Tpo $(DEPDIR)/libtombupnp_a-FreeList.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../threadutil/src/FreeList.c' object='libtombupnp_a-FreeList.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-FreeList.o `test -f '../threadutil/src/FreeList.c' || echo '$(srcdir)/'`../threadutil/src/FreeList.c
-+
-+libtombupnp_a-FreeList.obj: ../threadutil/src/FreeList.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-FreeList.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-FreeList.Tpo -c -o libtombupnp_a-FreeList.obj `if test -f '../threadutil/src/FreeList.c'; then $(CYGPATH_W) '../threadutil/src/FreeList.c'; else $(CYGPATH_W) '$(srcdir)/../threadutil/src/FreeList.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-FreeList.Tpo $(DEPDIR)/libtombupnp_a-FreeList.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../threadutil/src/FreeList.c' object='libtombupnp_a-FreeList.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-FreeList.obj `if test -f '../threadutil/src/FreeList.c'; then $(CYGPATH_W) '../threadutil/src/FreeList.c'; else $(CYGPATH_W) '$(srcdir)/../threadutil/src/FreeList.c'; fi`
-+
-+libtombupnp_a-iasnprintf.o: ../threadutil/src/iasnprintf.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-iasnprintf.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-iasnprintf.Tpo -c -o libtombupnp_a-iasnprintf.o `test -f '../threadutil/src/iasnprintf.c' || echo '$(srcdir)/'`../threadutil/src/iasnprintf.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-iasnprintf.Tpo $(DEPDIR)/libtombupnp_a-iasnprintf.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../threadutil/src/iasnprintf.c' object='libtombupnp_a-iasnprintf.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-iasnprintf.o `test -f '../threadutil/src/iasnprintf.c' || echo '$(srcdir)/'`../threadutil/src/iasnprintf.c
-+
-+libtombupnp_a-iasnprintf.obj: ../threadutil/src/iasnprintf.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-iasnprintf.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-iasnprintf.Tpo -c -o libtombupnp_a-iasnprintf.obj `if test -f '../threadutil/src/iasnprintf.c'; then $(CYGPATH_W) '../threadutil/src/iasnprintf.c'; else $(CYGPATH_W) '$(srcdir)/../threadutil/src/iasnprintf.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-iasnprintf.Tpo $(DEPDIR)/libtombupnp_a-iasnprintf.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../threadutil/src/iasnprintf.c' object='libtombupnp_a-iasnprintf.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-iasnprintf.obj `if test -f '../threadutil/src/iasnprintf.c'; then $(CYGPATH_W) '../threadutil/src/iasnprintf.c'; else $(CYGPATH_W) '$(srcdir)/../threadutil/src/iasnprintf.c'; fi`
-+
-+libtombupnp_a-LinkedList.o: ../threadutil/src/LinkedList.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-LinkedList.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-LinkedList.Tpo -c -o libtombupnp_a-LinkedList.o `test -f '../threadutil/src/LinkedList.c' || echo '$(srcdir)/'`../threadutil/src/LinkedList.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-LinkedList.Tpo $(DEPDIR)/libtombupnp_a-LinkedList.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../threadutil/src/LinkedList.c' object='libtombupnp_a-LinkedList.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-LinkedList.o `test -f '../threadutil/src/LinkedList.c' || echo '$(srcdir)/'`../threadutil/src/LinkedList.c
-+
-+libtombupnp_a-LinkedList.obj: ../threadutil/src/LinkedList.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-LinkedList.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-LinkedList.Tpo -c -o libtombupnp_a-LinkedList.obj `if test -f '../threadutil/src/LinkedList.c'; then $(CYGPATH_W) '../threadutil/src/LinkedList.c'; else $(CYGPATH_W) '$(srcdir)/../threadutil/src/LinkedList.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-LinkedList.Tpo $(DEPDIR)/libtombupnp_a-LinkedList.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../threadutil/src/LinkedList.c' object='libtombupnp_a-LinkedList.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-LinkedList.obj `if test -f '../threadutil/src/LinkedList.c'; then $(CYGPATH_W) '../threadutil/src/LinkedList.c'; else $(CYGPATH_W) '$(srcdir)/../threadutil/src/LinkedList.c'; fi`
-+
-+libtombupnp_a-ThreadPool.o: ../threadutil/src/ThreadPool.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ThreadPool.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-ThreadPool.Tpo -c -o libtombupnp_a-ThreadPool.o `test -f '../threadutil/src/ThreadPool.c' || echo '$(srcdir)/'`../threadutil/src/ThreadPool.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ThreadPool.Tpo $(DEPDIR)/libtombupnp_a-ThreadPool.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../threadutil/src/ThreadPool.c' object='libtombupnp_a-ThreadPool.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ThreadPool.o `test -f '../threadutil/src/ThreadPool.c' || echo '$(srcdir)/'`../threadutil/src/ThreadPool.c
-+
-+libtombupnp_a-ThreadPool.obj: ../threadutil/src/ThreadPool.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ThreadPool.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-ThreadPool.Tpo -c -o libtombupnp_a-ThreadPool.obj `if test -f '../threadutil/src/ThreadPool.c'; then $(CYGPATH_W) '../threadutil/src/ThreadPool.c'; else $(CYGPATH_W) '$(srcdir)/../threadutil/src/ThreadPool.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ThreadPool.Tpo $(DEPDIR)/libtombupnp_a-ThreadPool.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../threadutil/src/ThreadPool.c' object='libtombupnp_a-ThreadPool.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ThreadPool.obj `if test -f '../threadutil/src/ThreadPool.c'; then $(CYGPATH_W) '../threadutil/src/ThreadPool.c'; else $(CYGPATH_W) '$(srcdir)/../threadutil/src/ThreadPool.c'; fi`
-+
-+libtombupnp_a-TimerThread.o: ../threadutil/src/TimerThread.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-TimerThread.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-TimerThread.Tpo -c -o libtombupnp_a-TimerThread.o `test -f '../threadutil/src/TimerThread.c' || echo '$(srcdir)/'`../threadutil/src/TimerThread.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-TimerThread.Tpo $(DEPDIR)/libtombupnp_a-TimerThread.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../threadutil/src/TimerThread.c' object='libtombupnp_a-TimerThread.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-TimerThread.o `test -f '../threadutil/src/TimerThread.c' || echo '$(srcdir)/'`../threadutil/src/TimerThread.c
-+
-+libtombupnp_a-TimerThread.obj: ../threadutil/src/TimerThread.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-TimerThread.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-TimerThread.Tpo -c -o libtombupnp_a-TimerThread.obj `if test -f '../threadutil/src/TimerThread.c'; then $(CYGPATH_W) '../threadutil/src/TimerThread.c'; else $(CYGPATH_W) '$(srcdir)/../threadutil/src/TimerThread.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-TimerThread.Tpo $(DEPDIR)/libtombupnp_a-TimerThread.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../threadutil/src/TimerThread.c' object='libtombupnp_a-TimerThread.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-TimerThread.obj `if test -f '../threadutil/src/TimerThread.c'; then $(CYGPATH_W) '../threadutil/src/TimerThread.c'; else $(CYGPATH_W) '$(srcdir)/../threadutil/src/TimerThread.c'; fi`
-+
-+libtombupnp_a-upnpapi.o: ../upnp/src/api/upnpapi.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnpapi.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnpapi.Tpo -c -o libtombupnp_a-upnpapi.o `test -f '../upnp/src/api/upnpapi.c' || echo '$(srcdir)/'`../upnp/src/api/upnpapi.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnpapi.Tpo $(DEPDIR)/libtombupnp_a-upnpapi.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/api/upnpapi.c' object='libtombupnp_a-upnpapi.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnpapi.o `test -f '../upnp/src/api/upnpapi.c' || echo '$(srcdir)/'`../upnp/src/api/upnpapi.c
-+
-+libtombupnp_a-upnpapi.obj: ../upnp/src/api/upnpapi.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnpapi.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnpapi.Tpo -c -o libtombupnp_a-upnpapi.obj `if test -f '../upnp/src/api/upnpapi.c'; then $(CYGPATH_W) '../upnp/src/api/upnpapi.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/api/upnpapi.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnpapi.Tpo $(DEPDIR)/libtombupnp_a-upnpapi.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/api/upnpapi.c' object='libtombupnp_a-upnpapi.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnpapi.obj `if test -f '../upnp/src/api/upnpapi.c'; then $(CYGPATH_W) '../upnp/src/api/upnpapi.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/api/upnpapi.c'; fi`
-+
-+libtombupnp_a-upnpdebug.o: ../upnp/src/api/upnpdebug.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnpdebug.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnpdebug.Tpo -c -o libtombupnp_a-upnpdebug.o `test -f '../upnp/src/api/upnpdebug.c' || echo '$(srcdir)/'`../upnp/src/api/upnpdebug.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnpdebug.Tpo $(DEPDIR)/libtombupnp_a-upnpdebug.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/api/upnpdebug.c' object='libtombupnp_a-upnpdebug.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnpdebug.o `test -f '../upnp/src/api/upnpdebug.c' || echo '$(srcdir)/'`../upnp/src/api/upnpdebug.c
-+
-+libtombupnp_a-upnpdebug.obj: ../upnp/src/api/upnpdebug.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnpdebug.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnpdebug.Tpo -c -o libtombupnp_a-upnpdebug.obj `if test -f '../upnp/src/api/upnpdebug.c'; then $(CYGPATH_W) '../upnp/src/api/upnpdebug.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/api/upnpdebug.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnpdebug.Tpo $(DEPDIR)/libtombupnp_a-upnpdebug.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/api/upnpdebug.c' object='libtombupnp_a-upnpdebug.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnpdebug.obj `if test -f '../upnp/src/api/upnpdebug.c'; then $(CYGPATH_W) '../upnp/src/api/upnpdebug.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/api/upnpdebug.c'; fi`
-+
-+libtombupnp_a-upnptools.o: ../upnp/src/api/upnptools.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnptools.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnptools.Tpo -c -o libtombupnp_a-upnptools.o `test -f '../upnp/src/api/upnptools.c' || echo '$(srcdir)/'`../upnp/src/api/upnptools.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnptools.Tpo $(DEPDIR)/libtombupnp_a-upnptools.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/api/upnptools.c' object='libtombupnp_a-upnptools.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnptools.o `test -f '../upnp/src/api/upnptools.c' || echo '$(srcdir)/'`../upnp/src/api/upnptools.c
-+
-+libtombupnp_a-upnptools.obj: ../upnp/src/api/upnptools.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnptools.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnptools.Tpo -c -o libtombupnp_a-upnptools.obj `if test -f '../upnp/src/api/upnptools.c'; then $(CYGPATH_W) '../upnp/src/api/upnptools.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/api/upnptools.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnptools.Tpo $(DEPDIR)/libtombupnp_a-upnptools.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/api/upnptools.c' object='libtombupnp_a-upnptools.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnptools.obj `if test -f '../upnp/src/api/upnptools.c'; then $(CYGPATH_W) '../upnp/src/api/upnptools.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/api/upnptools.c'; fi`
-+
-+libtombupnp_a-gena_callback2.o: ../upnp/src/gena/gena_callback2.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-gena_callback2.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-gena_callback2.Tpo -c -o libtombupnp_a-gena_callback2.o `test -f '../upnp/src/gena/gena_callback2.c' || echo '$(srcdir)/'`../upnp/src/gena/gena_callback2.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-gena_callback2.Tpo $(DEPDIR)/libtombupnp_a-gena_callback2.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/gena/gena_callback2.c' object='libtombupnp_a-gena_callback2.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-gena_callback2.o `test -f '../upnp/src/gena/gena_callback2.c' || echo '$(srcdir)/'`../upnp/src/gena/gena_callback2.c
-+
-+libtombupnp_a-gena_callback2.obj: ../upnp/src/gena/gena_callback2.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-gena_callback2.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-gena_callback2.Tpo -c -o libtombupnp_a-gena_callback2.obj `if test -f '../upnp/src/gena/gena_callback2.c'; then $(CYGPATH_W) '../upnp/src/gena/gena_callback2.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/gena/gena_callback2.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-gena_callback2.Tpo $(DEPDIR)/libtombupnp_a-gena_callback2.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/gena/gena_callback2.c' object='libtombupnp_a-gena_callback2.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-gena_callback2.obj `if test -f '../upnp/src/gena/gena_callback2.c'; then $(CYGPATH_W) '../upnp/src/gena/gena_callback2.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/gena/gena_callback2.c'; fi`
-+
-+libtombupnp_a-gena_ctrlpt.o: ../upnp/src/gena/gena_ctrlpt.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-gena_ctrlpt.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-gena_ctrlpt.Tpo -c -o libtombupnp_a-gena_ctrlpt.o `test -f '../upnp/src/gena/gena_ctrlpt.c' || echo '$(srcdir)/'`../upnp/src/gena/gena_ctrlpt.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-gena_ctrlpt.Tpo $(DEPDIR)/libtombupnp_a-gena_ctrlpt.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/gena/gena_ctrlpt.c' object='libtombupnp_a-gena_ctrlpt.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-gena_ctrlpt.o `test -f '../upnp/src/gena/gena_ctrlpt.c' || echo '$(srcdir)/'`../upnp/src/gena/gena_ctrlpt.c
-+
-+libtombupnp_a-gena_ctrlpt.obj: ../upnp/src/gena/gena_ctrlpt.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-gena_ctrlpt.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-gena_ctrlpt.Tpo -c -o libtombupnp_a-gena_ctrlpt.obj `if test -f '../upnp/src/gena/gena_ctrlpt.c'; then $(CYGPATH_W) '../upnp/src/gena/gena_ctrlpt.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/gena/gena_ctrlpt.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-gena_ctrlpt.Tpo $(DEPDIR)/libtombupnp_a-gena_ctrlpt.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/gena/gena_ctrlpt.c' object='libtombupnp_a-gena_ctrlpt.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-gena_ctrlpt.obj `if test -f '../upnp/src/gena/gena_ctrlpt.c'; then $(CYGPATH_W) '../upnp/src/gena/gena_ctrlpt.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/gena/gena_ctrlpt.c'; fi`
-+
-+libtombupnp_a-gena_device.o: ../upnp/src/gena/gena_device.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-gena_device.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-gena_device.Tpo -c -o libtombupnp_a-gena_device.o `test -f '../upnp/src/gena/gena_device.c' || echo '$(srcdir)/'`../upnp/src/gena/gena_device.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-gena_device.Tpo $(DEPDIR)/libtombupnp_a-gena_device.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/gena/gena_device.c' object='libtombupnp_a-gena_device.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-gena_device.o `test -f '../upnp/src/gena/gena_device.c' || echo '$(srcdir)/'`../upnp/src/gena/gena_device.c
-+
-+libtombupnp_a-gena_device.obj: ../upnp/src/gena/gena_device.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-gena_device.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-gena_device.Tpo -c -o libtombupnp_a-gena_device.obj `if test -f '../upnp/src/gena/gena_device.c'; then $(CYGPATH_W) '../upnp/src/gena/gena_device.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/gena/gena_device.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-gena_device.Tpo $(DEPDIR)/libtombupnp_a-gena_device.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/gena/gena_device.c' object='libtombupnp_a-gena_device.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-gena_device.obj `if test -f '../upnp/src/gena/gena_device.c'; then $(CYGPATH_W) '../upnp/src/gena/gena_device.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/gena/gena_device.c'; fi`
-+
-+libtombupnp_a-client_table.o: ../upnp/src/genlib/client_table/client_table.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-client_table.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-client_table.Tpo -c -o libtombupnp_a-client_table.o `test -f '../upnp/src/genlib/client_table/client_table.c' || echo '$(srcdir)/'`../upnp/src/genlib/client_table/client_table.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-client_table.Tpo $(DEPDIR)/libtombupnp_a-client_table.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/client_table/client_table.c' object='libtombupnp_a-client_table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-client_table.o `test -f '../upnp/src/genlib/client_table/client_table.c' || echo '$(srcdir)/'`../upnp/src/genlib/client_table/client_table.c
-+
-+libtombupnp_a-client_table.obj: ../upnp/src/genlib/client_table/client_table.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-client_table.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-client_table.Tpo -c -o libtombupnp_a-client_table.obj `if test -f '../upnp/src/genlib/client_table/client_table.c'; then $(CYGPATH_W) '../upnp/src/genlib/client_table/client_table.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/client_table/client_table.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-client_table.Tpo $(DEPDIR)/libtombupnp_a-client_table.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/client_table/client_table.c' object='libtombupnp_a-client_table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-client_table.obj `if test -f '../upnp/src/genlib/client_table/client_table.c'; then $(CYGPATH_W) '../upnp/src/genlib/client_table/client_table.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/client_table/client_table.c'; fi`
-+
-+libtombupnp_a-miniserver.o: ../upnp/src/genlib/miniserver/miniserver.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-miniserver.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-miniserver.Tpo -c -o libtombupnp_a-miniserver.o `test -f '../upnp/src/genlib/miniserver/miniserver.c' || echo '$(srcdir)/'`../upnp/src/genlib/miniserver/miniserver.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-miniserver.Tpo $(DEPDIR)/libtombupnp_a-miniserver.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/miniserver/miniserver.c' object='libtombupnp_a-miniserver.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-miniserver.o `test -f '../upnp/src/genlib/miniserver/miniserver.c' || echo '$(srcdir)/'`../upnp/src/genlib/miniserver/miniserver.c
-+
-+libtombupnp_a-miniserver.obj: ../upnp/src/genlib/miniserver/miniserver.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-miniserver.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-miniserver.Tpo -c -o libtombupnp_a-miniserver.obj `if test -f '../upnp/src/genlib/miniserver/miniserver.c'; then $(CYGPATH_W) '../upnp/src/genlib/miniserver/miniserver.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/miniserver/miniserver.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-miniserver.Tpo $(DEPDIR)/libtombupnp_a-miniserver.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/miniserver/miniserver.c' object='libtombupnp_a-miniserver.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-miniserver.obj `if test -f '../upnp/src/genlib/miniserver/miniserver.c'; then $(CYGPATH_W) '../upnp/src/genlib/miniserver/miniserver.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/miniserver/miniserver.c'; fi`
-+
-+libtombupnp_a-httpparser.o: ../upnp/src/genlib/net/http/httpparser.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-httpparser.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-httpparser.Tpo -c -o libtombupnp_a-httpparser.o `test -f '../upnp/src/genlib/net/http/httpparser.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/http/httpparser.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-httpparser.Tpo $(DEPDIR)/libtombupnp_a-httpparser.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/http/httpparser.c' object='libtombupnp_a-httpparser.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-httpparser.o `test -f '../upnp/src/genlib/net/http/httpparser.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/http/httpparser.c
-+
-+libtombupnp_a-httpparser.obj: ../upnp/src/genlib/net/http/httpparser.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-httpparser.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-httpparser.Tpo -c -o libtombupnp_a-httpparser.obj `if test -f '../upnp/src/genlib/net/http/httpparser.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/http/httpparser.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/http/httpparser.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-httpparser.Tpo $(DEPDIR)/libtombupnp_a-httpparser.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/http/httpparser.c' object='libtombupnp_a-httpparser.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-httpparser.obj `if test -f '../upnp/src/genlib/net/http/httpparser.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/http/httpparser.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/http/httpparser.c'; fi`
-+
-+libtombupnp_a-httpreadwrite.o: ../upnp/src/genlib/net/http/httpreadwrite.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-httpreadwrite.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-httpreadwrite.Tpo -c -o libtombupnp_a-httpreadwrite.o `test -f '../upnp/src/genlib/net/http/httpreadwrite.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/http/httpreadwrite.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-httpreadwrite.Tpo $(DEPDIR)/libtombupnp_a-httpreadwrite.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/http/httpreadwrite.c' object='libtombupnp_a-httpreadwrite.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-httpreadwrite.o `test -f '../upnp/src/genlib/net/http/httpreadwrite.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/http/httpreadwrite.c
-+
-+libtombupnp_a-httpreadwrite.obj: ../upnp/src/genlib/net/http/httpreadwrite.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-httpreadwrite.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-httpreadwrite.Tpo -c -o libtombupnp_a-httpreadwrite.obj `if test -f '../upnp/src/genlib/net/http/httpreadwrite.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/http/httpreadwrite.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/http/httpreadwrite.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-httpreadwrite.Tpo $(DEPDIR)/libtombupnp_a-httpreadwrite.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/http/httpreadwrite.c' object='libtombupnp_a-httpreadwrite.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-httpreadwrite.obj `if test -f '../upnp/src/genlib/net/http/httpreadwrite.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/http/httpreadwrite.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/http/httpreadwrite.c'; fi`
-+
-+libtombupnp_a-parsetools.o: ../upnp/src/genlib/net/http/parsetools.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-parsetools.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-parsetools.Tpo -c -o libtombupnp_a-parsetools.o `test -f '../upnp/src/genlib/net/http/parsetools.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/http/parsetools.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-parsetools.Tpo $(DEPDIR)/libtombupnp_a-parsetools.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/http/parsetools.c' object='libtombupnp_a-parsetools.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-parsetools.o `test -f '../upnp/src/genlib/net/http/parsetools.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/http/parsetools.c
-+
-+libtombupnp_a-parsetools.obj: ../upnp/src/genlib/net/http/parsetools.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-parsetools.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-parsetools.Tpo -c -o libtombupnp_a-parsetools.obj `if test -f '../upnp/src/genlib/net/http/parsetools.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/http/parsetools.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/http/parsetools.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-parsetools.Tpo $(DEPDIR)/libtombupnp_a-parsetools.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/http/parsetools.c' object='libtombupnp_a-parsetools.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-parsetools.obj `if test -f '../upnp/src/genlib/net/http/parsetools.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/http/parsetools.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/http/parsetools.c'; fi`
-+
-+libtombupnp_a-statcodes.o: ../upnp/src/genlib/net/http/statcodes.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-statcodes.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-statcodes.Tpo -c -o libtombupnp_a-statcodes.o `test -f '../upnp/src/genlib/net/http/statcodes.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/http/statcodes.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-statcodes.Tpo $(DEPDIR)/libtombupnp_a-statcodes.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/http/statcodes.c' object='libtombupnp_a-statcodes.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-statcodes.o `test -f '../upnp/src/genlib/net/http/statcodes.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/http/statcodes.c
-+
-+libtombupnp_a-statcodes.obj: ../upnp/src/genlib/net/http/statcodes.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-statcodes.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-statcodes.Tpo -c -o libtombupnp_a-statcodes.obj `if test -f '../upnp/src/genlib/net/http/statcodes.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/http/statcodes.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/http/statcodes.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-statcodes.Tpo $(DEPDIR)/libtombupnp_a-statcodes.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/http/statcodes.c' object='libtombupnp_a-statcodes.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-statcodes.obj `if test -f '../upnp/src/genlib/net/http/statcodes.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/http/statcodes.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/http/statcodes.c'; fi`
-+
-+libtombupnp_a-webserver.o: ../upnp/src/genlib/net/http/webserver.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-webserver.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-webserver.Tpo -c -o libtombupnp_a-webserver.o `test -f '../upnp/src/genlib/net/http/webserver.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/http/webserver.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-webserver.Tpo $(DEPDIR)/libtombupnp_a-webserver.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/http/webserver.c' object='libtombupnp_a-webserver.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-webserver.o `test -f '../upnp/src/genlib/net/http/webserver.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/http/webserver.c
-+
-+libtombupnp_a-webserver.obj: ../upnp/src/genlib/net/http/webserver.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-webserver.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-webserver.Tpo -c -o libtombupnp_a-webserver.obj `if test -f '../upnp/src/genlib/net/http/webserver.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/http/webserver.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/http/webserver.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-webserver.Tpo $(DEPDIR)/libtombupnp_a-webserver.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/http/webserver.c' object='libtombupnp_a-webserver.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-webserver.obj `if test -f '../upnp/src/genlib/net/http/webserver.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/http/webserver.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/http/webserver.c'; fi`
-+
-+libtombupnp_a-sock.o: ../upnp/src/genlib/net/sock.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-sock.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-sock.Tpo -c -o libtombupnp_a-sock.o `test -f '../upnp/src/genlib/net/sock.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/sock.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-sock.Tpo $(DEPDIR)/libtombupnp_a-sock.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/sock.c' object='libtombupnp_a-sock.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-sock.o `test -f '../upnp/src/genlib/net/sock.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/sock.c
-+
-+libtombupnp_a-sock.obj: ../upnp/src/genlib/net/sock.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-sock.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-sock.Tpo -c -o libtombupnp_a-sock.obj `if test -f '../upnp/src/genlib/net/sock.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/sock.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/sock.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-sock.Tpo $(DEPDIR)/libtombupnp_a-sock.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/sock.c' object='libtombupnp_a-sock.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-sock.obj `if test -f '../upnp/src/genlib/net/sock.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/sock.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/sock.c'; fi`
-+
-+libtombupnp_a-uri.o: ../upnp/src/genlib/net/uri/uri.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-uri.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-uri.Tpo -c -o libtombupnp_a-uri.o `test -f '../upnp/src/genlib/net/uri/uri.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/uri/uri.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-uri.Tpo $(DEPDIR)/libtombupnp_a-uri.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/uri/uri.c' object='libtombupnp_a-uri.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-uri.o `test -f '../upnp/src/genlib/net/uri/uri.c' || echo '$(srcdir)/'`../upnp/src/genlib/net/uri/uri.c
-+
-+libtombupnp_a-uri.obj: ../upnp/src/genlib/net/uri/uri.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-uri.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-uri.Tpo -c -o libtombupnp_a-uri.obj `if test -f '../upnp/src/genlib/net/uri/uri.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/uri/uri.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/uri/uri.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-uri.Tpo $(DEPDIR)/libtombupnp_a-uri.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/net/uri/uri.c' object='libtombupnp_a-uri.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-uri.obj `if test -f '../upnp/src/genlib/net/uri/uri.c'; then $(CYGPATH_W) '../upnp/src/genlib/net/uri/uri.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/net/uri/uri.c'; fi`
-+
-+libtombupnp_a-service_table.o: ../upnp/src/genlib/service_table/service_table.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-service_table.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-service_table.Tpo -c -o libtombupnp_a-service_table.o `test -f '../upnp/src/genlib/service_table/service_table.c' || echo '$(srcdir)/'`../upnp/src/genlib/service_table/service_table.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-service_table.Tpo $(DEPDIR)/libtombupnp_a-service_table.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/service_table/service_table.c' object='libtombupnp_a-service_table.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-service_table.o `test -f '../upnp/src/genlib/service_table/service_table.c' || echo '$(srcdir)/'`../upnp/src/genlib/service_table/service_table.c
-+
-+libtombupnp_a-service_table.obj: ../upnp/src/genlib/service_table/service_table.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-service_table.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-service_table.Tpo -c -o libtombupnp_a-service_table.obj `if test -f '../upnp/src/genlib/service_table/service_table.c'; then $(CYGPATH_W) '../upnp/src/genlib/service_table/service_table.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/service_table/service_table.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-service_table.Tpo $(DEPDIR)/libtombupnp_a-service_table.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/service_table/service_table.c' object='libtombupnp_a-service_table.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-service_table.obj `if test -f '../upnp/src/genlib/service_table/service_table.c'; then $(CYGPATH_W) '../upnp/src/genlib/service_table/service_table.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/service_table/service_table.c'; fi`
-+
-+libtombupnp_a-membuffer.o: ../upnp/src/genlib/util/membuffer.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-membuffer.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-membuffer.Tpo -c -o libtombupnp_a-membuffer.o `test -f '../upnp/src/genlib/util/membuffer.c' || echo '$(srcdir)/'`../upnp/src/genlib/util/membuffer.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-membuffer.Tpo $(DEPDIR)/libtombupnp_a-membuffer.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/util/membuffer.c' object='libtombupnp_a-membuffer.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-membuffer.o `test -f '../upnp/src/genlib/util/membuffer.c' || echo '$(srcdir)/'`../upnp/src/genlib/util/membuffer.c
-+
-+libtombupnp_a-membuffer.obj: ../upnp/src/genlib/util/membuffer.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-membuffer.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-membuffer.Tpo -c -o libtombupnp_a-membuffer.obj `if test -f '../upnp/src/genlib/util/membuffer.c'; then $(CYGPATH_W) '../upnp/src/genlib/util/membuffer.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/util/membuffer.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-membuffer.Tpo $(DEPDIR)/libtombupnp_a-membuffer.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/util/membuffer.c' object='libtombupnp_a-membuffer.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-membuffer.obj `if test -f '../upnp/src/genlib/util/membuffer.c'; then $(CYGPATH_W) '../upnp/src/genlib/util/membuffer.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/util/membuffer.c'; fi`
-+
-+libtombupnp_a-strintmap.o: ../upnp/src/genlib/util/strintmap.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-strintmap.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-strintmap.Tpo -c -o libtombupnp_a-strintmap.o `test -f '../upnp/src/genlib/util/strintmap.c' || echo '$(srcdir)/'`../upnp/src/genlib/util/strintmap.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-strintmap.Tpo $(DEPDIR)/libtombupnp_a-strintmap.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/util/strintmap.c' object='libtombupnp_a-strintmap.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-strintmap.o `test -f '../upnp/src/genlib/util/strintmap.c' || echo '$(srcdir)/'`../upnp/src/genlib/util/strintmap.c
-+
-+libtombupnp_a-strintmap.obj: ../upnp/src/genlib/util/strintmap.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-strintmap.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-strintmap.Tpo -c -o libtombupnp_a-strintmap.obj `if test -f '../upnp/src/genlib/util/strintmap.c'; then $(CYGPATH_W) '../upnp/src/genlib/util/strintmap.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/util/strintmap.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-strintmap.Tpo $(DEPDIR)/libtombupnp_a-strintmap.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/util/strintmap.c' object='libtombupnp_a-strintmap.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-strintmap.obj `if test -f '../upnp/src/genlib/util/strintmap.c'; then $(CYGPATH_W) '../upnp/src/genlib/util/strintmap.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/util/strintmap.c'; fi`
-+
-+libtombupnp_a-strtoofft.o: ../upnp/src/genlib/util/strtoofft.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-strtoofft.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-strtoofft.Tpo -c -o libtombupnp_a-strtoofft.o `test -f '../upnp/src/genlib/util/strtoofft.c' || echo '$(srcdir)/'`../upnp/src/genlib/util/strtoofft.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-strtoofft.Tpo $(DEPDIR)/libtombupnp_a-strtoofft.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/util/strtoofft.c' object='libtombupnp_a-strtoofft.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-strtoofft.o `test -f '../upnp/src/genlib/util/strtoofft.c' || echo '$(srcdir)/'`../upnp/src/genlib/util/strtoofft.c
-+
-+libtombupnp_a-strtoofft.obj: ../upnp/src/genlib/util/strtoofft.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-strtoofft.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-strtoofft.Tpo -c -o libtombupnp_a-strtoofft.obj `if test -f '../upnp/src/genlib/util/strtoofft.c'; then $(CYGPATH_W) '../upnp/src/genlib/util/strtoofft.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/util/strtoofft.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-strtoofft.Tpo $(DEPDIR)/libtombupnp_a-strtoofft.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/util/strtoofft.c' object='libtombupnp_a-strtoofft.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-strtoofft.obj `if test -f '../upnp/src/genlib/util/strtoofft.c'; then $(CYGPATH_W) '../upnp/src/genlib/util/strtoofft.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/util/strtoofft.c'; fi`
-+
-+libtombupnp_a-upnp_timeout.o: ../upnp/src/genlib/util/upnp_timeout.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnp_timeout.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnp_timeout.Tpo -c -o libtombupnp_a-upnp_timeout.o `test -f '../upnp/src/genlib/util/upnp_timeout.c' || echo '$(srcdir)/'`../upnp/src/genlib/util/upnp_timeout.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnp_timeout.Tpo $(DEPDIR)/libtombupnp_a-upnp_timeout.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/util/upnp_timeout.c' object='libtombupnp_a-upnp_timeout.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnp_timeout.o `test -f '../upnp/src/genlib/util/upnp_timeout.c' || echo '$(srcdir)/'`../upnp/src/genlib/util/upnp_timeout.c
-+
-+libtombupnp_a-upnp_timeout.obj: ../upnp/src/genlib/util/upnp_timeout.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnp_timeout.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnp_timeout.Tpo -c -o libtombupnp_a-upnp_timeout.obj `if test -f '../upnp/src/genlib/util/upnp_timeout.c'; then $(CYGPATH_W) '../upnp/src/genlib/util/upnp_timeout.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/util/upnp_timeout.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnp_timeout.Tpo $(DEPDIR)/libtombupnp_a-upnp_timeout.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/util/upnp_timeout.c' object='libtombupnp_a-upnp_timeout.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnp_timeout.obj `if test -f '../upnp/src/genlib/util/upnp_timeout.c'; then $(CYGPATH_W) '../upnp/src/genlib/util/upnp_timeout.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/util/upnp_timeout.c'; fi`
-+
-+libtombupnp_a-util.o: ../upnp/src/genlib/util/util.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-util.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-util.Tpo -c -o libtombupnp_a-util.o `test -f '../upnp/src/genlib/util/util.c' || echo '$(srcdir)/'`../upnp/src/genlib/util/util.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-util.Tpo $(DEPDIR)/libtombupnp_a-util.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/util/util.c' object='libtombupnp_a-util.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-util.o `test -f '../upnp/src/genlib/util/util.c' || echo '$(srcdir)/'`../upnp/src/genlib/util/util.c
-+
-+libtombupnp_a-util.obj: ../upnp/src/genlib/util/util.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-util.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-util.Tpo -c -o libtombupnp_a-util.obj `if test -f '../upnp/src/genlib/util/util.c'; then $(CYGPATH_W) '../upnp/src/genlib/util/util.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/util/util.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-util.Tpo $(DEPDIR)/libtombupnp_a-util.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/genlib/util/util.c' object='libtombupnp_a-util.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-util.obj `if test -f '../upnp/src/genlib/util/util.c'; then $(CYGPATH_W) '../upnp/src/genlib/util/util.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/genlib/util/util.c'; fi`
-+
-+libtombupnp_a-inet_pton.o: ../upnp/src/inet_pton.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-inet_pton.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-inet_pton.Tpo -c -o libtombupnp_a-inet_pton.o `test -f '../upnp/src/inet_pton.c' || echo '$(srcdir)/'`../upnp/src/inet_pton.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-inet_pton.Tpo $(DEPDIR)/libtombupnp_a-inet_pton.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/inet_pton.c' object='libtombupnp_a-inet_pton.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-inet_pton.o `test -f '../upnp/src/inet_pton.c' || echo '$(srcdir)/'`../upnp/src/inet_pton.c
-+
-+libtombupnp_a-inet_pton.obj: ../upnp/src/inet_pton.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-inet_pton.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-inet_pton.Tpo -c -o libtombupnp_a-inet_pton.obj `if test -f '../upnp/src/inet_pton.c'; then $(CYGPATH_W) '../upnp/src/inet_pton.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/inet_pton.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-inet_pton.Tpo $(DEPDIR)/libtombupnp_a-inet_pton.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/inet_pton.c' object='libtombupnp_a-inet_pton.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-inet_pton.obj `if test -f '../upnp/src/inet_pton.c'; then $(CYGPATH_W) '../upnp/src/inet_pton.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/inet_pton.c'; fi`
-+
-+libtombupnp_a-soap_common.o: ../upnp/src/soap/soap_common.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-soap_common.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-soap_common.Tpo -c -o libtombupnp_a-soap_common.o `test -f '../upnp/src/soap/soap_common.c' || echo '$(srcdir)/'`../upnp/src/soap/soap_common.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-soap_common.Tpo $(DEPDIR)/libtombupnp_a-soap_common.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/soap/soap_common.c' object='libtombupnp_a-soap_common.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-soap_common.o `test -f '../upnp/src/soap/soap_common.c' || echo '$(srcdir)/'`../upnp/src/soap/soap_common.c
-+
-+libtombupnp_a-soap_common.obj: ../upnp/src/soap/soap_common.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-soap_common.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-soap_common.Tpo -c -o libtombupnp_a-soap_common.obj `if test -f '../upnp/src/soap/soap_common.c'; then $(CYGPATH_W) '../upnp/src/soap/soap_common.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/soap/soap_common.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-soap_common.Tpo $(DEPDIR)/libtombupnp_a-soap_common.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/soap/soap_common.c' object='libtombupnp_a-soap_common.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-soap_common.obj `if test -f '../upnp/src/soap/soap_common.c'; then $(CYGPATH_W) '../upnp/src/soap/soap_common.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/soap/soap_common.c'; fi`
-+
-+libtombupnp_a-soap_ctrlpt.o: ../upnp/src/soap/soap_ctrlpt.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-soap_ctrlpt.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-soap_ctrlpt.Tpo -c -o libtombupnp_a-soap_ctrlpt.o `test -f '../upnp/src/soap/soap_ctrlpt.c' || echo '$(srcdir)/'`../upnp/src/soap/soap_ctrlpt.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-soap_ctrlpt.Tpo $(DEPDIR)/libtombupnp_a-soap_ctrlpt.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/soap/soap_ctrlpt.c' object='libtombupnp_a-soap_ctrlpt.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-soap_ctrlpt.o `test -f '../upnp/src/soap/soap_ctrlpt.c' || echo '$(srcdir)/'`../upnp/src/soap/soap_ctrlpt.c
-+
-+libtombupnp_a-soap_ctrlpt.obj: ../upnp/src/soap/soap_ctrlpt.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-soap_ctrlpt.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-soap_ctrlpt.Tpo -c -o libtombupnp_a-soap_ctrlpt.obj `if test -f '../upnp/src/soap/soap_ctrlpt.c'; then $(CYGPATH_W) '../upnp/src/soap/soap_ctrlpt.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/soap/soap_ctrlpt.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-soap_ctrlpt.Tpo $(DEPDIR)/libtombupnp_a-soap_ctrlpt.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/soap/soap_ctrlpt.c' object='libtombupnp_a-soap_ctrlpt.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-soap_ctrlpt.obj `if test -f '../upnp/src/soap/soap_ctrlpt.c'; then $(CYGPATH_W) '../upnp/src/soap/soap_ctrlpt.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/soap/soap_ctrlpt.c'; fi`
-+
-+libtombupnp_a-soap_device.o: ../upnp/src/soap/soap_device.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-soap_device.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-soap_device.Tpo -c -o libtombupnp_a-soap_device.o `test -f '../upnp/src/soap/soap_device.c' || echo '$(srcdir)/'`../upnp/src/soap/soap_device.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-soap_device.Tpo $(DEPDIR)/libtombupnp_a-soap_device.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/soap/soap_device.c' object='libtombupnp_a-soap_device.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-soap_device.o `test -f '../upnp/src/soap/soap_device.c' || echo '$(srcdir)/'`../upnp/src/soap/soap_device.c
-+
-+libtombupnp_a-soap_device.obj: ../upnp/src/soap/soap_device.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-soap_device.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-soap_device.Tpo -c -o libtombupnp_a-soap_device.obj `if test -f '../upnp/src/soap/soap_device.c'; then $(CYGPATH_W) '../upnp/src/soap/soap_device.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/soap/soap_device.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-soap_device.Tpo $(DEPDIR)/libtombupnp_a-soap_device.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/soap/soap_device.c' object='libtombupnp_a-soap_device.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-soap_device.obj `if test -f '../upnp/src/soap/soap_device.c'; then $(CYGPATH_W) '../upnp/src/soap/soap_device.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/soap/soap_device.c'; fi`
-+
-+libtombupnp_a-ssdp_ctrlpt.o: ../upnp/src/ssdp/ssdp_ctrlpt.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ssdp_ctrlpt.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-ssdp_ctrlpt.Tpo -c -o libtombupnp_a-ssdp_ctrlpt.o `test -f '../upnp/src/ssdp/ssdp_ctrlpt.c' || echo '$(srcdir)/'`../upnp/src/ssdp/ssdp_ctrlpt.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ssdp_ctrlpt.Tpo $(DEPDIR)/libtombupnp_a-ssdp_ctrlpt.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/ssdp/ssdp_ctrlpt.c' object='libtombupnp_a-ssdp_ctrlpt.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ssdp_ctrlpt.o `test -f '../upnp/src/ssdp/ssdp_ctrlpt.c' || echo '$(srcdir)/'`../upnp/src/ssdp/ssdp_ctrlpt.c
-+
-+libtombupnp_a-ssdp_ctrlpt.obj: ../upnp/src/ssdp/ssdp_ctrlpt.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ssdp_ctrlpt.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-ssdp_ctrlpt.Tpo -c -o libtombupnp_a-ssdp_ctrlpt.obj `if test -f '../upnp/src/ssdp/ssdp_ctrlpt.c'; then $(CYGPATH_W) '../upnp/src/ssdp/ssdp_ctrlpt.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/ssdp/ssdp_ctrlpt.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ssdp_ctrlpt.Tpo $(DEPDIR)/libtombupnp_a-ssdp_ctrlpt.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/ssdp/ssdp_ctrlpt.c' object='libtombupnp_a-ssdp_ctrlpt.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ssdp_ctrlpt.obj `if test -f '../upnp/src/ssdp/ssdp_ctrlpt.c'; then $(CYGPATH_W) '../upnp/src/ssdp/ssdp_ctrlpt.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/ssdp/ssdp_ctrlpt.c'; fi`
-+
-+libtombupnp_a-ssdp_device.o: ../upnp/src/ssdp/ssdp_device.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ssdp_device.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-ssdp_device.Tpo -c -o libtombupnp_a-ssdp_device.o `test -f '../upnp/src/ssdp/ssdp_device.c' || echo '$(srcdir)/'`../upnp/src/ssdp/ssdp_device.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ssdp_device.Tpo $(DEPDIR)/libtombupnp_a-ssdp_device.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/ssdp/ssdp_device.c' object='libtombupnp_a-ssdp_device.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ssdp_device.o `test -f '../upnp/src/ssdp/ssdp_device.c' || echo '$(srcdir)/'`../upnp/src/ssdp/ssdp_device.c
-+
-+libtombupnp_a-ssdp_device.obj: ../upnp/src/ssdp/ssdp_device.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ssdp_device.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-ssdp_device.Tpo -c -o libtombupnp_a-ssdp_device.obj `if test -f '../upnp/src/ssdp/ssdp_device.c'; then $(CYGPATH_W) '../upnp/src/ssdp/ssdp_device.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/ssdp/ssdp_device.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ssdp_device.Tpo $(DEPDIR)/libtombupnp_a-ssdp_device.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/ssdp/ssdp_device.c' object='libtombupnp_a-ssdp_device.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ssdp_device.obj `if test -f '../upnp/src/ssdp/ssdp_device.c'; then $(CYGPATH_W) '../upnp/src/ssdp/ssdp_device.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/ssdp/ssdp_device.c'; fi`
-+
-+libtombupnp_a-ssdp_server.o: ../upnp/src/ssdp/ssdp_server.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ssdp_server.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-ssdp_server.Tpo -c -o libtombupnp_a-ssdp_server.o `test -f '../upnp/src/ssdp/ssdp_server.c' || echo '$(srcdir)/'`../upnp/src/ssdp/ssdp_server.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ssdp_server.Tpo $(DEPDIR)/libtombupnp_a-ssdp_server.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/ssdp/ssdp_server.c' object='libtombupnp_a-ssdp_server.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ssdp_server.o `test -f '../upnp/src/ssdp/ssdp_server.c' || echo '$(srcdir)/'`../upnp/src/ssdp/ssdp_server.c
-+
-+libtombupnp_a-ssdp_server.obj: ../upnp/src/ssdp/ssdp_server.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-ssdp_server.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-ssdp_server.Tpo -c -o libtombupnp_a-ssdp_server.obj `if test -f '../upnp/src/ssdp/ssdp_server.c'; then $(CYGPATH_W) '../upnp/src/ssdp/ssdp_server.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/ssdp/ssdp_server.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-ssdp_server.Tpo $(DEPDIR)/libtombupnp_a-ssdp_server.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/ssdp/ssdp_server.c' object='libtombupnp_a-ssdp_server.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-ssdp_server.obj `if test -f '../upnp/src/ssdp/ssdp_server.c'; then $(CYGPATH_W) '../upnp/src/ssdp/ssdp_server.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/ssdp/ssdp_server.c'; fi`
-+
-+libtombupnp_a-urlconfig.o: ../upnp/src/urlconfig/urlconfig.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-urlconfig.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-urlconfig.Tpo -c -o libtombupnp_a-urlconfig.o `test -f '../upnp/src/urlconfig/urlconfig.c' || echo '$(srcdir)/'`../upnp/src/urlconfig/urlconfig.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-urlconfig.Tpo $(DEPDIR)/libtombupnp_a-urlconfig.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/urlconfig/urlconfig.c' object='libtombupnp_a-urlconfig.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-urlconfig.o `test -f '../upnp/src/urlconfig/urlconfig.c' || echo '$(srcdir)/'`../upnp/src/urlconfig/urlconfig.c
-+
-+libtombupnp_a-urlconfig.obj: ../upnp/src/urlconfig/urlconfig.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-urlconfig.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-urlconfig.Tpo -c -o libtombupnp_a-urlconfig.obj `if test -f '../upnp/src/urlconfig/urlconfig.c'; then $(CYGPATH_W) '../upnp/src/urlconfig/urlconfig.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/urlconfig/urlconfig.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-urlconfig.Tpo $(DEPDIR)/libtombupnp_a-urlconfig.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/urlconfig/urlconfig.c' object='libtombupnp_a-urlconfig.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-urlconfig.obj `if test -f '../upnp/src/urlconfig/urlconfig.c'; then $(CYGPATH_W) '../upnp/src/urlconfig/urlconfig.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/urlconfig/urlconfig.c'; fi`
-+
-+libtombupnp_a-sysdep.o: ../upnp/src/uuid/sysdep.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-sysdep.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-sysdep.Tpo -c -o libtombupnp_a-sysdep.o `test -f '../upnp/src/uuid/sysdep.c' || echo '$(srcdir)/'`../upnp/src/uuid/sysdep.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-sysdep.Tpo $(DEPDIR)/libtombupnp_a-sysdep.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/uuid/sysdep.c' object='libtombupnp_a-sysdep.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-sysdep.o `test -f '../upnp/src/uuid/sysdep.c' || echo '$(srcdir)/'`../upnp/src/uuid/sysdep.c
-+
-+libtombupnp_a-sysdep.obj: ../upnp/src/uuid/sysdep.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-sysdep.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-sysdep.Tpo -c -o libtombupnp_a-sysdep.obj `if test -f '../upnp/src/uuid/sysdep.c'; then $(CYGPATH_W) '../upnp/src/uuid/sysdep.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/uuid/sysdep.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-sysdep.Tpo $(DEPDIR)/libtombupnp_a-sysdep.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/uuid/sysdep.c' object='libtombupnp_a-sysdep.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-sysdep.obj `if test -f '../upnp/src/uuid/sysdep.c'; then $(CYGPATH_W) '../upnp/src/uuid/sysdep.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/uuid/sysdep.c'; fi`
-+
-+libtombupnp_a-upnp_md5.o: ../upnp/src/uuid/upnp_md5.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnp_md5.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnp_md5.Tpo -c -o libtombupnp_a-upnp_md5.o `test -f '../upnp/src/uuid/upnp_md5.c' || echo '$(srcdir)/'`../upnp/src/uuid/upnp_md5.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnp_md5.Tpo $(DEPDIR)/libtombupnp_a-upnp_md5.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/uuid/upnp_md5.c' object='libtombupnp_a-upnp_md5.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnp_md5.o `test -f '../upnp/src/uuid/upnp_md5.c' || echo '$(srcdir)/'`../upnp/src/uuid/upnp_md5.c
-+
-+libtombupnp_a-upnp_md5.obj: ../upnp/src/uuid/upnp_md5.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnp_md5.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnp_md5.Tpo -c -o libtombupnp_a-upnp_md5.obj `if test -f '../upnp/src/uuid/upnp_md5.c'; then $(CYGPATH_W) '../upnp/src/uuid/upnp_md5.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/uuid/upnp_md5.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnp_md5.Tpo $(DEPDIR)/libtombupnp_a-upnp_md5.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/uuid/upnp_md5.c' object='libtombupnp_a-upnp_md5.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnp_md5.obj `if test -f '../upnp/src/uuid/upnp_md5.c'; then $(CYGPATH_W) '../upnp/src/uuid/upnp_md5.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/uuid/upnp_md5.c'; fi`
-+
-+libtombupnp_a-upnp_uuid.o: ../upnp/src/uuid/upnp_uuid.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnp_uuid.o -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnp_uuid.Tpo -c -o libtombupnp_a-upnp_uuid.o `test -f '../upnp/src/uuid/upnp_uuid.c' || echo '$(srcdir)/'`../upnp/src/uuid/upnp_uuid.c
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnp_uuid.Tpo $(DEPDIR)/libtombupnp_a-upnp_uuid.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/uuid/upnp_uuid.c' object='libtombupnp_a-upnp_uuid.o' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnp_uuid.o `test -f '../upnp/src/uuid/upnp_uuid.c' || echo '$(srcdir)/'`../upnp/src/uuid/upnp_uuid.c
-+
-+libtombupnp_a-upnp_uuid.obj: ../upnp/src/uuid/upnp_uuid.c
-+ at am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -MT libtombupnp_a-upnp_uuid.obj -MD -MP -MF $(DEPDIR)/libtombupnp_a-upnp_uuid.Tpo -c -o libtombupnp_a-upnp_uuid.obj `if test -f '../upnp/src/uuid/upnp_uuid.c'; then $(CYGPATH_W) '../upnp/src/uuid/upnp_uuid.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/uuid/upnp_uuid.c'; fi`
-+ at am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libtombupnp_a-upnp_uuid.Tpo $(DEPDIR)/libtombupnp_a-upnp_uuid.Po
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	source='../upnp/src/uuid/upnp_uuid.c' object='libtombupnp_a-upnp_uuid.obj' libtool=no @AMDEPBACKSLASH@
-+ at AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-+ at am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libtombupnp_a_CFLAGS) $(CFLAGS) -c -o libtombupnp_a-upnp_uuid.obj `if test -f '../upnp/src/uuid/upnp_uuid.c'; then $(CYGPATH_W) '../upnp/src/uuid/upnp_uuid.c'; else $(CYGPATH_W) '$(srcdir)/../upnp/src/uuid/upnp_uuid.c'; fi`
-+
-+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	mkid -fID $$unique
-+tags: TAGS
-+
-+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	set x; \
-+	here=`pwd`; \
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	shift; \
-+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  if test $$# -gt 0; then \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      "$$@" $$unique; \
-+	  else \
-+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	      $$unique; \
-+	  fi; \
-+	fi
-+ctags: CTAGS
-+CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-+		$(TAGS_FILES) $(LISP)
-+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-+	unique=`for i in $$list; do \
-+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-+	  done | \
-+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-+	test -z "$(CTAGS_ARGS)$$unique" \
-+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-+	     $$unique
-+
-+GTAGS:
-+	here=`$(am__cd) $(top_builddir) && pwd` \
-+	  && $(am__cd) $(top_srcdir) \
-+	  && gtags -i $(GTAGS_ARGS) "$$here"
-+
-+distclean-tags:
-+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(LIBRARIES)
-+installdirs:
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-compile distclean-generic \
-+	distclean-tags
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am:
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -rf ./$(DEPDIR)
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-compile mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-+	clean-noinstLIBRARIES ctags distclean distclean-compile \
-+	distclean-generic distclean-tags distdir dvi dvi-am html \
-+	html-am info info-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 maintainer-clean \
-+	maintainer-clean-generic mostlyclean mostlyclean-compile \
-+	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-+	uninstall-am
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
---- /dev/null
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POW_LIB = @POW_LIB@
+diff --git a/web/Makefile.in b/web/Makefile.in
+index 1a67b17..b9ed01b 100644
+--- a/web/Makefile.in
 +++ b/web/Makefile.in
-@@ -0,0 +1,699 @@
-+# Makefile.in generated by automake 1.11.1 from Makefile.am.
-+# @configure_input@
-+
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-+# Inc.
-+# This Makefile.in is free software; the Free Software Foundation
-+# gives unlimited permission to copy and/or distribute it,
-+# with or without modifications, as long as this notice is preserved.
-+
-+# This program is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-+# PARTICULAR PURPOSE.
-+
-+ at SET_MAKE@
-+
-+VPATH = @srcdir@
-+pkgdatadir = $(datadir)/@PACKAGE@
-+pkgincludedir = $(includedir)/@PACKAGE@
-+pkglibdir = $(libdir)/@PACKAGE@
-+pkglibexecdir = $(libexecdir)/@PACKAGE@
-+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-+install_sh_DATA = $(install_sh) -c -m 644
-+install_sh_PROGRAM = $(install_sh) -c
-+install_sh_SCRIPT = $(install_sh) -c
-+INSTALL_HEADER = $(INSTALL_DATA)
-+transform = $(program_transform_name)
-+NORMAL_INSTALL = :
-+PRE_INSTALL = :
-+POST_INSTALL = :
-+NORMAL_UNINSTALL = :
-+PRE_UNINSTALL = :
-+POST_UNINSTALL = :
-+build_triplet = @build@
-+host_triplet = @host@
-+subdir = web
-+DIST_COMMON = $(dist_icons_DATA) $(dist_images_DATA) $(dist_js_DATA) \
-+	$(dist_web_DATA) $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.ac
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(install_sh) -d
-+CONFIG_HEADER = $(top_builddir)/autoconfig.h \
-+	$(top_builddir)/tombupnp/upnp/inc/upnpconfig.h
-+CONFIG_CLEAN_FILES =
-+CONFIG_CLEAN_VPATH_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+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'
-+am__installdirs = "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(imagesdir)" \
-+	"$(DESTDIR)$(jsdir)" "$(DESTDIR)$(webdir)"
-+DATA = $(dist_icons_DATA) $(dist_images_DATA) $(dist_js_DATA) \
-+	$(dist_web_DATA)
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+ACLOCAL = @ACLOCAL@
-+ALLOCA = @ALLOCA@
-+AMTAR = @AMTAR@
-+ATOMIC_OPTION_ENABLED = @ATOMIC_OPTION_ENABLED@
-+ATOMIC_OPTION_REQUESTED = @ATOMIC_OPTION_REQUESTED@
-+ATOMIC_X86_SINGLE_OPTION_ENABLED = @ATOMIC_X86_SINGLE_OPTION_ENABLED@
-+ATOMIC_X86_SINGLE_OPTION_REQUESTED = @ATOMIC_X86_SINGLE_OPTION_REQUESTED@
-+ATRAILERS_OPTION_ENABLED = @ATRAILERS_OPTION_ENABLED@
-+ATRAILERS_OPTION_REQUESTED = @ATRAILERS_OPTION_REQUESTED@
-+AUTOCONF = @AUTOCONF@
-+AUTOHEADER = @AUTOHEADER@
-+AUTOMAKE = @AUTOMAKE@
-+AVFORMAT_CFLAGS = @AVFORMAT_CFLAGS@
-+AVFORMAT_LDFLAGS = @AVFORMAT_LDFLAGS@
-+AVFORMAT_LIBS = @AVFORMAT_LIBS@
-+AVFORMAT_STATUS = @AVFORMAT_STATUS@
-+AVUTIL_LDFLAGS = @AVUTIL_LDFLAGS@
-+AVUTIL_LIBS = @AVUTIL_LIBS@
-+AVUTIL_STATUS = @AVUTIL_STATUS@
-+AWK = @AWK@
-+CC = @CC@
-+CCDEPMODE = @CCDEPMODE@
-+CFLAGS = @CFLAGS@
-+CPP = @CPP@
-+CPPFLAGS = @CPPFLAGS@
-+CURL_CFLAGS = @CURL_CFLAGS@
-+CURL_LIBS = @CURL_LIBS@
-+CXX = @CXX@
-+CXXCPP = @CXXCPP@
-+CXXDEPMODE = @CXXDEPMODE@
-+CXXFLAGS = @CXXFLAGS@
-+CYGPATH_W = @CYGPATH_W@
-+DB_AUTOCREATE_OPTION_ENABLED = @DB_AUTOCREATE_OPTION_ENABLED@
-+DB_AUTOCREATE_OPTION_REQUESTED = @DB_AUTOCREATE_OPTION_REQUESTED@
-+DEBUG_LOG_OPTION_ENABLED = @DEBUG_LOG_OPTION_ENABLED@
-+DEBUG_LOG_OPTION_REQUESTED = @DEBUG_LOG_OPTION_REQUESTED@
-+DEBUG_MALLOC0_OPTION_ENABLED = @DEBUG_MALLOC0_OPTION_ENABLED@
-+DEBUG_MALLOC0_OPTION_REQUESTED = @DEBUG_MALLOC0_OPTION_REQUESTED@
-+DEFS = @DEFS@
-+DEPDIR = @DEPDIR@
-+ECHO_C = @ECHO_C@
-+ECHO_N = @ECHO_N@
-+ECHO_T = @ECHO_T@
-+EGREP = @EGREP@
-+EXEEXT = @EXEEXT@
-+EXPAT_CFLAGS = @EXPAT_CFLAGS@
-+EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
-+EXPAT_LIBS = @EXPAT_LIBS@
-+EXPAT_STATUS = @EXPAT_STATUS@
-+EXTERNAL_TRANSCODING_OPTION_ENABLED = @EXTERNAL_TRANSCODING_OPTION_ENABLED@
-+EXTERNAL_TRANSCODING_OPTION_REQUESTED = @EXTERNAL_TRANSCODING_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_CFLAGS = @FFMPEGTHUMBNAILER_CFLAGS@
-+FFMPEGTHUMBNAILER_LDFLAGS = @FFMPEGTHUMBNAILER_LDFLAGS@
-+FFMPEGTHUMBNAILER_LIBS = @FFMPEGTHUMBNAILER_LIBS@
-+FFMPEGTHUMBNAILER_OPTION_ENABLED = @FFMPEGTHUMBNAILER_OPTION_ENABLED@
-+FFMPEGTHUMBNAILER_OPTION_REQUESTED = @FFMPEGTHUMBNAILER_OPTION_REQUESTED@
-+FFMPEGTHUMBNAILER_STATUS = @FFMPEGTHUMBNAILER_STATUS@
-+FFMPEG_CFLAGS = @FFMPEG_CFLAGS@
-+FFMPEG_LDFLAGS = @FFMPEG_LDFLAGS@
-+FFMPEG_LIBS = @FFMPEG_LIBS@
-+FFMPEG_OPTION_ENABLED = @FFMPEG_OPTION_ENABLED@
-+FFMPEG_OPTION_REQUESTED = @FFMPEG_OPTION_REQUESTED@
-+FSEEKO_CHECK_OPTION_ENABLED = @FSEEKO_CHECK_OPTION_ENABLED@
-+FSEEKO_CHECK_OPTION_REQUESTED = @FSEEKO_CHECK_OPTION_REQUESTED@
-+GREP = @GREP@
-+ICONV_CXXFLAGS = @ICONV_CXXFLAGS@
-+ICONV_LIBS = @ICONV_LIBS@
-+ICONV_LIB_OPTION_ENABLED = @ICONV_LIB_OPTION_ENABLED@
-+ICONV_LIB_OPTION_REQUESTED = @ICONV_LIB_OPTION_REQUESTED@
-+ID3LIB_CFLAGS = @ID3LIB_CFLAGS@
-+ID3LIB_LDFLAGS = @ID3LIB_LDFLAGS@
-+ID3LIB_LIBS = @ID3LIB_LIBS@
-+ID3LIB_OPTION_ENABLED = @ID3LIB_OPTION_ENABLED@
-+ID3LIB_OPTION_REQUESTED = @ID3LIB_OPTION_REQUESTED@
-+ID3LIB_STATUS = @ID3LIB_STATUS@
-+ID3LIB_VERSION = @ID3LIB_VERSION@
-+INOTIFY_CFLAGS = @INOTIFY_CFLAGS@
-+INOTIFY_OPTION_ENABLED = @INOTIFY_OPTION_ENABLED@
-+INOTIFY_OPTION_REQUESTED = @INOTIFY_OPTION_REQUESTED@
-+INOTIFY_STATUS = @INOTIFY_STATUS@
-+INSTALL = @INSTALL@
-+INSTALL_DATA = @INSTALL_DATA@
-+INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
-+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-+JS_CXXFLAGS = @JS_CXXFLAGS@
-+JS_LIBS = @JS_LIBS@
-+LDFLAGS = @LDFLAGS@
-+LIBDVDNAV_CFLAGS = @LIBDVDNAV_CFLAGS@
-+LIBDVDNAV_LIBS = @LIBDVDNAV_LIBS@
-+LIBDVDNAV_OPTION_ENABLED = @LIBDVDNAV_OPTION_ENABLED@
-+LIBDVDNAV_OPTION_REQUESTED = @LIBDVDNAV_OPTION_REQUESTED@
-+LIBDVDNAV_STATUS = @LIBDVDNAV_STATUS@
-+LIBDVDNAV_VERSION = @LIBDVDNAV_VERSION@
-+LIBEXIF_CFLAGS = @LIBEXIF_CFLAGS@
-+LIBEXIF_LDFLAGS = @LIBEXIF_LDFLAGS@
-+LIBEXIF_LIBS = @LIBEXIF_LIBS@
-+LIBEXIF_OPTION_ENABLED = @LIBEXIF_OPTION_ENABLED@
-+LIBEXIF_OPTION_REQUESTED = @LIBEXIF_OPTION_REQUESTED@
-+LIBEXIF_STATUS = @LIBEXIF_STATUS@
-+LIBEXTRACTOR_CFLAGS = @LIBEXTRACTOR_CFLAGS@
-+LIBEXTRACTOR_LIBS = @LIBEXTRACTOR_LIBS@
-+LIBEXTRACTOR_OPTION_ENABLED = @LIBEXTRACTOR_OPTION_ENABLED@
-+LIBEXTRACTOR_OPTION_REQUESTED = @LIBEXTRACTOR_OPTION_REQUESTED@
-+LIBEXTRACTOR_STATUS = @LIBEXTRACTOR_STATUS@
-+LIBEXTRACTOR_VERSION = @LIBEXTRACTOR_VERSION@
-+LIBMAGIC_CFLAGS = @LIBMAGIC_CFLAGS@
-+LIBMAGIC_LDFLAGS = @LIBMAGIC_LDFLAGS@
-+LIBMAGIC_LIBS = @LIBMAGIC_LIBS@
-+LIBMAGIC_OPTION_ENABLED = @LIBMAGIC_OPTION_ENABLED@
-+LIBMAGIC_OPTION_REQUESTED = @LIBMAGIC_OPTION_REQUESTED@
-+LIBMAGIC_STATUS = @LIBMAGIC_STATUS@
-+LIBMAGIC_VERSION = @LIBMAGIC_VERSION@
-+LIBMP4V2_CFLAGS = @LIBMP4V2_CFLAGS@
-+LIBMP4V2_LDFLAGS = @LIBMP4V2_LDFLAGS@
-+LIBMP4V2_LIBS = @LIBMP4V2_LIBS@
-+LIBMP4V2_OPTION_ENABLED = @LIBMP4V2_OPTION_ENABLED@
-+LIBMP4V2_OPTION_REQUESTED = @LIBMP4V2_OPTION_REQUESTED@
-+LIBMP4V2_STATUS = @LIBMP4V2_STATUS@
-+LIBOBJS = @LIBOBJS@
-+LIBS = @LIBS@
-+LOG_OPTION_ENABLED = @LOG_OPTION_ENABLED@
-+LOG_OPTION_REQUESTED = @LOG_OPTION_REQUESTED@
-+LTLIBOBJS = @LTLIBOBJS@
-+LWRES_LIBS = @LWRES_LIBS@
-+MAKEINFO = @MAKEINFO@
-+MKDIR_P = @MKDIR_P@
-+MRREG_SERVICE_OPTION_ENABLED = @MRREG_SERVICE_OPTION_ENABLED@
-+MRREG_SERVICE_OPTION_REQUESTED = @MRREG_SERVICE_OPTION_REQUESTED@
-+MT_SEARCHPATH = @MT_SEARCHPATH@
-+MT_SEARCHPATH_HEADERS = @MT_SEARCHPATH_HEADERS@
-+MT_SEARCHPATH_LIBS = @MT_SEARCHPATH_LIBS@
-+MT_SEARCHPATH_PROGS = @MT_SEARCHPATH_PROGS@
-+MYSQL_CFLAGS = @MYSQL_CFLAGS@
-+MYSQL_LIBS = @MYSQL_LIBS@
-+MYSQL_OPTION_ENABLED = @MYSQL_OPTION_ENABLED@
-+MYSQL_OPTION_REQUESTED = @MYSQL_OPTION_REQUESTED@
-+MYSQL_STATUS = @MYSQL_STATUS@
-+MYSQL_VERSION = @MYSQL_VERSION@
-+NSL_LIBS = @NSL_LIBS@
-+OBJEXT = @OBJEXT@
-+PACKAGE = @PACKAGE@
-+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-+PACKAGE_NAME = @PACKAGE_NAME@
-+PACKAGE_STRING = @PACKAGE_STRING@
-+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+@@ -219,6 +219,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@
-+POW_LIB = @POW_LIB@
-+PROTOCOLINFO_EXTENSION_OPTION_ENABLED = @PROTOCOLINFO_EXTENSION_OPTION_ENABLED@
-+PROTOCOLINFO_EXTENSION_OPTION_REQUESTED = @PROTOCOLINFO_EXTENSION_OPTION_REQUESTED@
-+PTHREAD_CC = @PTHREAD_CC@
-+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
-+PTHREAD_LDFLAGS = @PTHREAD_LDFLAGS@
-+PTHREAD_LIBS = @PTHREAD_LIBS@
-+PTHREAD_LIB_OPTION_ENABLED = @PTHREAD_LIB_OPTION_ENABLED@
-+PTHREAD_LIB_OPTION_REQUESTED = @PTHREAD_LIB_OPTION_REQUESTED@
-+PTHREAD_STATUS = @PTHREAD_STATUS@
-+RANLIB = @RANLIB@
-+RT_LDFLAGS = @RT_LDFLAGS@
-+RT_LIBS = @RT_LIBS@
-+RT_STATUS = @RT_STATUS@
-+SET_MAKE = @SET_MAKE@
-+SHELL = @SHELL@
-+SOPCAST_OPTION_ENABLED = @SOPCAST_OPTION_ENABLED@
-+SOPCAST_OPTION_REQUESTED = @SOPCAST_OPTION_REQUESTED@
-+SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
-+SQLITE3_LDFLAGS = @SQLITE3_LDFLAGS@
-+SQLITE3_LIBS = @SQLITE3_LIBS@
-+SQLITE3_OPTION_ENABLED = @SQLITE3_OPTION_ENABLED@
-+SQLITE3_OPTION_REQUESTED = @SQLITE3_OPTION_REQUESTED@
-+SQLITE3_STATUS = @SQLITE3_STATUS@
-+SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED = @SQLITE_BACKUP_DEFAULTS_OPTION_ENABLED@
-+SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED = @SQLITE_BACKUP_DEFAULTS_OPTION_REQUESTED@
-+STATIC_OPTION_ENABLED = @STATIC_OPTION_ENABLED@
-+STATIC_OPTION_REQUESTED = @STATIC_OPTION_REQUESTED@
-+STRIP = @STRIP@
-+TAGLIB_CFLAGS = @TAGLIB_CFLAGS@
-+TAGLIB_LIBS = @TAGLIB_LIBS@
-+TAGLIB_OPTION_ENABLED = @TAGLIB_OPTION_ENABLED@
-+TAGLIB_OPTION_REQUESTED = @TAGLIB_OPTION_REQUESTED@
-+TAGLIB_STATUS = @TAGLIB_STATUS@
-+TAGLIB_VERSION = @TAGLIB_VERSION@
-+TOMBDEBUG_OPTION_ENABLED = @TOMBDEBUG_OPTION_ENABLED@
-+TOMBDEBUG_OPTION_REQUESTED = @TOMBDEBUG_OPTION_REQUESTED@
-+UPNPDEBUG_OPTION_ENABLED = @UPNPDEBUG_OPTION_ENABLED@
-+UPNPDEBUG_OPTION_REQUESTED = @UPNPDEBUG_OPTION_REQUESTED@
-+VERSION = @VERSION@
-+WEBORAMA_OPTION_ENABLED = @WEBORAMA_OPTION_ENABLED@
-+WEBORAMA_OPTION_REQUESTED = @WEBORAMA_OPTION_REQUESTED@
-+YOUTUBE_OPTION_ENABLED = @YOUTUBE_OPTION_ENABLED@
-+YOUTUBE_OPTION_REQUESTED = @YOUTUBE_OPTION_REQUESTED@
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LDFLAGS = @ZLIB_LDFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
-+ZLIB_OPTION_ENABLED = @ZLIB_OPTION_ENABLED@
-+ZLIB_OPTION_REQUESTED = @ZLIB_OPTION_REQUESTED@
-+ZLIB_STATUS = @ZLIB_STATUS@
-+abs_builddir = @abs_builddir@
-+abs_srcdir = @abs_srcdir@
-+abs_top_builddir = @abs_top_builddir@
-+abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_CC = @ac_ct_CC@
-+ac_ct_CXX = @ac_ct_CXX@
-+acx_pthread_config = @acx_pthread_config@
-+am__include = @am__include@
-+am__leading_dot = @am__leading_dot@
-+am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
-+bindir = @bindir@
-+build = @build@
-+build_alias = @build_alias@
-+build_cpu = @build_cpu@
-+build_os = @build_os@
-+build_vendor = @build_vendor@
-+builddir = @builddir@
-+curlconfig = @curlconfig@
-+datadir = @datadir@
-+datarootdir = @datarootdir@
-+docdir = @docdir@
-+dvidir = @dvidir@
-+exec_prefix = @exec_prefix@
-+host = @host@
-+host_alias = @host_alias@
-+host_cpu = @host_cpu@
-+host_os = @host_os@
-+host_vendor = @host_vendor@
-+htmldir = @htmldir@
-+includedir = @includedir@
-+infodir = @infodir@
-+install_sh = @install_sh@
-+libdir = @libdir@
-+libexecdir = @libexecdir@
-+localedir = @localedir@
-+localstatedir = @localstatedir@
-+mandir = @mandir@
-+mkdir_p = @mkdir_p@
-+mt_libdvdnav_config = @mt_libdvdnav_config@
-+mt_mysql_config = @mt_mysql_config@
-+mt_taglib_config = @mt_taglib_config@
-+oldincludedir = @oldincludedir@
-+pdfdir = @pdfdir@
-+prefix = @prefix@
-+program_transform_name = @program_transform_name@
-+psdir = @psdir@
-+sbindir = @sbindir@
-+sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
-+sysconfdir = @sysconfdir@
-+target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
-+_DIST_FILES_IMAGES = \
-+./icons/nanotree/images/minus.png \
-+./icons/nanotree/images/plus.png \
-+./icons/nanotree/images/minus_last_no_root.png \
-+./icons/nanotree/images/minus_last.png \
-+./icons/nanotree/images/white.png \
-+./icons/nanotree/images/plus_no_root.png \
-+./icons/nanotree/images/line.png \
-+./icons/nanotree/images/plus_last_no_root.png \
-+./icons/nanotree/images/minus_no_root.png \
-+./icons/nanotree/images/t_no_root.png \
-+./icons/nanotree/images/t.png \
-+./icons/nanotree/images/plus_last.png \
-+./icons/nanotree/images/lastnode.png \
-+./icons/nanotree/images/folder_closed.png \
-+./icons/nanotree/images/folder_open.png \
-+./icons/nanotree/images/autoscan_timed_folder_closed.png \
-+./icons/nanotree/images/autoscan_timed_folder_open.png \
-+./icons/nanotree/images/autoscan_timed_config_folder_open.png \
-+./icons/nanotree/images/autoscan_timed_config_folder_closed.png \
-+./icons/nanotree/images/autoscan_inotify_folder_closed.png \
-+./icons/nanotree/images/autoscan_inotify_folder_open.png \
-+./icons/nanotree/images/autoscan_inotify_config_folder_open.png \
-+./icons/nanotree/images/autoscan_inotify_config_folder_closed.png
-+
-+_DIST_FILES_ICONS = \
-+./icons/document-new.png \
-+./icons/folder_new.png \
-+./icons/go-first.png \
-+./icons/go-last.png \
-+./icons/go-next.png \
-+./icons/go-previous.png \
-+./icons/remove_all.png \
-+./icons/remove_this.png \
-+./icons/stock-add.png \
-+./icons/add_as_autoscan.png \
-+./icons/remove_autoscan.png \
-+./icons/stock_edit.png \
-+./icons/stock_exit.png \
-+./icons/autoscan_timed_config_folder_open.png \
-+./icons/autoscan_timed_folder_open.png \
-+./icons/autoscan_inotify_config_folder_open.png \
-+./icons/autoscan_inotify_folder_open.png \
-+./icons/folder_open.png \
-+./icons/status.png \
-+./icons/status_loading.png \
-+./icons/status_updates_pending.png \
-+./icons/mediatomb.png \
-+./icons/film.png \
-+./icons/mt-icon120.jpg \
-+./icons/mt-icon120.png \
-+./icons/mt-icon120.bmp \
-+./icons/mt-icon48.jpg \
-+./icons/mt-icon48.png \
-+./icons/mt-icon48.bmp \
-+./icons/mt-icon32.jpg \
-+./icons/mt-icon32.png \
-+./icons/mt-icon32.bmp \
-+./icons/blank.png \
-+./icons/blank.gif
-+
-+_DIST_FILES_JS = \
-+./js/autoscan.js \
-+./js/md5.js \
-+./js/prototype.js \
-+./js/auth.js \
-+./js/tasks.js \
-+./js/tree.js \
-+./js/tools.js \
-+./js/items.js \
-+./js/icons.js \
-+./js/nanotree.js \
-+./js/iepngfix.htc
-+
-+_DIST_FILES_WEB = \
-+./disabled.html \
-+./std_treelook.css \
-+./index.html \
-+./left.html \
-+./right.html \
-+./top.html \
-+./topleft.html \
-+./topright.html \
-+./main.css \
-+./cm.xml \
-+./cds.xml \
-+./favicon.ico \
-+./mr_reg.xml
-+
-+imagesdir = $(pkgdatadir)/web/icons/nanotree/images
-+dist_images_DATA = $(_DIST_FILES_IMAGES)
-+iconsdir = $(pkgdatadir)/web/icons
-+dist_icons_DATA = $(_DIST_FILES_ICONS)
-+jsdir = $(pkgdatadir)/web/js
-+dist_js_DATA = $(_DIST_FILES_JS)
-+webdir = $(pkgdatadir)/web
-+dist_web_DATA = $(_DIST_FILES_WEB)
-+all: all-am
-+
-+.SUFFIXES:
-+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
-+	        && { if test -f $@; then exit 0; else break; fi; }; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu web/Makefile'; \
-+	$(am__cd) $(top_srcdir) && \
-+	  $(AUTOMAKE) --gnu web/Makefile
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure:  $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(am__aclocal_m4_deps):
-+install-dist_iconsDATA: $(dist_icons_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(iconsdir)" || $(MKDIR_P) "$(DESTDIR)$(iconsdir)"
-+	@list='$(dist_icons_DATA)'; test -n "$(iconsdir)" || list=; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsdir)" || exit $$?; \
-+	done
-+
-+uninstall-dist_iconsDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_icons_DATA)'; test -n "$(iconsdir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(iconsdir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(iconsdir)" && rm -f $$files
-+install-dist_imagesDATA: $(dist_images_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(imagesdir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdir)"
-+	@list='$(dist_images_DATA)'; test -n "$(imagesdir)" || list=; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(imagesdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(imagesdir)" || exit $$?; \
-+	done
-+
-+uninstall-dist_imagesDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_images_DATA)'; test -n "$(imagesdir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(imagesdir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(imagesdir)" && rm -f $$files
-+install-dist_jsDATA: $(dist_js_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(jsdir)" || $(MKDIR_P) "$(DESTDIR)$(jsdir)"
-+	@list='$(dist_js_DATA)'; test -n "$(jsdir)" || list=; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(jsdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(jsdir)" || exit $$?; \
-+	done
-+
-+uninstall-dist_jsDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_js_DATA)'; test -n "$(jsdir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(jsdir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(jsdir)" && rm -f $$files
-+install-dist_webDATA: $(dist_web_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(webdir)" || $(MKDIR_P) "$(DESTDIR)$(webdir)"
-+	@list='$(dist_web_DATA)'; test -n "$(webdir)" || list=; \
-+	for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  echo "$$d$$p"; \
-+	done | $(am__base_list) | \
-+	while read files; do \
-+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(webdir)'"; \
-+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(webdir)" || exit $$?; \
-+	done
-+
-+uninstall-dist_webDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(dist_web_DATA)'; test -n "$(webdir)" || list=; \
-+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-+	test -n "$$files" || exit 0; \
-+	echo " ( cd '$(DESTDIR)$(webdir)' && rm -f" $$files ")"; \
-+	cd "$(DESTDIR)$(webdir)" && rm -f $$files
-+tags: TAGS
-+TAGS:
-+
-+ctags: CTAGS
-+CTAGS:
-+
-+
-+distdir: $(DISTFILES)
-+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+	list='$(DISTFILES)'; \
-+	  dist_files=`for file in $$list; do echo $$file; done | \
-+	  sed -e "s|^$$srcdirstrip/||;t" \
-+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+	case $$dist_files in \
-+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
-+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+			   sort -u` ;; \
-+	esac; \
-+	for file in $$dist_files; do \
-+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-+	  if test -d $$d/$$file; then \
-+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-+	    if test -d "$(distdir)/$$file"; then \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
-+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
-+	    fi; \
-+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
-+	  else \
-+	    test -f "$(distdir)/$$file" \
-+	    || cp -p $$d/$$file "$(distdir)/$$file" \
-+	    || exit 1; \
-+	  fi; \
-+	done
-+check-am: all-am
-+check: check-am
-+all-am: Makefile $(DATA)
-+installdirs:
-+	for dir in "$(DESTDIR)$(iconsdir)" "$(DESTDIR)$(imagesdir)" "$(DESTDIR)$(jsdir)" "$(DESTDIR)$(webdir)"; do \
-+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
-+	done
-+install: install-am
-+install-exec: install-exec-am
-+install-data: install-data-am
-+uninstall: uninstall-am
-+
-+install-am: all-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+
-+installcheck: installcheck-am
-+install-strip:
-+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-+	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-+	  `test -z '$(STRIP)' || \
-+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-+mostlyclean-generic:
-+
-+clean-generic:
-+
-+distclean-generic:
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
-+
-+maintainer-clean-generic:
-+	@echo "This command is intended for maintainers to use"
-+	@echo "it deletes files that may require special tools to rebuild."
-+clean: clean-am
-+
-+clean-am: clean-generic mostlyclean-am
-+
-+distclean: distclean-am
-+	-rm -f Makefile
-+distclean-am: clean-am distclean-generic
-+
-+dvi: dvi-am
-+
-+dvi-am:
-+
-+html: html-am
-+
-+html-am:
-+
-+info: info-am
-+
-+info-am:
-+
-+install-data-am: install-dist_iconsDATA install-dist_imagesDATA \
-+	install-dist_jsDATA install-dist_webDATA
-+
-+install-dvi: install-dvi-am
-+
-+install-dvi-am:
-+
-+install-exec-am:
-+
-+install-html: install-html-am
-+
-+install-html-am:
-+
-+install-info: install-info-am
-+
-+install-info-am:
-+
-+install-man:
-+
-+install-pdf: install-pdf-am
-+
-+install-pdf-am:
-+
-+install-ps: install-ps-am
-+
-+install-ps-am:
-+
-+installcheck-am:
-+
-+maintainer-clean: maintainer-clean-am
-+	-rm -f Makefile
-+maintainer-clean-am: distclean-am maintainer-clean-generic
-+
-+mostlyclean: mostlyclean-am
-+
-+mostlyclean-am: mostlyclean-generic
-+
-+pdf: pdf-am
-+
-+pdf-am:
-+
-+ps: ps-am
-+
-+ps-am:
-+
-+uninstall-am: uninstall-dist_iconsDATA uninstall-dist_imagesDATA \
-+	uninstall-dist_jsDATA uninstall-dist_webDATA
-+
-+.MAKE: install-am install-strip
-+
-+.PHONY: all all-am check check-am clean clean-generic distclean \
-+	distclean-generic distdir dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am \
-+	install-dist_iconsDATA install-dist_imagesDATA \
-+	install-dist_jsDATA install-dist_webDATA 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 \
-+	maintainer-clean maintainer-clean-generic mostlyclean \
-+	mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
-+	uninstall-dist_iconsDATA uninstall-dist_imagesDATA \
-+	uninstall-dist_jsDATA uninstall-dist_webDATA
-+
-+
-+# Tell versions [3.59,3.63) of GNU make to not export all variables.
-+# Otherwise a system limit (for SysV at least) may be exceeded.
-+.NOEXPORT:
+ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ POW_LIB = @POW_LIB@
diff --git a/debian/patches/config_xml_comment.patch b/debian/patches/config_xml_comment.patch
index ebb0ffe..c6b71e8 100644
--- a/debian/patches/config_xml_comment.patch
+++ b/debian/patches/config_xml_comment.patch
@@ -4,7 +4,7 @@ audio files.
 ==========================================================================
 --- a/src/config_manager.cc
 +++ b/src/config_manager.cc
-@@ -377,6 +377,13 @@
+@@ -426,6 +426,13 @@
      config->setAttribute(_("xmlns"), _(XML_XMLNS) + CONFIG_XML_VERSION);
      config->setAttribute(_("xmlns:xsi"), _(XML_XMLNS_XSI));
      config->setAttribute(_("xsi:schemaLocation"), _(XML_XMLNS) + CONFIG_XML_VERSION + " " + XML_XMLNS + CONFIG_XML_VERSION + ".xsd");
@@ -18,16 +18,7 @@ audio files.
      Ref<Element> server(new Element(_("server")));
     
      Ref<Element> ui(new Element(_("ui")));
-@@ -565,6 +572,8 @@
-     ext2mt->appendElementChild(map_from_to(_("m3u"), _("audio/x-mpegurl")));
-     ext2mt->appendElementChild(map_from_to(_("pls"), _("audio/x-scpls")));
-     ext2mt->appendElementChild(map_from_to(_("flv"), _("video/x-flv")));
-+    ext2mt->appendElementChild(map_from_to(_("mkv"), _("video/x-matroska")));
-+    ext2mt->appendElementChild(map_from_to(_("mka"), _("audio/x-matroska")));
-     
-     Ref<Comment> ps3info(new Comment(_(" Uncomment the line below for PS3 divx support "), true));
-     Ref<Comment> ps3avi(new Comment(_(" <map from=\"avi\" to=\"video/divx\"/> "), true));
-@@ -585,6 +594,8 @@
+@@ -614,6 +621,8 @@
                                 _(UPNP_DEFAULT_CLASS_VIDEO_ITEM)));
      mtupnp->appendElementChild(map_from_to(_("image/*"), 
                                 _("object.item.imageItem")));
@@ -36,7 +27,7 @@ audio files.
  
      mappings->appendElementChild(mtupnp);
  
-@@ -615,6 +626,10 @@
+@@ -644,6 +653,10 @@
                                             _(CONTENT_TYPE_DVD)));
      mtcontent->appendElementChild(treat_as(_("application/x-iso9660-image"), 
                                             _(CONTENT_TYPE_DVD)));
diff --git a/debian/patches/const_char_conversion.patch b/debian/patches/const_char_conversion.patch
index 87230d7..e3b6a10 100644
--- a/debian/patches/const_char_conversion.patch
+++ b/debian/patches/const_char_conversion.patch
@@ -2,7 +2,7 @@ Fix (const char *) conversion to (char *).
 ==========================================================================
 --- a/src/tools.cc
 +++ b/src/tools.cc
-@@ -297,14 +297,14 @@
+@@ -298,14 +298,14 @@
  
  String hex_decode_string(String encoded)
  {
@@ -13,14 +13,14 @@ Fix (const char *) conversion to (char *).
      Ref<StringBuffer> buf(new StringBuffer(len / 2));
      for (int i = 0; i < len; i += 2)
      {
--        char *chi = strchr(HEX_CHARS, ptr[i]);
--        char *clo = strchr(HEX_CHARS, ptr[i + 1]);
-+        char *chi = strchr(const_cast<char *>(HEX_CHARS), ptr[i]);
-+        char *clo = strchr(const_cast<char *>(HEX_CHARS), ptr[i + 1]);
+-        const char *chi = strchr(HEX_CHARS, ptr[i]);
+-        const char *clo = strchr(HEX_CHARS, ptr[i + 1]);
++        const char *chi = strchr(const_cast<char *>(HEX_CHARS), ptr[i]);
++        const char *clo = strchr(const_cast<char *>(HEX_CHARS), ptr[i + 1]);
          int hi, lo;
          
          if (chi)
-@@ -381,7 +381,7 @@
+@@ -382,7 +382,7 @@
  
  String url_unescape(String str)
  {
@@ -29,9 +29,9 @@ Fix (const char *) conversion to (char *).
      int len = str.length();
      Ref<StringBuffer> buf(new StringBuffer(len));
  
-@@ -399,13 +399,13 @@
+@@ -400,13 +400,13 @@
  
-             char *pos;
+             const char *pos;
  
 -            pos = strchr(hex, chi);
 +            pos = strchr(const_cast<char *>(hex), chi);
diff --git a/debian/patches/series b/debian/patches/series
index 7ad2277..f101da6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
 debug-mode-fix.patch
 config_xml_comment.patch
-service-id_fix.patch
 const_char_conversion.patch
-ffmpegthumbnailer-2.0.patch
 autoreconf_-fi.patch

-- 
MediaTomb packaging



More information about the pkg-multimedia-commits mailing list