texlive[43208] Build/source/texk/dvisvgm: import original

commits+karl at tug.org commits+karl at tug.org
Mon Feb 13 18:57:19 CET 2017


Revision: 43208
          http://tug.org/svn/texlive?view=revision&revision=43208
Author:   karl
Date:     2017-02-13 18:57:19 +0100 (Mon, 13 Feb 2017)
Log Message:
-----------
import original dvisvgm-2.1.2

Modified Paths:
--------------
    trunk/Build/source/texk/dvisvgm/Makefile.am
    trunk/Build/source/texk/dvisvgm/Makefile.in
    trunk/Build/source/texk/dvisvgm/aclocal.m4
    trunk/Build/source/texk/dvisvgm/configure
    trunk/Build/source/texk/dvisvgm/configure.ac
    trunk/Build/source/texk/dvisvgm/dvisvgm-PATCHES/TL-Changes
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/Makefile.am
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/Makefile.in
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/NEWS
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/README
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/config.h.in
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/doc/Makefile.in
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.1
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/Makefile.in
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/clipper/Makefile.in
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/fontforge.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/woff2/Makefile.in
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/woff2/brotli/Makefile.in
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/Makefile.in
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.c
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ax_code_coverage.m4
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/BoundingBox.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/CLCommandLine.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapReader.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Calculator.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.hpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.hpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.hpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.hpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.in
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.hpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Matrix.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/PapersizeSpecialHandler.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/PapersizeSpecialHandler.hpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamReader.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorIterator.hpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorStream.hpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLNode.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLString.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/options.xml
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/version.hpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CMapManagerTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CMapReaderTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/ColorSpecialTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/ColorTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CommandLineTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/DirectoryTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/DvisvgmSpecialTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/EmSpecialTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FileFinderTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontManagerTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontMapTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFGlyphTracerTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFReaderTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/JFMReaderTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/LengthTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/Makefile.am
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/Makefile.in
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/MapLineTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/MatrixTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/SplittedCharInputBufferTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/StreamInputBufferTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/StreamReaderTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/SubfontTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/TFMReaderTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/TensorProductPatchTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/VectorIteratorTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/data/Makefile.in
    trunk/Build/source/texk/dvisvgm/version.ac

Added Paths:
-----------
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/tmpfile2.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/ffintl.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ax_cxx_compile_stdcxx.m4
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/libtool.m4
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltoptions.m4
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltsugar.m4
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltversion.m4
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/lt~obsolete.m4
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontCacheTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/PapersizeSpecialTest.cpp
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/LICENSE
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-death-test.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-message.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-param-test.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-printers.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-spi.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-test-part.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-typed-test.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest_pred_impl.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest_prod.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/custom/
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/custom/gtest-port.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/custom/gtest-printers.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/custom/gtest.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/gtest-death-test-internal.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/gtest-filepath.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/gtest-internal.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/gtest-linked_ptr.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/gtest-param-util-generated.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/gtest-param-util.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/gtest-port-arch.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/gtest-port.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/gtest-string.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/gtest-tuple.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/internal/gtest-type-util.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/src/
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/src/gtest-all.cc
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/src/gtest-death-test.cc
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/src/gtest-filepath.cc
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/src/gtest-internal-inl.h
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/src/gtest-port.cc
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/src/gtest-printers.cc
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/src/gtest-test-part.cc
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/src/gtest-typed-test.cc
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/src/gtest.cc
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/src/gtest_main.cc

Removed Paths:
-------------
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/ChangeLog
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/utils.c
    trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/intl.h

Modified: trunk/Build/source/texk/dvisvgm/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvisvgm/Makefile.am	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/Makefile.am	2017-02-13 17:57:19 UTC (rev 43208)
@@ -30,7 +30,7 @@
 #
 DISTCLEANFILES = config.force CXXLD.sh
 
-## Tests.
+## Tests (our trivial one, not the original full test suite).
 ##
 TESTS = tests/dvisvgm.test
 tests/dvisvgm.log: dvisvgm-src/src/dvisvgm$(EXEEXT)

Modified: trunk/Build/source/texk/dvisvgm/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -383,6 +383,7 @@
   esac
 am__DIST_COMMON = $(srcdir)/../../am/dist_hook.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
+	$(top_srcdir)/../../build-aux/ar-lib \
 	$(top_srcdir)/../../build-aux/compile \
 	$(top_srcdir)/../../build-aux/config.guess \
 	$(top_srcdir)/../../build-aux/config.sub \
@@ -390,11 +391,11 @@
 	$(top_srcdir)/../../build-aux/ltmain.sh \
 	$(top_srcdir)/../../build-aux/missing \
 	$(top_srcdir)/../../build-aux/test-driver \
-	../../build-aux/compile ../../build-aux/config.guess \
-	../../build-aux/config.sub ../../build-aux/depcomp \
-	../../build-aux/install-sh ../../build-aux/ltmain.sh \
-	../../build-aux/missing ../../build-aux/texinfo.tex \
-	../../build-aux/ylwrap ChangeLog
+	../../build-aux/ar-lib ../../build-aux/compile \
+	../../build-aux/config.guess ../../build-aux/config.sub \
+	../../build-aux/depcomp ../../build-aux/install-sh \
+	../../build-aux/ltmain.sh ../../build-aux/missing \
+	../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)

Modified: trunk/Build/source/texk/dvisvgm/aclocal.m4
===================================================================
--- trunk/Build/source/texk/dvisvgm/aclocal.m4	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/aclocal.m4	2017-02-13 17:57:19 UTC (rev 43208)
@@ -56,6 +56,66 @@
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
+# Copyright (C) 2011-2014 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_AR([ACT-IF-FAIL])
+# -------------------------
+# Try to determine the archiver interface, and trigger the ar-lib wrapper
+# if it is needed.  If the detection of archiver interface fails, run
+# ACT-IF-FAIL (default is to abort configure with a proper error message).
+AC_DEFUN([AM_PROG_AR],
+[AC_BEFORE([$0], [LT_INIT])dnl
+AC_BEFORE([$0], [AC_PROG_LIBTOOL])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([ar-lib])dnl
+AC_CHECK_TOOLS([AR], [ar lib "link -lib"], [false])
+: ${AR=ar}
+
+AC_CACHE_CHECK([the archiver ($AR) interface], [am_cv_ar_interface],
+  [AC_LANG_PUSH([C])
+   am_cv_ar_interface=ar
+   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int some_variable = 0;]])],
+     [am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([am_ar_try])
+      if test "$ac_status" -eq 0; then
+        am_cv_ar_interface=ar
+      else
+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&AS_MESSAGE_LOG_FD'
+        AC_TRY_EVAL([am_ar_try])
+        if test "$ac_status" -eq 0; then
+          am_cv_ar_interface=lib
+        else
+          am_cv_ar_interface=unknown
+        fi
+      fi
+      rm -f conftest.lib libconftest.a
+     ])
+   AC_LANG_POP([C])])
+
+case $am_cv_ar_interface in
+ar)
+  ;;
+lib)
+  # Microsoft lib, so override with the ar-lib wrapper script.
+  # FIXME: It is wrong to rewrite AR.
+  # 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__AR in this case,
+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+  # similar.
+  AR="$am_aux_dir/ar-lib $AR"
+  ;;
+unknown)
+  m4_default([$1],
+             [AC_MSG_ERROR([could not determine $AR interface])])
+  ;;
+esac
+AC_SUBST([AR])dnl
+])
+
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
 # Copyright (C) 2001-2014 Free Software Foundation, Inc.

Modified: trunk/Build/source/texk/dvisvgm/configure
===================================================================
--- trunk/Build/source/texk/dvisvgm/configure	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/configure	2017-02-13 17:57:19 UTC (rev 43208)
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 2.1.
+# Generated by GNU Autoconf 2.69 for dvisvgm (TeX Live) 2.1.2.
 #
 # Report bugs to <tex-k at tug.org>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='dvisvgm (TeX Live)'
 PACKAGE_TARNAME='dvisvgm--tex-live-'
-PACKAGE_VERSION='2.1'
-PACKAGE_STRING='dvisvgm (TeX Live) 2.1'
+PACKAGE_VERSION='2.1.2'
+PACKAGE_STRING='dvisvgm (TeX Live) 2.1.2'
 PACKAGE_BUGREPORT='tex-k at tug.org'
 PACKAGE_URL=''
 
@@ -683,8 +683,6 @@
 DSYMUTIL
 MANIFEST_TOOL
 RANLIB
-ac_ct_AR
-AR
 LN_S
 NM
 ac_ct_DUMPBIN
@@ -707,6 +705,13 @@
 DLLTOOL
 AS
 WARNING_CFLAGS
+MAINT
+MAINTAINER_MODE_FALSE
+MAINTAINER_MODE_TRUE
+AM_BACKSLASH
+AM_DEFAULT_VERBOSITY
+AM_DEFAULT_V
+AM_V
 am__fastdepCC_FALSE
 am__fastdepCC_TRUE
 CCDEPMODE
@@ -717,20 +722,6 @@
 am__quote
 am__include
 DEPDIR
-OBJEXT
-EXEEXT
-ac_ct_CC
-CPPFLAGS
-LDFLAGS
-CFLAGS
-CC
-MAINT
-MAINTAINER_MODE_FALSE
-MAINTAINER_MODE_TRUE
-AM_BACKSLASH
-AM_DEFAULT_VERBOSITY
-AM_DEFAULT_V
-AM_V
 am__untar
 am__tar
 AMTAR
@@ -754,6 +745,15 @@
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+ac_ct_AR
+AR
 TEXLIVE_BUILD_FALSE
 TEXLIVE_BUILD_TRUE
 target_alias
@@ -797,9 +797,9 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_dependency_tracking
 enable_silent_rules
 enable_maintainer_mode
-enable_dependency_tracking
 enable_compiler_warnings
 enable_shared
 enable_static
@@ -1375,7 +1375,7 @@
   # 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 dvisvgm (TeX Live) 2.1 to adapt to many kinds of systems.
+\`configure' configures dvisvgm (TeX Live) 2.1.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1446,7 +1446,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 2.1:";;
+     short | recursive ) echo "Configuration of dvisvgm (TeX Live) 2.1.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1454,15 +1454,15 @@
   --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-dependency-tracking
+                          do not reject slow dependency extractors
+  --disable-dependency-tracking
+                          speeds up one-time build
   --enable-silent-rules   less verbose build output (undo: "make V=1")
   --disable-silent-rules  verbose build output (undo: "make V=0")
   --enable-maintainer-mode
                           enable make rules and dependencies not useful (and
                           sometimes confusing) to the casual installer
-  --enable-dependency-tracking
-                          do not reject slow dependency extractors
-  --disable-dependency-tracking
-                          speeds up one-time build
   --enable-compiler-warnings=[no|min|yes|max|all]
                           Turn on compiler warnings [default: yes if
                           maintainer-mode, min otherwise]
@@ -1581,7 +1581,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dvisvgm (TeX Live) configure 2.1
+dvisvgm (TeX Live) configure 2.1.2
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2449,7 +2449,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dvisvgm (TeX Live) $as_me 2.1, which was
+It was created by dvisvgm (TeX Live) $as_me 2.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2840,533 +2840,9 @@
 
 
 # Common code for all programs using libkpathsea.
-am__api_version='1.15'
-
-# 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.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
-if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; 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=.
-    # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
-  ./ | .// | /[cC]/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
-  /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 as_fn_executable_p "$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
-
-  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
-{ $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 "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-$as_echo_n "checking whether build environment is sane... " >&6; }
-# 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 (
-   am_has_slept=no
-   for am_try in 1 2; do
-     echo "timestamp, slept: $am_has_slept" > conftest.file
-     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
-     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
-  alias in your environment" "$LINENO" 5
-     fi
-     if test "$2" = conftest.file || test $am_try -eq 2; then
-       break
-     fi
-     # Just in case.
-     sleep 1
-     am_has_slept=yes
-   done
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   as_fn_error $? "newly created file is older than distributed files!
-Check your system clock" "$LINENO" 5
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-# If we didn't sleep, we still need to ensure time stamps of config.status and
-# generated files are strictly newer.
-am_sleep_pid=
-if grep 'slept: no' conftest.file >/dev/null 2>&1; then
-  ( sleep 1 ) &
-  am_sleep_pid=$!
-fi
-
-rm -f conftest.file
-
-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 --is-lightweight"; then
-  am_missing_run="$MISSING "
-else
-  am_missing_run=
-  { $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+set}" != 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; 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=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    $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
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
-else
-  { $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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; 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=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    $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
-
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
-  { $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 "$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:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; 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=.
-    for ac_prog in mkdir gmkdir; do
-	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   as_fn_executable_p "$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
-  done
-IFS=$as_save_IFS
-
-fi
-
-  test -d ./--version && rmdir ./--version
-  if test "${ac_cv_path_mkdir+set}" = set; then
-    MKDIR_P="$ac_cv_path_mkdir -p"
-  else
-    # 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
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-$as_echo "$MKDIR_P" >&6; }
-
-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:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; 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=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    $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
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
-$as_echo "$AWK" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$AWK" && break
-done
-
-{ $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 eval \${ac_cv_prog_make_${ac_make}_set+:} false; 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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-  SET_MAKE=
-else
-  { $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
-
-# Check whether --enable-silent-rules was given.
-if test "${enable_silent_rules+set}" = set; then :
-  enableval=$enable_silent_rules;
-fi
-
-case $enable_silent_rules in # (((
-  yes) AM_DEFAULT_VERBOSITY=0;;
-   no) AM_DEFAULT_VERBOSITY=1;;
-    *) AM_DEFAULT_VERBOSITY=1;;
-esac
-am_make=${MAKE-make}
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
-$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
-if ${am_cv_make_support_nested_variables+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  if $as_echo 'TRUE=$(BAR$(V))
-BAR0=false
-BAR1=true
-V=1
-am__doit:
-	@$(TRUE)
-.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
-  am_cv_make_support_nested_variables=yes
-else
-  am_cv_make_support_nested_variables=no
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
-$as_echo "$am_cv_make_support_nested_variables" >&6; }
-if test $am_cv_make_support_nested_variables = yes; then
-    AM_V='$(V)'
-  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
-else
-  AM_V=$AM_DEFAULT_VERBOSITY
-  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
-fi
-AM_BACKSLASH='\'
-
-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 "$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 "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
-$as_echo "$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then :
-  enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-  am__nodep='_no'
-fi
- if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4215,135 +3691,702 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-depcc="$CC"   am_compiler_list=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test -n "$ac_tool_prefix"; then
+  for ac_prog in ar lib "link -lib"
+  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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AR+:} false; 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".
-  rm -rf conftest.dir
-  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
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # 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=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
+    $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
 
-  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
+fi
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+    test -n "$AR" && break
+  done
+fi
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar lib "link -lib"
+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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # 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=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
   fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
+done
+  done
+IFS=$as_save_IFS
 
-  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 10 /bin/sh.
-      echo '/* dummy */' > sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+fi
+fi
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
 
-    # 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
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $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
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the archiver ($AR) interface" >&5
+$as_echo_n "checking the archiver ($AR) interface... " >&6; }
+if ${am_cv_ar_interface+:} false; then :
+  $as_echo_n "(cached) " >&6
+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
+
+   am_cv_ar_interface=ar
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+int some_variable = 0;
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  am_ar_try='$AR cru libconftest.a conftest.$ac_objext >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+        am_cv_ar_interface=ar
       else
-	break
+        am_ar_try='$AR -NOLOGO -OUT:conftest.lib conftest.$ac_objext >&5'
+        { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$am_ar_try\""; } >&5
+  (eval $am_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+        if test "$ac_status" -eq 0; then
+          am_cv_ar_interface=lib
+        else
+          am_cv_ar_interface=unknown
+        fi
       fi
-      ;;
-    msvc7 | msvc7msys | 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
+      rm -f conftest.lib libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
+$as_echo "$am_cv_ar_interface" >&6; }
+
+case $am_cv_ar_interface in
+ar)
+  ;;
+lib)
+  # Microsoft lib, so override with the ar-lib wrapper script.
+  # FIXME: It is wrong to rewrite AR.
+  # 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__AR in this case,
+  # and then we could set am__AR="$am_aux_dir/ar-lib \$(AR)" or something
+  # similar.
+  AR="$am_aux_dir/ar-lib $AR"
+  ;;
+unknown)
+  as_fn_error $? "could not determine $AR interface" "$LINENO" 5
+  ;;
+esac
+
+am__api_version='1.15'
+
+# 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.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+$as_echo_n "checking for a BSD-compatible install... " >&6; }
+if test -z "$INSTALL"; then
+if ${ac_cv_path_install+:} false; 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=.
+    # Account for people who put trailing slashes in PATH elements.
+case $as_dir/ in #((
+  ./ | .// | /[cC]/* | \
+  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
+  ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
+  /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 as_fn_executable_p "$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
+
   done
+IFS=$as_save_IFS
 
-  cd ..
-  rm -rf conftest.dir
+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
+{ $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 "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
+$as_echo_n "checking whether build environment is sane... " >&6; }
+# 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 (
+   am_has_slept=no
+   for am_try in 1 2; do
+     echo "timestamp, slept: $am_has_slept" > conftest.file
+     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
+     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
+  alias in your environment" "$LINENO" 5
+     fi
+     if test "$2" = conftest.file || test $am_try -eq 2; then
+       break
+     fi
+     # Just in case.
+     sleep 1
+     am_has_slept=yes
+   done
+   test "$2" = conftest.file
+   )
+then
+   # Ok.
+   :
 else
-  am_cv_CC_dependencies_compiler_type=none
+   as_fn_error $? "newly created file is older than distributed files!
+Check your system clock" "$LINENO" 5
 fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+# If we didn't sleep, we still need to ensure time stamps of config.status and
+# generated files are strictly newer.
+am_sleep_pid=
+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
+  ( sleep 1 ) &
+  am_sleep_pid=$!
+fi
 
+rm -f conftest.file
+
+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"`
+
+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
-{ $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
+# Use eval to expand $SHELL
+if eval "$MISSING --is-lightweight"; then
+  am_missing_run="$MISSING "
+else
+  am_missing_run=
+  { $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$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
+if test x"${install_sh+set}" != 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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
 else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
+  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=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $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
+
 fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $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 "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; 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=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $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
 
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
+  { $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 "$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:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+  if ${ac_cv_path_mkdir+:} false; 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=.
+    for ac_prog in mkdir gmkdir; do
+	 for ac_exec_ext in '' $ac_executable_extensions; do
+	   as_fn_executable_p "$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
+  done
+IFS=$as_save_IFS
+
+fi
+
+  test -d ./--version && rmdir ./--version
+  if test "${ac_cv_path_mkdir+set}" = set; then
+    MKDIR_P="$ac_cv_path_mkdir -p"
+  else
+    # 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
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+$as_echo "$MKDIR_P" >&6; }
+
+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:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_AWK+:} false; 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=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AWK="$ac_prog"
+    $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
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
+$as_echo "$AWK" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$AWK" && break
+done
+
+{ $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 eval \${ac_cv_prog_make_${ac_make}_set+:} false; 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 "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+  SET_MAKE=
+else
+  { $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
+
+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 "$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 "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
+$as_echo "$_am_result" >&6; }
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then :
+  enableval=$enable_dependency_tracking;
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+  am__nodep='_no'
+fi
+ if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+
+# Check whether --enable-silent-rules was given.
+if test "${enable_silent_rules+set}" = set; then :
+  enableval=$enable_silent_rules;
+fi
+
+case $enable_silent_rules in # (((
+  yes) AM_DEFAULT_VERBOSITY=0;;
+   no) AM_DEFAULT_VERBOSITY=1;;
+    *) AM_DEFAULT_VERBOSITY=1;;
+esac
+am_make=${MAKE-make}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
+$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
+if ${am_cv_make_support_nested_variables+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if $as_echo 'TRUE=$(BAR$(V))
+BAR0=false
+BAR1=true
+V=1
+am__doit:
+	@$(TRUE)
+.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
+  am_cv_make_support_nested_variables=yes
+else
+  am_cv_make_support_nested_variables=no
+fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
+$as_echo "$am_cv_make_support_nested_variables" >&6; }
+if test $am_cv_make_support_nested_variables = yes; then
+    AM_V='$(V)'
+  AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
+else
+  AM_V=$AM_DEFAULT_VERBOSITY
+  AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
+fi
+AM_BACKSLASH='\'
+
 # Check whether --enable-compiler-warnings was given.
 if test "${enable_compiler_warnings+set}" = set; then :
   enableval=$enable_compiler_warnings;
@@ -8144,7 +8187,7 @@
 
 # Define the identity of the package.
  PACKAGE='dvisvgm--tex-live-'
- VERSION='2.1'
+ VERSION='2.1.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -8194,7 +8237,135 @@
 
 
 
+depcc="$CC"   am_compiler_list=
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
+$as_echo_n "checking dependency style of $depcc... " >&6; }
+if ${am_cv_CC_dependencies_compiler_type+:} false; 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".
+  rm -rf conftest.dir
+  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 10 /bin/sh.
+      echo '/* dummy */' > 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
+      ;;
+    msvc7 | msvc7msys | 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 "$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
+
+
+
 # POSIX will say in a future version that running "rm -f" with no argument
 # is OK; and we want to be able to make that assumption in our Makefile
 # recipes.  So use an aggressive probe to check that the usage we want is
@@ -14355,134 +14526,6 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-depcc="$CC"   am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; 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".
-  rm -rf conftest.dir
-  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 10 /bin/sh.
-      echo '/* dummy */' > 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
-      ;;
-    msvc7 | msvc7msys | 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 "$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
-
-
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
 $as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
 if ${ac_cv_prog_cc_c99+:} false; then :
@@ -19071,6 +19114,7 @@
 
 
 
+
 # Check whether --enable-cxx-runtime-hack was given.
 if test "${enable_cxx_runtime_hack+set}" = set; then :
   enableval=$enable_cxx_runtime_hack;
@@ -19836,7 +19880,7 @@
 Report bugs to <bug-libtool at gnu.org>."
 
 lt_cl_version="\
-dvisvgm (TeX Live) config.lt 2.1
+dvisvgm (TeX Live) config.lt 2.1.2
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -22739,6 +22783,14 @@
    fi
    { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
 $as_echo "done" >&6; }
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  as_fn_error $? "conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
  if test -n "$EXEEXT"; then
   am__EXEEXT_TRUE=
   am__EXEEXT_FALSE='#'
@@ -22751,18 +22803,6 @@
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  as_fn_error $? "conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCC\" 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.
-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.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23176,7 +23216,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dvisvgm (TeX Live) $as_me 2.1, which was
+This file was extended by dvisvgm (TeX Live) $as_me 2.1.2, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23242,7 +23282,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dvisvgm (TeX Live) config.status 2.1
+dvisvgm (TeX Live) config.status 2.1.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

Modified: trunk/Build/source/texk/dvisvgm/configure.ac
===================================================================
--- trunk/Build/source/texk/dvisvgm/configure.ac	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/configure.ac	2017-02-13 17:57:19 UTC (rev 43208)
@@ -22,6 +22,7 @@
 AM_CONDITIONAL([TEXLIVE_BUILD], [test "x$enable_texlive_build" = xyes])
 
 # Common code for all programs using libkpathsea.
+AM_PROG_AR
 KPSE_COMMON([dvisvgm])
 
 AC_CONFIG_HEADERS([config.h])
@@ -33,6 +34,7 @@
 AC_PROG_CC_C99
 AC_PROG_CXX
 AX_CXX_COMPILE_STDCXX([11], [noext])
+LT_INIT
 KPSE_CXX_HACK
 
 AC_PROG_RANLIB

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-PATCHES/TL-Changes
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-PATCHES/TL-Changes	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-PATCHES/TL-Changes	2017-02-13 17:57:19 UTC (rev 43208)
@@ -1,9 +1,17 @@
+(This file public domain.)
+
 Changes applied to the dvisvgm-2.1 tree as obtained from:
 	http://dvisvgm.bplaced.net/Downloads
 
+Update version in ./version.ac.
+
 Removed common and generated files:
-rm compile config.guess config.sub depcomp install-sh missing test-driver
+rm ar-lib compile config.guess config.sub depcomp install-sh
+rm ltmain.sh missing test-driver 
 rm aclocal.m4 configure # reduce chance of confusion?
 
+# patch to integrate into TL build:
 patch -d dvisvgm-src -p1 <dvisvgm-PATCHES/patch-08-makefiles 
 
+# use same automake macro as upstream:
+cp dvisvgm-src/m4/ax_cxx_compile_stdcxx.m4 m4

Deleted: trunk/Build/source/texk/dvisvgm/dvisvgm-src/ChangeLog
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/ChangeLog	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/ChangeLog	2017-02-13 17:57:19 UTC (rev 43208)
@@ -1,6041 +0,0 @@
-2017-01-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * .travis.yml, configure.ac, src/Doxyfile, src/version.hpp: 
-  set version to 2.1 
-
-  * src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, src/EPSToSVG.cpp: 
-  get program name and version from version.hpp, avoid using macros from 
-  config.h 
-
-  * src/BoundingBox.cpp, src/Color.cpp, src/DVIToSVGActions.cpp, 
-    src/FilePath.cpp, src/FileSystem.cpp, src/FontWriter.cpp, 
-    src/Makefile.am, src/PageSize.cpp, src/SVGOutput.cpp, src/utility.cpp, 
-    src/utility.hpp, tests/Makefile.am, tests/UtilityTest.cpp: 
-  moved common utility functions to separate compilation unit and 
-  namespace 
-
-2017-01-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontWriter.cpp, src/FontWriter.hpp: 
-  print error message if FontWriter can't write temporary files 
-
-  * doc/dvisvgm.txt.in, src/CommandLine.hpp, src/dvisvgm.cpp, 
-    src/options.xml: 
-  added option --tmpdir to select a different temp folder 
-
-  * libs/ff-woff/fontforge/utils.c, src/FileSystem.cpp, src/FileSystem.hpp, 
-    src/Font.cpp, src/FontWriter.cpp, src/GlyphTracerMessages.hpp, 
-    src/MetafontWrapper.cpp, src/MetafontWrapper.hpp, src/Process.cpp, 
-    src/Process.hpp, src/SVGOutput.cpp, src/SVGOutput.hpp: 
-  create temp files in the system's temp folder rather than in cwd (closes 
-  #63) 
-
-2017-01-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/GhostscriptTest.cpp: 
-  disable GS banner in GhostscriptTest 
-
-  * src/DVIToSVG.cpp, src/EPSToSVG.cpp, src/SVGTree.hpp: 
-  print warning message if output file could not be written 
-
-  * src/FilePath.cpp, src/FilePath.hpp, tests/FilePathTest.cpp, 
-    tests/SVGOutputTest.cpp: 
-  retain letter case of filenames (Windows) 
-
-2017-01-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp, src/dvisvgm.cpp: 
-  added missing newlines in messages; fixed typo 
-
-2017-01-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/AGLTable.hpp, src/genhashmap.cpp, src/glyphlist.txt, 
-    src/glyphlist/Makefile, src/glyphlist/glyphlist-tex.txt, 
-    src/glyphlist/glyphlist.dtd, src/glyphlist/glyphlist.txt, 
-    src/glyphlist/glyphlist.xsl, src/glyphlist/xmlify.py: 
-  updated AGL table and removed colliding codepoints (closes #64) 
-
-2017-01-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * Makefile.am, README, README.md, configure.ac, doc/Makefile.am, 
-    doc/conf-dblatex-man.xsl, doc/conf-dblatex-pdf.xsl, doc/db2html.xsl, 
-    doc/dvisvgm.txt.in, doc/tweak-db-article.xsl, doc/tweak-dblatex-pdf.xsl, 
-    libs/Makefile.am, src/AGLTable.hpp, src/BasicDVIReader.cpp, 
-    src/BasicDVIReader.hpp, src/Bezier.cpp, src/Bezier.hpp, 
-    src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.hpp, 
-    src/Bitmap.cpp, src/Bitmap.hpp, src/BoundingBox.cpp, src/BoundingBox.hpp, 
-    src/CLCommandLine.cpp, src/CLCommandLine.hpp, src/CLOption.hpp, 
-    src/CMap.cpp, src/CMap.hpp, src/CMapManager.cpp, src/CMapManager.hpp, 
-    src/CMapReader.cpp, src/CMapReader.hpp, src/CRC32.cpp, src/CRC32.hpp, 
-    src/Calculator.cpp, src/Calculator.hpp, src/CharMapID.cpp, 
-    src/CharMapID.hpp, src/Character.hpp, src/Color.cpp, src/Color.hpp, 
-    src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.hpp, 
-    src/CommandLine.hpp, src/DLLoader.cpp, src/DLLoader.hpp, 
-    src/DVIActions.hpp, src/DVIReader.cpp, src/DVIReader.hpp, 
-    src/DVIToSVG.cpp, src/DVIToSVG.hpp, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.hpp, src/DependencyGraph.hpp, src/Directory.cpp, 
-    src/Directory.hpp, src/DvisvgmSpecialHandler.cpp, 
-    src/DvisvgmSpecialHandler.hpp, src/EPSFile.cpp, src/EPSFile.hpp, 
-    src/EPSToSVG.cpp, src/EPSToSVG.hpp, src/EmSpecialHandler.cpp, 
-    src/EmSpecialHandler.hpp, src/EncFile.cpp, src/EncFile.hpp, 
-    src/FileFinder.cpp, src/FileFinder.hpp, src/FilePath.cpp, 
-    src/FilePath.hpp, src/FileSystem.cpp, src/FileSystem.hpp, 
-    src/FixWord.hpp, src/Font.cpp, src/Font.hpp, src/FontCache.cpp, 
-    src/FontCache.hpp, src/FontEncoding.cpp, src/FontEncoding.hpp, 
-    src/FontEngine.cpp, src/FontEngine.hpp, src/FontManager.cpp, 
-    src/FontManager.hpp, src/FontMap.cpp, src/FontMap.hpp, 
-    src/FontMetrics.cpp, src/FontMetrics.hpp, src/FontStyle.hpp, 
-    src/FontWriter.cpp, src/FontWriter.hpp, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.hpp, src/GFReader.cpp, src/GFReader.hpp, 
-    src/GFTracer.cpp, src/GFTracer.hpp, src/Ghostscript.cpp, 
-    src/Ghostscript.hpp, src/Glyph.hpp, src/GlyphTracerMessages.hpp, 
-    src/GraphicsPath.hpp, src/HtmlSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.hpp, src/InputBuffer.cpp, src/InputBuffer.hpp, 
-    src/InputReader.cpp, src/InputReader.hpp, src/JFM.cpp, src/JFM.hpp, 
-    src/Length.cpp, src/Length.hpp, src/Makefile.am, src/Makefile.old, 
-    src/MapLine.cpp, src/MapLine.hpp, src/Matrix.cpp, src/Matrix.hpp, 
-    src/Message.cpp, src/Message.hpp, src/MessageException.hpp, 
-    src/MetafontWrapper.cpp, src/MetafontWrapper.hpp, src/MiKTeXCom.cpp, 
-    src/MiKTeXCom.hpp, src/NoPsSpecialHandler.cpp, 
-    src/NoPsSpecialHandler.hpp, src/NumericRanges.hpp, src/PSFilter.hpp, 
-    src/PSInterpreter.cpp, src/PSInterpreter.hpp, src/PSPattern.cpp, 
-    src/PSPattern.hpp, src/PSPreviewFilter.cpp, src/PSPreviewFilter.hpp, 
-    src/PageRanges.cpp, src/PageRanges.hpp, src/PageSize.cpp, 
-    src/PageSize.hpp, src/Pair.hpp, src/PapersizeSpecialHandler.cpp, 
-    src/PapersizeSpecialHandler.hpp, src/PathClipper.cpp, 
-    src/PathClipper.hpp, src/PdfSpecialHandler.cpp, 
-    src/PdfSpecialHandler.hpp, src/PreScanDVIReader.cpp, 
-    src/PreScanDVIReader.hpp, src/Process.cpp, src/Process.hpp, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.hpp, src/RangeMap.cpp, 
-    src/RangeMap.hpp, src/SVGCharHandler.cpp, src/SVGCharHandler.hpp, 
-    src/SVGCharHandlerFactory.cpp, src/SVGCharHandlerFactory.hpp, 
-    src/SVGCharPathHandler.cpp, src/SVGCharPathHandler.hpp, 
-    src/SVGCharTspanTextHandler.cpp, src/SVGCharTspanTextHandler.hpp, 
-    src/SVGOutput.cpp, src/SVGOutput.hpp, src/SVGSingleCharTextHandler.cpp, 
-    src/SVGSingleCharTextHandler.hpp, src/SVGTree.cpp, src/SVGTree.hpp, 
-    src/SWFWriter.cpp, src/SWFWriter.hpp, src/ShadingPatch.cpp, 
-    src/ShadingPatch.hpp, src/SignalHandler.cpp, src/SignalHandler.hpp, 
-    src/SpecialActions.hpp, src/SpecialHandler.hpp, src/SpecialManager.cpp, 
-    src/SpecialManager.hpp, src/StreamReader.cpp, src/StreamReader.hpp, 
-    src/StreamWriter.cpp, src/StreamWriter.hpp, src/Subfont.cpp, 
-    src/Subfont.hpp, src/System.cpp, src/System.hpp, src/TFM.cpp, 
-    src/TFM.hpp, src/TensorProductPatch.cpp, src/TensorProductPatch.hpp, 
-    src/Terminal.cpp, src/Terminal.hpp, src/ToUnicodeMap.cpp, 
-    src/ToUnicodeMap.hpp, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.hpp, src/TriangularPatch.cpp, 
-    src/TriangularPatch.hpp, src/Unicode.cpp, src/Unicode.hpp, 
-    src/VFActions.hpp, src/VFReader.cpp, src/VFReader.hpp, 
-    src/VectorIterator.hpp, src/VectorStream.hpp, src/XMLDocument.cpp, 
-    src/XMLDocument.hpp, src/XMLNode.cpp, src/XMLNode.hpp, src/XMLString.cpp, 
-    src/XMLString.hpp, src/ZLibOutputStream.hpp, src/dvisvgm.cpp, 
-    src/ffwrapper.c, src/ffwrapper.h, src/macros.hpp, src/options.dtd, 
-    src/options.xml, src/psdefs.cpp, src/psdefs.ps, src/version.hpp, 
-    src/version.hpp.in, tests/BezierTest.cpp, tests/BitmapTest.cpp, 
-    tests/BoundingBoxTest.cpp, tests/CMapManagerTest.cpp, 
-    tests/CMapReaderTest.cpp, tests/CMapTest.cpp, tests/CRC32Test.cpp, 
-    tests/CalculatorTest.cpp, tests/ColorSpecialTest.cpp, 
-    tests/ColorTest.cpp, tests/CommandLineTest.cpp, 
-    tests/DependencyGraphTest.cpp, tests/DirectoryTest.cpp, 
-    tests/DvisvgmSpecialTest.cpp, tests/EmSpecialTest.cpp, 
-    tests/FileFinderTest.cpp, tests/FilePathTest.cpp, 
-    tests/FileSystemTest.cpp, tests/FontManagerTest.cpp, 
-    tests/FontMapTest.cpp, tests/GFGlyphTracerTest.cpp, 
-    tests/GFReaderTest.cpp, tests/GraphicsPathTest.cpp, 
-    tests/JFMReaderTest.cpp, tests/LengthTest.cpp, tests/Makefile.am, 
-    tests/MapLineTest.cpp, tests/MatrixTest.cpp, 
-    tests/MessageExceptionTest.cpp, tests/PSInterpreterTest.cpp, 
-    tests/PageRagesTest.cpp, tests/PageSizeTest.cpp, tests/PairTest.cpp, 
-    tests/RangeMapTest.cpp, tests/SVGOutputTest.cpp, 
-    tests/ShadingPatchTest.cpp, tests/SplittedCharInputBufferTest.cpp, 
-    tests/StreamInputBufferTest.cpp, tests/StreamReaderTest.cpp, 
-    tests/StreamWriterTest.cpp, tests/SubfontTest.cpp, 
-    tests/TFMReaderTest.cpp, tests/TensorProductPatchTest.cpp, 
-    tests/ToUnicodeMapTest.cpp, tests/TriangularPatchTest.cpp, 
-    tests/UnicodeTest.cpp, tests/VectorIteratorTest.cpp, 
-    tests/VectorStreamTest.cpp, tests/XMLNodeTest.cpp, 
-    tests/XMLStringTest.cpp, tests/check-conv, tests/create-makefile, 
-    tests/data/Makefile.am, tests/genhashcheck.py, tests/normalize.xsl: 
-  updated year in copyright statements to 2017 
-
-2016-12-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/Makefile.am, doc/conf-dblatex-pdf.xsl, doc/db2html.xsl, 
-    doc/dvisvgm.txt.in, doc/dvisvgm.xpr, doc/tweak-db-article.xsl: 
-  manpage: minor refactorings of the XSLT scripts; added generation of 
-  epub 
-
-2016-12-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/conf-dblatex-pdf.xsl, doc/tweak-dblatex-pdf.xsl: 
-  manpage: use mixed case titles in pdf output 
-
-  * doc/db2html.xsl: 
-  manpage: replace icon of Author section 
-
-  * doc/conf-dblatex-man.xsl, doc/conf-dblatex-pdf.xsl, 
-    doc/tweak-dblatex-pdf.xsl: 
-  indent with tabs rather than spaces 
-
-  * doc/conf-dblatex-man.xsl, doc/conf-dblatex-pdf.xsl, doc/db2html.xsl, 
-    doc/tweak-dblatex-pdf.xsl: 
-  added missing email address to copyright headers 
-
-2016-12-15  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/db2html.xsl, doc/dvisvgm.xpr: 
-  manpage: preserve whitespace in list of supported specials 
-
-2016-11-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac: 
-  ensure compiling C files with --std=c99 
-
-2016-11-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-2016-11-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * .travis.yml, configure.ac, src/Doxyfile, src/version.hpp: 
-  set version to 2.0.4 
-
-  * configure.ac, libs/Makefile.am, libs/clipper/Makefile.am, 
-    libs/ff-woff/Makefile.am, libs/woff2/Makefile.am, 
-    libs/woff2/brotli/Makefile.am, libs/woff2/brotli/enc/Makefile.am, 
-    libs/woff2/src/Makefile.am, src/Makefile.am: 
-  added license files of bundled libraries; relocated Makefiles 
-
-  * README, README.md, configure.ac, libs/Makefile.am, libs/ff-woff/LICENSE, 
-    libs/ff-woff/Makefile.am, libs/ff-woff/README.md, 
-    libs/ff-woff/fontforge/PfEd.h, libs/ff-woff/fontforge/alphabet.c, 
-    libs/ff-woff/fontforge/asmfpst.c, libs/ff-woff/fontforge/autohint.c, 
-    libs/ff-woff/fontforge/char.c, libs/ff-woff/fontforge/cjk.c, 
-    libs/ff-woff/fontforge/configure-fontforge.h, 
-    libs/ff-woff/fontforge/cvundoes.c, libs/ff-woff/fontforge/dumppfa.c, 
-    libs/ff-woff/fontforge/edgelist.h, libs/ff-woff/fontforge/edgelist2.h, 
-    libs/ff-woff/fontforge/encoding.c, libs/ff-woff/fontforge/encoding.h, 
-    libs/ff-woff/fontforge/fontforge-config.h, 
-    libs/ff-woff/fontforge/fontforge.h, libs/ff-woff/fontforge/fontforgevw.h, 
-    libs/ff-woff/fontforge/fvfonts.c, libs/ff-woff/fontforge/gwwiconv.c, 
-    libs/ff-woff/fontforge/libffstamp.h, libs/ff-woff/fontforge/lookups.c, 
-    libs/ff-woff/fontforge/macbinary.c, libs/ff-woff/fontforge/macenc.c, 
-    libs/ff-woff/fontforge/mathconstants.c, libs/ff-woff/fontforge/memory.c, 
-    libs/ff-woff/fontforge/mm.c, libs/ff-woff/fontforge/namehash.h, 
-    libs/ff-woff/fontforge/namelist.c, libs/ff-woff/fontforge/nouiutil.c, 
-    libs/ff-woff/fontforge/nowakowskittfinstr.c, 
-    libs/ff-woff/fontforge/parsepfa.c, libs/ff-woff/fontforge/parsettf.c, 
-    libs/ff-woff/fontforge/parsettfatt.c, libs/ff-woff/fontforge/psfont.h, 
-    libs/ff-woff/fontforge/psread.c, libs/ff-woff/fontforge/pua.c, 
-    libs/ff-woff/fontforge/sd.h, libs/ff-woff/fontforge/sfd.c, 
-    libs/ff-woff/fontforge/sfd1.c, libs/ff-woff/fontforge/sfd1.h, 
-    libs/ff-woff/fontforge/splinechar.c, libs/ff-woff/fontforge/splinefont.c, 
-    libs/ff-woff/fontforge/splinefont.h, 
-    libs/ff-woff/fontforge/splineorder2.c, 
-    libs/ff-woff/fontforge/splineoverlap.c, 
-    libs/ff-woff/fontforge/splinerefigure.c, 
-    libs/ff-woff/fontforge/splinesave.c, 
-    libs/ff-woff/fontforge/splinesaveafm.c, 
-    libs/ff-woff/fontforge/splineutil.c, 
-    libs/ff-woff/fontforge/splineutil2.c, libs/ff-woff/fontforge/start.c, 
-    libs/ff-woff/fontforge/stemdb.c, libs/ff-woff/fontforge/stemdb.h, 
-    libs/ff-woff/fontforge/tables.h, libs/ff-woff/fontforge/tottf.c, 
-    libs/ff-woff/fontforge/tottfaat.c, libs/ff-woff/fontforge/tottfgpos.c, 
-    libs/ff-woff/fontforge/tottfvar.c, libs/ff-woff/fontforge/ttf.h, 
-    libs/ff-woff/fontforge/ttfinstrs.c, libs/ff-woff/fontforge/ttfinstrs.h, 
-    libs/ff-woff/fontforge/ttfspecial.c, 
-    libs/ff-woff/fontforge/uiinterface.h, libs/ff-woff/fontforge/unialt.c, 
-    libs/ff-woff/fontforge/ustring.c, libs/ff-woff/fontforge/utils.c, 
-    libs/ff-woff/fontforge/utype.c, libs/ff-woff/fontforge/woff.c, 
-    libs/ff-woff/inc/basics.h, libs/ff-woff/inc/chardata.h, 
-    libs/ff-woff/inc/charset.h, libs/ff-woff/inc/dlist.h, 
-    libs/ff-woff/inc/gimage.h, libs/ff-woff/inc/gnetwork.h, 
-    libs/ff-woff/inc/gwwiconv.h, libs/ff-woff/inc/intl.h, 
-    libs/ff-woff/inc/ustring.h, libs/ff-woff/inc/utype.h, src/Makefile.am: 
-  bundle reduced fontforge library (ff-woff) 
-
-  * doc/dvisvgm.txt.in: 
-  minor changes in manpage 
-
-2016-11-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BasicDVIReader.cpp, src/BasicDVIReader.hpp, src/DVIReader.cpp, 
-    src/DVIReader.hpp: 
-  use const variables for DVI opcodes rather than the values directly 
-
-  * src/CommandLine.hpp, src/options.xml: 
-  fixed a typo in the --help output 
-
-2016-11-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontWriter.cpp: 
-  few cosmetic changes; added comments 
-
-2016-09-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, README, README.md: 
-  updated NEWS and README 
-
-  * .travis.yml, configure.ac, src/Doxyfile, src/version.hpp: 
-  set version to 2.0.3 
-
-2016-09-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp: 
-  fixed positioning of rules 
-
-  * src/DVIReader.cpp, src/DVIReader.hpp, src/DVIToSVG.cpp, 
-    src/DVIToSVG.hpp: 
-  dropped tracking of previous DVI state from DVIReader 
-
-2016-09-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/DVIReader.hpp, src/DVIToSVG.cpp: 
-  fixed regression in character positioning of of virtual fonts 
-
-2016-09-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, README.md: 
-  updated NEWS and README 
-
-  * .travis.yml, configure.ac, src/Doxyfile, src/version.hpp: 
-  set version to 2.0.2 
-
-  * src/RangeMap.cpp: 
-  don't decrement iterator if it points to begin() 
-
-  * src/DVIReader.cpp: 
-  fixed type regression in computation of DVI positions (closes #61) 
-
-2016-09-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp: 
-  fixed sign of character depth computed for native fonts 
-
-2016-09-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, README, README.md: 
-  updated NEWS and README 
-
-  * .travis.yml, configure.ac, src/Doxyfile, src/version.hpp: 
-  set version to 2.0.1 
-
-2016-08-31  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/FontWriter.cpp, src/FontWriter.hpp, 
-    src/SVGTree.cpp, src/SVGTree.hpp, src/ffwrapper.c: 
-  added option to autohint fonts created by the FontForge library 
-
-  * README, README.md: 
-  added link to reduced FF library to README 
-
-2016-08-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVGActions.hpp, src/FontManager.hpp, src/MetafontWrapper.hpp: 
-  adapted struct/class forward declarations 
-
-2016-08-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * README, README.md: 
-  updated README files 
-
-  * .travis.yml, configure.ac, src/Doxyfile, src/version.hpp: 
-  set version to 2.0 
-
-  * src/CLCommandLine.cpp: 
-  added missing cast to avoid compiler warning 
-
-  * src/FileFinder.cpp, src/FileFinder.hpp: 
-  removed unused variable 
-
-2016-08-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontWriter.cpp, src/FontWriter.hpp, src/ffwrapper.c, 
-    src/ffwrapper.h: 
-  added missing copyright headers 
-
-2016-08-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, doc/dvisvgm.txt.in, libs/Makefile.am, libs/woff2/LICENSE, 
-    libs/woff2/brotli/LICENSE, libs/woff2/brotli/enc/Makefile.am, 
-    libs/woff2/brotli/enc/backward_references.cc, 
-    libs/woff2/brotli/enc/backward_references.h, 
-    libs/woff2/brotli/enc/bit_cost.h, 
-    libs/woff2/brotli/enc/block_splitter.cc, 
-    libs/woff2/brotli/enc/block_splitter.h, 
-    libs/woff2/brotli/enc/brotli_bit_stream.cc, 
-    libs/woff2/brotli/enc/brotli_bit_stream.h, 
-    libs/woff2/brotli/enc/cluster.h, libs/woff2/brotli/enc/command.h, 
-    libs/woff2/brotli/enc/compress_fragment.cc, 
-    libs/woff2/brotli/enc/compress_fragment.h, 
-    libs/woff2/brotli/enc/compress_fragment_two_pass.cc, 
-    libs/woff2/brotli/enc/compress_fragment_two_pass.h, 
-    libs/woff2/brotli/enc/compressor.h, libs/woff2/brotli/enc/context.h, 
-    libs/woff2/brotli/enc/dictionary.cc, libs/woff2/brotli/enc/dictionary.h, 
-    libs/woff2/brotli/enc/dictionary_hash.h, libs/woff2/brotli/enc/encode.cc, 
-    libs/woff2/brotli/enc/encode.h, libs/woff2/brotli/enc/encode_parallel.cc, 
-    libs/woff2/brotli/enc/encode_parallel.h, 
-    libs/woff2/brotli/enc/entropy_encode.cc, 
-    libs/woff2/brotli/enc/entropy_encode.h, 
-    libs/woff2/brotli/enc/entropy_encode_static.h, 
-    libs/woff2/brotli/enc/fast_log.h, 
-    libs/woff2/brotli/enc/find_match_length.h, libs/woff2/brotli/enc/hash.h, 
-    libs/woff2/brotli/enc/histogram.cc, libs/woff2/brotli/enc/histogram.h, 
-    libs/woff2/brotli/enc/literal_cost.cc, 
-    libs/woff2/brotli/enc/literal_cost.h, libs/woff2/brotli/enc/metablock.cc, 
-    libs/woff2/brotli/enc/metablock.h, libs/woff2/brotli/enc/port.h, 
-    libs/woff2/brotli/enc/prefix.h, libs/woff2/brotli/enc/ringbuffer.h, 
-    libs/woff2/brotli/enc/static_dict.cc, 
-    libs/woff2/brotli/enc/static_dict.h, 
-    libs/woff2/brotli/enc/static_dict_lut.h, 
-    libs/woff2/brotli/enc/streams.cc, libs/woff2/brotli/enc/streams.h, 
-    libs/woff2/brotli/enc/transform.h, libs/woff2/brotli/enc/types.h, 
-    libs/woff2/brotli/enc/utf8_util.cc, libs/woff2/brotli/enc/utf8_util.h, 
-    libs/woff2/brotli/enc/write_bits.h, libs/woff2/brotli/tools/bro.cc, 
-    libs/woff2/brotli/tools/rfc-format.py, libs/woff2/brotli/tools/version.h, 
-    libs/woff2/src/Makefile.am, libs/woff2/src/buffer.h, 
-    libs/woff2/src/file.h, libs/woff2/src/font.cc, libs/woff2/src/font.h, 
-    libs/woff2/src/glyph.cc, libs/woff2/src/glyph.h, 
-    libs/woff2/src/normalize.cc, libs/woff2/src/normalize.h, 
-    libs/woff2/src/port.h, libs/woff2/src/round.h, 
-    libs/woff2/src/store_bytes.h, libs/woff2/src/table_tags.cc, 
-    libs/woff2/src/table_tags.h, libs/woff2/src/transform.cc, 
-    libs/woff2/src/transform.h, libs/woff2/src/variable_length.cc, 
-    libs/woff2/src/variable_length.h, libs/woff2/src/woff2_common.cc, 
-    libs/woff2/src/woff2_common.h, libs/woff2/src/woff2_dec.h, 
-    libs/woff2/src/woff2_enc.cc, libs/woff2/src/woff2_enc.h, 
-    libs/woff2/src/woff2_out.cc, libs/woff2/src/woff2_out.h, 
-    src/FontWriter.cpp, src/FontWriter.hpp, src/Makefile.am: 
-  added support for embedding WOFF2 fonts 
-
-  * Makefile.am, clipper/License.txt, clipper/Makefile.am, 
-    clipper/clipper.cpp, clipper/clipper.hpp, configure.ac, libs/Makefile.am, 
-    libs/clipper/License.txt, libs/clipper/Makefile.am, 
-    libs/clipper/clipper.cpp, libs/clipper/clipper.hpp, libs/xxHash/LICENSE, 
-    libs/xxHash/Makefile.am, libs/xxHash/xxhash-fileno.patch, 
-    libs/xxHash/xxhash.c, libs/xxHash/xxhash.h, libs/xxHash/xxhsum.c, 
-    src/Makefile.am, tests/Makefile.am, tests/create-makefile, 
-    xxHash/LICENSE, xxHash/Makefile.am, xxHash/xxhash-fileno.patch, 
-    xxHash/xxhash.c, xxHash/xxhash.h, xxHash/xxhsum.c: 
-  moved bundled libraries (clipper, xxHash) to subfolder 'libs' 
-
-2016-08-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/XMLNode.hpp: 
-  added move constructors to XMLNode classes 
-
-2016-08-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, doc/dvisvgm.txt.in, src/CommandLine.hpp, 
-    src/FontWriter.cpp, src/FontWriter.hpp, src/GraphicsPath.hpp, 
-    src/Makefile.am, src/SVGTree.cpp, src/SVGTree.hpp, src/XMLNode.cpp, 
-    src/XMLNode.hpp, src/dvisvgm.cpp, src/ffwrapper.c, src/ffwrapper.h, 
-    src/options.xml: 
-  added option --font-format to select the file format used to embed fonts 
-
-  * src/FontEngine.cpp: 
-  fixed sign of the font descender 
-
-2016-08-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * xxHash/xxhash.c, xxHash/xxhash.h, xxHash/xxhsum.c: 
-  updated xxHash to version 0.6.2 
-
-2016-08-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FixWord.hpp, src/Font.cpp, src/FontMetrics.hpp, src/SVGTree.cpp, 
-    src/TFM.cpp, src/TFM.hpp: 
-  added getters for ascent and descent to TFM-based fonts 
-
-2016-08-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PathClipper.cpp: 
-  added missing initializers 
-
-  * src/Ghostscript.hpp: 
-  removed copy constructor of class Ghostscript 
-
-2016-08-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * CMakeLists.txt, configure.ac, src/CLCommandLine.cpp, 
-    src/CLCommandLine.hpp, src/CommandLine.hpp, src/Makefile.am, 
-    src/dvisvgm.cpp, src/options.dtd, src/options.xml, src/version.hpp, 
-    src/version.hpp.in: 
-  added version.hpp to provide the current version number 
-
-2016-08-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/MiKTeX209-session_i.c: 
-  added Makefile rule to invocate midl automatically if MiKTeX's COM 
-  interface changes 
-
-2016-08-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Ghostscript.cpp, src/MiKTeXCom.cpp: 
-  replaced __WIN64__ with pre-defined _WIN64 
-
-  * src/System.cpp, src/dvisvgm.cpp: 
-  minor refactorings of dvisvgm.cpp 
-
-  * src/DVIReader.cpp, src/DVIReader.hpp, src/Directory.cpp, 
-    src/Directory.hpp, src/FilePath.cpp, src/FilePath.hpp, src/Font.cpp, 
-    src/Font.hpp, src/FontManager.cpp, src/FontManager.hpp, src/GFReader.hpp, 
-    src/PageRanges.cpp, src/PageRanges.hpp, src/PageSize.cpp, 
-    src/PageSize.hpp, src/SVGOutput.cpp, src/SVGOutput.hpp, 
-    src/VFActions.hpp, src/VFReader.cpp: 
-  pass string parameters by reference if possible 
-
-2016-08-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CMap.cpp, src/CMapManager.cpp, src/CMapReader.cpp, src/EncFile.cpp, 
-    src/FileFinder.cpp, src/FileFinder.hpp, src/Font.cpp, 
-    src/FontEncoding.cpp, src/FontManager.cpp, src/FontMap.cpp, 
-    src/FontMetrics.cpp, src/Ghostscript.cpp, src/MetafontWrapper.cpp, 
-    src/PsSpecialHandler.cpp, src/Subfont.cpp, src/dvisvgm.cpp, 
-    tests/CMapManagerTest.cpp, tests/FileFinderTest.cpp, 
-    tests/MapLineTest.cpp, tests/SubfontTest.cpp: 
-  made FileFinder a singleton again 
-
-  * CMakeLists.txt, src/CLCommandLine.cpp, src/CLCommandLine.hpp, 
-    src/CLOption.hpp, src/CmdLineParserBase.cpp, src/CmdLineParserBase.hpp, 
-    src/CommandLine.cpp, src/CommandLine.hpp, src/Makefile.am, 
-    src/dvisvgm.cpp, src/options.dtd, src/options.xml, 
-    tests/CommandLineTest.cpp: 
-  reimplemented the CommandLine parser class 
-
-2016-07-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BgColorSpecialHandler.cpp, src/BoundingBox.cpp, 
-    src/DvisvgmSpecialHandler.cpp, src/EmSpecialHandler.cpp, 
-    src/FileSystem.cpp, src/FontCache.cpp, src/FontEngine.cpp, 
-    src/FontManager.cpp, src/GraphicsPath.hpp, src/PSInterpreter.cpp, 
-    src/PapersizeSpecialHandler.cpp, src/PathClipper.cpp, src/RangeMap.cpp, 
-    src/Subfont.cpp, src/TpicSpecialHandler.cpp, src/XMLDocument.cpp, 
-    src/XMLNode.cpp, src/genhashmap.cpp: 
-  replaced insert/push_back with emplace/emplace_back where useful 
-
-2016-07-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CMapReader.cpp: 
-  minor refactoring of class CMapReader 
-
-  * src/PathClipper.cpp: 
-  some minor refactorings of class PathClipper 
-
-2016-07-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontManager.cpp, src/FontManager.hpp: 
-  use unique_ptr to automatically release Font objects in class 
-  FontManager 
-
-  * src/FontMap.cpp, src/FontMap.hpp: 
-  some syntactic refactorings of class FontMap 
-
-2016-07-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/AGLTable.h, src/AGLTable.hpp, src/BasicDVIReader.cpp, 
-    src/BasicDVIReader.h, src/BasicDVIReader.hpp, src/Bezier.cpp, 
-    src/Bezier.h, src/Bezier.hpp, src/BgColorSpecialHandler.cpp, 
-    src/BgColorSpecialHandler.h, src/BgColorSpecialHandler.hpp, 
-    src/Bitmap.cpp, src/Bitmap.h, src/Bitmap.hpp, src/BoundingBox.cpp, 
-    src/BoundingBox.h, src/BoundingBox.hpp, src/CMap.cpp, src/CMap.h, 
-    src/CMap.hpp, src/CMapManager.cpp, src/CMapManager.h, 
-    src/CMapManager.hpp, src/CMapReader.cpp, src/CMapReader.h, 
-    src/CMapReader.hpp, src/CRC32.cpp, src/CRC32.h, src/CRC32.hpp, 
-    src/Calculator.cpp, src/Calculator.h, src/Calculator.hpp, 
-    src/CharMapID.cpp, src/CharMapID.h, src/CharMapID.hpp, src/Character.h, 
-    src/Character.hpp, src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, 
-    src/CmdLineParserBase.hpp, src/Color.cpp, src/Color.h, src/Color.hpp, 
-    src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/ColorSpecialHandler.hpp, src/CommandLine.cpp, src/CommandLine.h, 
-    src/CommandLine.hpp, src/DLLoader.cpp, src/DLLoader.h, src/DLLoader.hpp, 
-    src/DVIActions.h, src/DVIActions.hpp, src/DVIReader.cpp, src/DVIReader.h, 
-    src/DVIReader.hpp, src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVG.hpp, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/DVIToSVGActions.hpp, 
-    src/DependencyGraph.h, src/DependencyGraph.hpp, src/Directory.cpp, 
-    src/Directory.h, src/Directory.hpp, src/DvisvgmSpecialHandler.cpp, 
-    src/DvisvgmSpecialHandler.h, src/DvisvgmSpecialHandler.hpp, 
-    src/EPSFile.cpp, src/EPSFile.h, src/EPSFile.hpp, src/EPSToSVG.cpp, 
-    src/EPSToSVG.h, src/EPSToSVG.hpp, src/EmSpecialHandler.cpp, 
-    src/EmSpecialHandler.h, src/EmSpecialHandler.hpp, src/EncFile.cpp, 
-    src/EncFile.h, src/EncFile.hpp, src/FileFinder.cpp, src/FileFinder.h, 
-    src/FileFinder.hpp, src/FilePath.cpp, src/FilePath.h, src/FilePath.hpp, 
-    src/FileSystem.cpp, src/FileSystem.h, src/FileSystem.hpp, src/FixWord.h, 
-    src/FixWord.hpp, src/Font.cpp, src/Font.h, src/Font.hpp, 
-    src/FontCache.cpp, src/FontCache.h, src/FontCache.hpp, 
-    src/FontEncoding.cpp, src/FontEncoding.h, src/FontEncoding.hpp, 
-    src/FontEngine.cpp, src/FontEngine.h, src/FontEngine.hpp, 
-    src/FontManager.cpp, src/FontManager.h, src/FontManager.hpp, 
-    src/FontMap.cpp, src/FontMap.h, src/FontMap.hpp, src/FontMetrics.cpp, 
-    src/FontMetrics.h, src/FontMetrics.hpp, src/FontStyle.h, 
-    src/FontStyle.hpp, src/GFGlyphTracer.cpp, src/GFGlyphTracer.h, 
-    src/GFGlyphTracer.hpp, src/GFReader.cpp, src/GFReader.h, 
-    src/GFReader.hpp, src/GFTracer.cpp, src/GFTracer.h, src/GFTracer.hpp, 
-    src/Ghostscript.cpp, src/Ghostscript.h, src/Ghostscript.hpp, src/Glyph.h, 
-    src/Glyph.hpp, src/GlyphTracerMessages.h, src/GlyphTracerMessages.hpp, 
-    src/GraphicsPath.h, src/GraphicsPath.hpp, src/HtmlSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.h, src/HtmlSpecialHandler.hpp, 
-    src/InputBuffer.cpp, src/InputBuffer.h, src/InputBuffer.hpp, 
-    src/InputReader.cpp, src/InputReader.h, src/InputReader.hpp, src/JFM.cpp, 
-    src/JFM.h, src/JFM.hpp, src/Length.cpp, src/Length.h, src/Length.hpp, 
-    src/Makefile.am, src/MapLine.cpp, src/MapLine.h, src/MapLine.hpp, 
-    src/Matrix.cpp, src/Matrix.h, src/Matrix.hpp, src/Message.cpp, 
-    src/Message.h, src/Message.hpp, src/MessageException.h, 
-    src/MessageException.hpp, src/MetafontWrapper.cpp, src/MetafontWrapper.h, 
-    src/MetafontWrapper.hpp, src/MiKTeXCom.cpp, src/MiKTeXCom.h, 
-    src/MiKTeXCom.hpp, src/NoPsSpecialHandler.cpp, src/NoPsSpecialHandler.h, 
-    src/NoPsSpecialHandler.hpp, src/NumericRanges.h, src/NumericRanges.hpp, 
-    src/PSFilter.h, src/PSFilter.hpp, src/PSInterpreter.cpp, 
-    src/PSInterpreter.h, src/PSInterpreter.hpp, src/PSPattern.cpp, 
-    src/PSPattern.h, src/PSPattern.hpp, src/PSPreviewFilter.cpp, 
-    src/PSPreviewFilter.h, src/PSPreviewFilter.hpp, src/PageRanges.cpp, 
-    src/PageRanges.h, src/PageRanges.hpp, src/PageSize.cpp, src/PageSize.h, 
-    src/PageSize.hpp, src/Pair.h, src/Pair.hpp, 
-    src/PapersizeSpecialHandler.cpp, src/PapersizeSpecialHandler.h, 
-    src/PapersizeSpecialHandler.hpp, src/PathClipper.cpp, src/PathClipper.h, 
-    src/PathClipper.hpp, src/PdfSpecialHandler.cpp, src/PdfSpecialHandler.h, 
-    src/PdfSpecialHandler.hpp, src/PreScanDVIReader.cpp, 
-    src/PreScanDVIReader.h, src/PreScanDVIReader.hpp, src/Process.cpp, 
-    src/Process.h, src/Process.hpp, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/PsSpecialHandler.hpp, src/RangeMap.cpp, 
-    src/RangeMap.h, src/RangeMap.hpp, src/SVGCharHandler.cpp, 
-    src/SVGCharHandler.h, src/SVGCharHandler.hpp, 
-    src/SVGCharHandlerFactory.cpp, src/SVGCharHandlerFactory.h, 
-    src/SVGCharHandlerFactory.hpp, src/SVGCharPathHandler.cpp, 
-    src/SVGCharPathHandler.h, src/SVGCharPathHandler.hpp, 
-    src/SVGCharTspanTextHandler.cpp, src/SVGCharTspanTextHandler.h, 
-    src/SVGCharTspanTextHandler.hpp, src/SVGOutput.cpp, src/SVGOutput.h, 
-    src/SVGOutput.hpp, src/SVGSingleCharTextHandler.cpp, 
-    src/SVGSingleCharTextHandler.h, src/SVGSingleCharTextHandler.hpp, 
-    src/SVGTree.cpp, src/SVGTree.h, src/SVGTree.hpp, src/SWFWriter.cpp, 
-    src/SWFWriter.h, src/SWFWriter.hpp, src/ShadingPatch.cpp, 
-    src/ShadingPatch.h, src/ShadingPatch.hpp, src/SignalHandler.cpp, 
-    src/SignalHandler.h, src/SignalHandler.hpp, src/SpecialActions.h, 
-    src/SpecialActions.hpp, src/SpecialHandler.h, src/SpecialHandler.hpp, 
-    src/SpecialManager.cpp, src/SpecialManager.h, src/SpecialManager.hpp, 
-    src/StreamReader.cpp, src/StreamReader.h, src/StreamReader.hpp, 
-    src/StreamWriter.cpp, src/StreamWriter.h, src/StreamWriter.hpp, 
-    src/Subfont.cpp, src/Subfont.h, src/Subfont.hpp, src/System.cpp, 
-    src/System.h, src/System.hpp, src/TFM.cpp, src/TFM.h, src/TFM.hpp, 
-    src/TensorProductPatch.cpp, src/TensorProductPatch.h, 
-    src/TensorProductPatch.hpp, src/Terminal.cpp, src/Terminal.h, 
-    src/Terminal.hpp, src/ToUnicodeMap.cpp, src/ToUnicodeMap.h, 
-    src/ToUnicodeMap.hpp, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h, src/TpicSpecialHandler.hpp, 
-    src/TriangularPatch.cpp, src/TriangularPatch.h, src/TriangularPatch.hpp, 
-    src/Unicode.cpp, src/Unicode.h, src/Unicode.hpp, src/VFActions.h, 
-    src/VFActions.hpp, src/VFReader.cpp, src/VFReader.h, src/VFReader.hpp, 
-    src/VectorIterator.h, src/VectorIterator.hpp, src/VectorStream.h, 
-    src/VectorStream.hpp, src/XMLDocument.cpp, src/XMLDocument.h, 
-    src/XMLDocument.hpp, src/XMLNode.cpp, src/XMLNode.h, src/XMLNode.hpp, 
-    src/XMLString.cpp, src/XMLString.h, src/XMLString.hpp, 
-    src/ZLibOutputStream.h, src/ZLibOutputStream.hpp, src/dvisvgm.cpp, 
-    src/macros.h, src/macros.hpp, src/psdefs.cpp, tests/BezierTest.cpp, 
-    tests/BitmapTest.cpp, tests/BoundingBoxTest.cpp, 
-    tests/CMapManagerTest.cpp, tests/CMapReaderTest.cpp, tests/CMapTest.cpp, 
-    tests/CRC32Test.cpp, tests/CalculatorTest.cpp, 
-    tests/ColorSpecialTest.cpp, tests/ColorTest.cpp, 
-    tests/CommandLineTest.cpp, tests/DependencyGraphTest.cpp, 
-    tests/DirectoryTest.cpp, tests/DvisvgmSpecialTest.cpp, 
-    tests/EmSpecialTest.cpp, tests/FileFinderTest.cpp, 
-    tests/FilePathTest.cpp, tests/FileSystemTest.cpp, 
-    tests/FontManagerTest.cpp, tests/FontMapTest.cpp, 
-    tests/GFGlyphTracerTest.cpp, tests/GFReaderTest.cpp, 
-    tests/GhostscriptTest.cpp, tests/GraphicsPathTest.cpp, 
-    tests/JFMReaderTest.cpp, tests/LengthTest.cpp, tests/Makefile.am, 
-    tests/MapLineTest.cpp, tests/MatrixTest.cpp, 
-    tests/MessageExceptionTest.cpp, tests/PSInterpreterTest.cpp, 
-    tests/PageRagesTest.cpp, tests/PageSizeTest.cpp, tests/PairTest.cpp, 
-    tests/RangeMapTest.cpp, tests/SVGOutputTest.cpp, 
-    tests/ShadingPatchTest.cpp, tests/SplittedCharInputBufferTest.cpp, 
-    tests/StreamInputBufferTest.cpp, tests/StreamReaderTest.cpp, 
-    tests/StreamWriterTest.cpp, tests/SubfontTest.cpp, 
-    tests/TFMReaderTest.cpp, tests/TensorProductPatchTest.cpp, 
-    tests/ToUnicodeMapTest.cpp, tests/TriangularPatchTest.cpp, 
-    tests/UnicodeTest.cpp, tests/VectorIteratorTest.cpp, 
-    tests/VectorStreamTest.cpp, tests/XMLNodeTest.cpp, 
-    tests/XMLStringTest.cpp, tests/create-makefile: 
-  renamed filename extension of C++ headers to .hpp 
-
-2016-07-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVGActions.cpp, src/DVIToSVGActions.h: 
-  create BoxMap object directly, avoid new/delete 
-
-  * src/CMapManager.cpp, src/CMapManager.h, src/FileFinder.cpp, 
-    src/Font.cpp, src/Font.h, src/XMLDocument.cpp, src/XMLDocument.h, 
-    src/XMLNode.cpp, src/XMLNode.h, tests/XMLNodeTest.cpp: 
-  use smart pointers to release heap memory 
-
-  * src/genhashmap.cpp, src/glyphlist.txt: 
-  added genhashmap (generates AGLTable.h from glyphlist.txt) 
-
-2016-07-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/AGLTable.h, src/Color.cpp, src/Unicode.cpp, tests/genhashcheck.py: 
-  replaced repeated binary search implementations with calls of 
-  lower_bound() 
-
-2016-07-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp, src/Message.cpp: 
-  initialize maps with initializer-lists 
-
-2016-07-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Length.cpp, src/TpicSpecialHandler.cpp: 
-  replaced 'id macros' with constexpr functions 
-
-2016-07-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, README.md: 
-  updated NEWS and README 
-
-  * .travis.yml, configure.ac, src/Doxyfile: 
-  set version to 1.16 
-
-  * src/dvisvgm.cpp: 
-  catch exception in set_cache_dir() 
-
-  * src/TFM.cpp: 
-  added missing initializers 
-
-2016-07-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/Font.cpp, src/Font.h, 
-    src/FontManager.cpp, src/FontManager.h, src/VFActions.h, 
-    src/VFReader.cpp: 
-  transfer DVI snippet of a VF char by move semantics rather than by heap 
-  pointer 
-
-  * AUTHORS, LGPL-2.1.txt, Makefile.am, gzstream/COPYING.LIB, 
-    gzstream/Makefile, gzstream/README, gzstream/gzstream.cpp, 
-    gzstream/gzstream.h, gzstream/index.html, gzstream/logo.gif, 
-    gzstream/test_gunzip.C, gzstream/test_gzip.C, gzstream/version, 
-    src/Makefile.am, src/SVGOutput.cpp, src/SVGOutput.h, 
-    src/ZLibOutputStream.h, src/dvisvgm.cpp, src/gzstream.cpp, 
-    src/gzstream.h, tests/Makefile.am, tests/SVGOutputTest.cpp, 
-    tests/create-makefile: 
-  replaced old gzstream classes 
-
-  * clipper/clipper.hpp, src/AGLTable.h, src/BasicDVIReader.cpp, 
-    src/Bitmap.cpp, src/Bitmap.h, src/BoundingBox.h, src/CMap.cpp, 
-    src/CMap.h, src/CMapReader.cpp, src/CRC32.cpp, src/CRC32.h, 
-    src/CharMapID.h, src/Character.h, src/Color.cpp, src/Color.h, 
-    src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, 
-    src/DVIToSVG.h, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/EPSFile.cpp, src/EPSFile.h, src/EncFile.cpp, src/EncFile.h, 
-    src/FileSystem.cpp, src/FileSystem.h, src/FixWord.h, src/Font.cpp, 
-    src/Font.h, src/FontCache.cpp, src/FontCache.h, src/FontEncoding.cpp, 
-    src/FontEncoding.h, src/FontEngine.cpp, src/FontEngine.h, 
-    src/FontManager.cpp, src/FontManager.h, src/FontMetrics.cpp, 
-    src/FontMetrics.h, src/GFGlyphTracer.cpp, src/GFGlyphTracer.h, 
-    src/GFReader.cpp, src/GFReader.h, src/GFTracer.cpp, src/GFTracer.h, 
-    src/Glyph.h, src/GlyphTracerMessages.h, src/InputBuffer.cpp, 
-    src/InputBuffer.h, src/JFM.cpp, src/JFM.h, src/Makefile.am, 
-    src/Message.h, src/Pair.h, src/PathClipper.cpp, src/PreScanDVIReader.cpp, 
-    src/PsSpecialHandler.h, src/RangeMap.cpp, src/RangeMap.h, 
-    src/SVGCharHandler.h, src/SVGCharPathHandler.cpp, 
-    src/SVGCharPathHandler.h, src/SVGCharTspanTextHandler.cpp, 
-    src/SVGCharTspanTextHandler.h, src/SVGSingleCharTextHandler.cpp, 
-    src/SVGSingleCharTextHandler.h, src/SWFWriter.cpp, src/SWFWriter.h, 
-    src/StreamReader.cpp, src/StreamReader.h, src/StreamWriter.cpp, 
-    src/StreamWriter.h, src/Subfont.cpp, src/Subfont.h, src/TFM.cpp, 
-    src/TFM.h, src/ToUnicodeMap.cpp, src/ToUnicodeMap.h, src/Unicode.cpp, 
-    src/Unicode.h, src/VFActions.h, src/VFReader.cpp, src/VFReader.h, 
-    src/XMLString.cpp, src/types.h, tests/BitmapTest.cpp, 
-    tests/CRC32Test.cpp, tests/ColorSpecialTest.cpp, tests/ColorTest.cpp, 
-    tests/GFGlyphTracerTest.cpp, tests/GFReaderTest.cpp, 
-    tests/JFMReaderTest.cpp, tests/Makefile.am, tests/StreamReaderTest.cpp, 
-    tests/TriangularPatchTest.cpp, tests/TypesTest.cpp, 
-    tests/UnicodeTest.cpp: 
-  replaced own fixed-sized integer types with types from cstdint 
-
-  * src/CMapReader.cpp, src/CMapReader.h, src/CmdLineParserBase.cpp, 
-    src/CmdLineParserBase.h, src/Color.cpp, src/Color.h, src/CommandLine.cpp, 
-    src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, 
-    src/EmSpecialHandler.cpp, src/Font.cpp, src/Font.h, src/FontManager.cpp, 
-    src/GraphicsPath.h, src/HtmlSpecialHandler.cpp, src/HtmlSpecialHandler.h, 
-    src/Length.cpp, src/Length.h, src/PathClipper.cpp, 
-    src/PsSpecialHandler.cpp, src/SVGTree.cpp, src/ShadingPatch.cpp, 
-    src/TensorProductPatch.h, tests/BoundingBoxTest.cpp, 
-    tests/LengthTest.cpp, tests/ShadingPatchTest.cpp, 
-    tests/TensorProductPatchTest.cpp, tests/TriangularPatchTest.cpp: 
-  replaced some enums with enum classes 
-
-  * src/NumericRanges.h, src/PapersizeSpecialHandler.cpp, src/Unicode.cpp, 
-    src/VFReader.cpp: 
-  replaced static callback functions with lambdas 
-
-  * configure.ac, m4/ax_cxx_compile_stdcxx.m4: 
-  switch from C++03 to C++11 
-
-2016-07-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BasicDVIReader.h, src/Bitmap.h, src/CMap.h, src/CmdLineParserBase.h, 
-    src/DVIActions.h, src/Font.h, src/FontEncoding.h, src/FontMetrics.h, 
-    src/GFGlyphTracer.h, src/GFReader.h, src/GFTracer.h, src/GraphicsPath.h, 
-    src/InputBuffer.h, src/InputReader.h, src/MessageException.h, 
-    src/PSFilter.h, src/PSInterpreter.h, src/PSPattern.h, 
-    src/SVGCharHandler.h, src/SVGOutput.h, src/ShadingPatch.h, 
-    src/SpecialActions.h, src/SpecialHandler.h, src/StreamReader.h, 
-    src/StreamWriter.h, src/Subfont.h, src/VFActions.h, src/XMLNode.h: 
-  replaced empty virtual destructors with default ones 
-
-  * src/PsSpecialHandler.cpp: 
-  use unique_ptr rather than deprecated auto_ptr 
-
-  * clipper/clipper.hpp, src/BgColorSpecialHandler.h, src/Bitmap.cpp, 
-    src/CMap.h, src/CmdLineParserBase.h, src/ColorSpecialHandler.h, 
-    src/CommandLine.h, src/DVIReader.h, src/DVIToSVG.h, 
-    src/DVIToSVGActions.h, src/DvisvgmSpecialHandler.h, src/EPSToSVG.h, 
-    src/EmSpecialHandler.h, src/EncFile.h, src/Font.h, src/FontCache.cpp, 
-    src/FontEncoding.h, src/FontMetrics.h, src/GFGlyphTracer.h, 
-    src/GFReader.h, src/GFTracer.h, src/GlyphTracerMessages.h, 
-    src/GraphicsPath.h, src/HtmlSpecialHandler.h, src/InputBuffer.h, 
-    src/InputReader.h, src/JFM.h, src/MessageException.h, 
-    src/NoPsSpecialHandler.h, src/PSPattern.h, src/PSPreviewFilter.h, 
-    src/PapersizeSpecialHandler.h, src/PathClipper.cpp, 
-    src/PdfSpecialHandler.h, src/PreScanDVIReader.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/SVGCharPathHandler.h, src/SVGCharTspanTextHandler.h, src/SVGOutput.h, 
-    src/SVGSingleCharTextHandler.h, src/SpecialActions.h, src/TFM.h, 
-    src/TensorProductPatch.h, src/TpicSpecialHandler.h, 
-    src/TriangularPatch.h, src/VectorStream.h, src/XMLNode.h: 
-  mark overridden methods with 'override' keyword 
-
-  * src/Bitmap.cpp, src/BoundingBox.h, src/CMapManager.cpp, 
-    src/CmdLineParserBase.cpp, src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/DependencyGraph.h, 
-    src/DvisvgmSpecialHandler.cpp, src/EmSpecialHandler.cpp, 
-    src/FileFinder.cpp, src/FilePath.cpp, src/FilePath.h, src/Font.cpp, 
-    src/FontCache.cpp, src/FontEncoding.cpp, src/FontManager.cpp, 
-    src/FontMap.cpp, src/FontMap.h, src/GFReader.cpp, src/GFReader.h, 
-    src/GraphicsPath.h, src/HtmlSpecialHandler.cpp, src/NumericRanges.h, 
-    src/PSPattern.cpp, src/PsSpecialHandler.cpp, src/SVGTree.cpp, 
-    src/SVGTree.h, src/SpecialManager.cpp, src/SpecialManager.h, 
-    src/Subfont.cpp, src/Subfont.h, src/TpicSpecialHandler.cpp, 
-    src/XMLDocument.cpp, src/XMLNode.cpp, src/XMLString.cpp, src/macros.h: 
-  use range-based 'for' loop to iterate over containers; drop FORALL macro 
-
-2016-07-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BasicDVIReader.h, src/DVIActions.h, src/DVIReader.cpp, 
-    src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/FontManager.cpp, 
-    src/FontManager.h, src/PreScanDVIReader.h, src/dvisvgm.cpp: 
-  refactored the DVI reader classes
-- added higher-level template methods 
-  to process the DVI commands more safely
-- moved triggering of DVIActions 
-  from DVIReader to DVIToSVG 
-
-2016-06-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * xxHash/xxhash.c, xxHash/xxhash.h, xxHash/xxhsum.c: 
-  updated xxHash to version 0.6.1 
-
-  * src/BoundingBox.cpp, src/BoundingBox.h, src/DVIToSVG.cpp, 
-    src/dvisvgm.cpp: 
-  fixed computation of bounding boxes modified by relative --bbox argument 
-
-2016-06-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TFM.cpp, tests/JFMReaderTest.cpp, tests/TFMReaderTest.cpp: 
-  minor improvements to TFM/JFM tests 
-
-2016-06-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/GFReader.cpp: 
-  ensure validity of postpost command in GFReader::executePostamble() 
-
-  * src/DVIReader.cpp, src/VectorStream.h, tests/VectorStreamTest.cpp: 
-  refactored VectorStreamBuffer to keep constness of assigned vector 
-
-2016-06-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BoundingBox.cpp, src/BoundingBox.h, tests/BoundingBoxTest.cpp: 
-  fixed unit conversion in BoundingBox class 
-
-  * src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, 
-    tests/EmSpecialTest.cpp, tests/Makefile.am: 
-  improved the emTeX special handler; added EmSpecialTest 
-
-  * src/XMLNode.h: 
-  added ouput operators for the XML node objects 
-
-  * src/DvisvgmSpecialHandler.cpp, src/TFM.cpp, src/VFReader.cpp: 
-  replaced local definitions of pt2bp with Length::pt2bp 
-
-2016-06-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/Length.cpp, src/Length.h, tests/LengthTest.cpp: 
-  added dd, cc, and sp units to class Length; fixed factor pt2pc 
-
-2016-06-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * xxHash/xxhash-fileno.patch, xxHash/xxhsum.c: 
-  added xxHash test utility 'xxhsum' 
-
-  * src/DLLoader.cpp, src/DLLoader.h, src/Directory.cpp, src/Directory.h, 
-    src/FilePath.cpp, src/FilePath.h, src/FileSystem.cpp, src/GFTracer.cpp, 
-    src/Ghostscript.cpp, src/Ghostscript.h, src/Message.cpp, 
-    src/MetafontWrapper.cpp, src/Process.cpp, src/Terminal.cpp, 
-    src/Terminal.h, src/dvisvgm.cpp: 
-  cleaned up Windows-related #defines 
-
-  * xxHash/xxhash.c, xxHash/xxhash.h: 
-  updated xxHash to version 0.6.0 
-
-2016-06-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Length.cpp, src/Length.h, tests/LengthTest.cpp: 
-  added functions to convert between Length::Unit and std::string 
-
-  * src/CommandLine.cpp: 
-  removed redundant #includes 
-
-2016-06-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/SVGCharHandler.h: 
-  added missing initializer to class SVGCharHandler 
-
-  * src/CMapManager.cpp, src/CMapManager.h, src/DVIActions.h, 
-    src/DVIToSVGActions.h, src/DvisvgmSpecialHandler.h, src/Font.h, 
-    src/FontEngine.h, src/FontManager.h, src/HtmlSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.h, src/PSPattern.h, src/PSPreviewFilter.h, 
-    src/SVGCharHandler.cpp, src/SVGCharHandler.h, src/SVGCharPathHandler.cpp, 
-    src/SVGCharTspanTextHandler.cpp, src/SVGSingleCharTextHandler.cpp, 
-    src/SVGTree.h, src/SpecialActions.h, src/SpecialHandler.h, 
-    src/SpecialManager.h, src/XMLDocument.cpp, src/XMLNode.h, 
-    tests/XMLNodeTest.cpp: 
-  changed some structs to classes and replaced #includes with forward 
-  declarations 
-
-2016-06-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * CMakeLists.txt: 
-  updated CMakeLists.txt 
-
-  * doc/dvisvgm.txt.in, src/DVIToSVG.cpp, src/Makefile.am, 
-    src/PapersizeSpecialHandler.cpp, src/PapersizeSpecialHandler.h, 
-    src/PsSpecialHandler.cpp, src/dvisvgm.cpp: 
-  added evaluation of PS special 'papersize=' 
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/SVGTree.cpp, 
-    src/SVGTree.h: 
-  refactored processing of end-of-page (eop) commands 
-
-  * src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h, 
-    src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, src/DVIToSVG.cpp, 
-    src/DVIToSVGActions.cpp, src/DvisvgmSpecialHandler.cpp, 
-    src/DvisvgmSpecialHandler.h, src/EPSToSVG.cpp, src/EmSpecialHandler.cpp, 
-    src/EmSpecialHandler.h, src/HtmlSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.h, src/NoPsSpecialHandler.cpp, 
-    src/NoPsSpecialHandler.h, src/PSPattern.cpp, src/PSPattern.h, 
-    src/PdfSpecialHandler.cpp, src/PdfSpecialHandler.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/SpecialHandler.h, 
-    src/SpecialManager.cpp, src/SpecialManager.h, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h, tests/ColorSpecialTest.cpp, 
-    tests/DvisvgmSpecialTest.cpp: 
-  refactored handling of SpecialAction objects 
-
-2016-06-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp: 
-  fixed transformation of background color rectange 
-
-2016-05-31  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp, src/EPSToSVG.cpp: 
-  reworded messages printed after finishing a conversion 
-
-2016-05-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BasicDVIReader.cpp, src/BasicDVIReader.h, src/Bezier.h, 
-    src/TensorProductPatch.h, src/TriangularPatch.h: 
-  replaced leading spaces with tabs 
-
-  * src/DVIToSVGActions.cpp, src/Font.cpp, src/Makefile.am, 
-    src/SVGCharHandler.cpp, src/SVGCharHandler.h, 
-    src/SVGCharHandlerFactory.cpp, src/SVGCharHandlerFactory.h, 
-    src/SVGCharPathHandler.cpp, src/SVGCharPathHandler.h, 
-    src/SVGCharTspanTextHandler.cpp, src/SVGCharTspanTextHandler.h, 
-    src/SVGSingleCharTextHandler.cpp, src/SVGSingleCharTextHandler.h, 
-    src/SVGTree.cpp, src/SVGTree.h, src/dvisvgm.cpp: 
-  replaced static SVG text backend by specialized handler classes 
-
-2016-05-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BasicDVIReader.cpp, src/DVIReader.cpp: 
-  fixed handling of subfont index in native font definition of XDV 7 
-
-2016-05-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/XMLDocument.cpp, src/XMLNode.cpp, src/XMLNode.h, 
-    tests/DvisvgmSpecialTest.cpp: 
-  prevent line wrapping inside text nodes 
-
-2016-05-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README.md, doc/dvisvgm.txt.in, src/BasicDVIReader.cpp, 
-    src/BasicDVIReader.h, src/DVIReader.cpp: 
-  added support for XDV version 7 introduced by XeTeX 0.99995 
-
-2016-05-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TFM.cpp: 
-  prevent reading more than 7 TFM param values (fixes #58) 
-
-2016-05-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TFM.cpp, tests/JFMReaderTest.cpp, tests/TFMReaderTest.cpp: 
-  fixed calculation of character dimensions in TFM class 
-
-  * src/FontMetrics.h, src/JFM.cpp, src/TFM.cpp, src/TFM.h: 
-  added methods to query space-related parameters from TFM/JFM files 
-
-  * src/JFM.cpp, src/JFM.h, src/TFM.cpp, src/TFM.h: 
-  TFM: store design size in bp units rather than as fixword 
-
-2016-04-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Process.cpp: 
-  fixed collecting stdout/stderr output when executing a process 
-
-2016-04-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CMap.h, src/CMapReader.cpp, tests/CMapManagerTest.cpp, 
-    tests/Makefile.am, tests/data/Makefile.am, tests/data/ot1.cmap: 
-  added CMapManagerTest 
-
-2016-04-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, README, README.md: 
-  updated NEWS and README 
-
-  * .travis.yml, configure.ac, src/Doxyfile: 
-  set version to 1.15.1 
-
-2016-04-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/CMapReaderTest.cpp: 
-  improved CMapReaderTest 
-
-  * src/Matrix.cpp: 
-  avoid adding trailing EOF characters when parsing parameters of 
-  transformation commands 
-
-  * src/Calculator.cpp, src/Matrix.cpp: 
-  use std::ws to skip whitespace in istreams 
-
-2016-04-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/AGLTable.h, src/Makefile.am, src/Unicode.cpp, tests/Makefile.am, 
-    tests/create-makefile, tests/genhashcheck.py: 
-  moved AGL hash table from Unicode.cpp to a separate file 
-
-2016-04-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Unicode.cpp, tests/UnicodeTest.cpp: 
-  added support for the AGL character names 'uniFOO' and 'uFOO' 
-
-  * src/XMLDocument.cpp: 
-  explicitly specify UTF-8 encoding in XML declaration (closes #54) 
-
-2016-03-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/GraphicsPath.h: 
-  renamed GraphicsPath::sconito/scubicto 
-
-2016-03-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/SVGTree.cpp, src/SVGTree.h: 
-  split text and path section of SVGTree::appendChar() into seperate 
-  methods 
-
-  * src/DVIActions.h, src/DVIReader.cpp, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/SVGTree.cpp, src/SVGTree.h: 
-  changed font parameter of setFont() methods from pointer to reference 
-
-  * doc/db2html.xsl: 
-  adapted db2html to insert anchors for each option entry 
-
-  * transfer-cs: 
-  remove patch files after they've been transferred 
-
-2016-02-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-2016-02-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * .travis.yml, configure.ac, src/Doxyfile: 
-  set version to 1.15 
-
-  * src/FileFinder.cpp, src/FilePath.cpp, src/FileSystem.cpp, 
-    src/FileSystem.h, src/Font.cpp, src/MetafontWrapper.cpp, src/dvisvgm.cpp: 
-  changed string parameters of FileSystem functions to type std::string 
-
-  * src/Font.cpp, src/Unicode.cpp, src/Unicode.h, tests/UnicodeTest.cpp: 
-  renamed Unicode::psNameToCodepoint() to Unicode::aglNameToCodepoint 
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/Font.cpp, src/Font.h, src/SVGTree.cpp, src/SVGTree.h, 
-    src/dvisvgm.cpp, src/options.xml: 
-  added option --comments (adds comments with additional information to 
-  the SVG file 
-
-2016-02-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/FileFinder.cpp, src/FileFinder.h, 
-    tests/FileFinderTest.cpp, tests/GFGlyphTracerTest.cpp, 
-    tests/GFReaderTest.cpp, tests/JFMReaderTest.cpp, tests/Makefile.am, 
-    tests/TFMReaderTest.cpp, tests/cidjmgr0-h.tfm, tests/cmr10.600gf, 
-    tests/cmr10.tfm, tests/create-makefile, tests/data/Makefile.am, 
-    tests/data/cidjmgr0-h.tfm, tests/data/cmr10.600gf, tests/data/cmr10.tfm, 
-    tests/data/dvipdfm_test.map, tests/data/dvips_test.map, 
-    tests/data/frktest-nf-cmp.svg, tests/data/frktest-wf-cmp.svg, 
-    tests/data/frktest.dvi, tests/data/sample-nf-cmp.svg, 
-    tests/data/sample-wf-cmp.svg, tests/data/sample.dvi, 
-    tests/data/sample.sfd, tests/dvipdfm_test.map, tests/dvips_test.map, 
-    tests/frktest-nf-cmp.svg, tests/frktest-wf-cmp.svg, tests/frktest.dvi, 
-    tests/sample-nf-cmp.svg, tests/sample-wf-cmp.svg, tests/sample.dvi, 
-    tests/sample.sfd: 
-  moved test data files to subfolder 
-
-  * src/MetafontWrapper.cpp, src/Process.cpp: 
-  avoid reading Metafont logfiles to extract the GF filename 
-
-  * src/FontEngine.cpp: 
-  reworded error messages of class FontEngine 
-
-2016-02-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontEngine.cpp, src/FontEngine.h: 
-  removed redundant code from class FontEngine 
-
-  * src/XMLNode.cpp, tests/DvisvgmSpecialTest.cpp: 
-  improved DvisvgmSpecialTest 
-
-  * src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, 
-    tests/CommandLineTest.cpp: 
-  minor improvements of class CommandLineTest 
-
-2016-02-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp: 
-  don't remove clipping paths that consist of single moveto commands only 
-
-2016-02-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Bitmap.cpp, src/BoundingBox.cpp, src/CMap.cpp, src/CMapManager.cpp, 
-    src/Calculator.cpp, src/CommandLine.cpp, src/DVIReader.cpp, 
-    src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVGActions.cpp, 
-    src/Directory.cpp, src/Directory.h, src/EPSToSVG.cpp, src/EncFile.cpp, 
-    src/FileFinder.cpp, src/Font.cpp, src/FontCache.h, src/FontEngine.cpp, 
-    src/FontManager.cpp, src/FontMap.cpp, src/FontMetrics.cpp, 
-    src/GFGlyphTracer.cpp, src/GFReader.cpp, src/GFTracer.cpp, 
-    src/HtmlSpecialHandler.cpp, src/InputReader.cpp, src/MapLine.cpp, 
-    src/MetafontWrapper.cpp, src/PSInterpreter.cpp, 
-    src/PdfSpecialHandler.cpp, src/Process.cpp, src/PsSpecialHandler.cpp, 
-    src/SVGTree.cpp, src/SpecialManager.cpp, src/StreamReader.cpp, 
-    src/StreamWriter.cpp, src/Subfont.cpp, src/TFM.cpp, 
-    src/TensorProductPatch.cpp, src/TpicSpecialHandler.cpp, src/VFReader.cpp, 
-    src/XMLDocument.cpp, src/dvisvgm.cpp, tests/XMLStringTest.cpp: 
-  minor code cleanup (removed redundant includes, added casts) 
-
-2016-01-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/JFM.h, tests/JFMReaderTest.cpp, tests/Makefile.am, 
-    tests/TFMReaderTest.cpp, tests/cidjmgr0-h.tfm, tests/cmr10.tfm, 
-    tests/create-makefile: 
-  added tests for the TFM and JFM classes 
-
-  * m4/ax_code_coverage.m4: 
-  updated m4 code coverage script to latest version 
-
-2016-01-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, README.md: 
-  updated NEWS 
-
-  * .travis.yml, configure.ac, src/Doxyfile: 
-  set version to 1.14.2 
-
-  * src/GraphicsPath.h, tests/GraphicsPathTest.cpp: 
-  fixed access of invalid iterator 
-
-2016-01-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/Makefile.am, tests/create-makefile, tests/genhashcheck.py: 
-  added test to check the validity of the char name hashes used in 
-  Unicode.cpp 
-
-  * src/dvisvgm.cpp, xxHash/xxhash.c, xxHash/xxhash.h: 
-  updated xxHash to version 0.5.0 
-
-  * doc/db2html.xsl: 
-  updated links to Bootstrap and Font Awesome in stylesheet db2html.xsl 
-
-2016-01-15  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BgColorSpecialHandler.cpp, src/ColorSpecialHandler.cpp, 
-    src/ColorSpecialHandler.h, tests/ColorSpecialTest.cpp: 
-  removed check for 'background' special from ColorSpecialHandler 
-
-2016-01-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h, 
-    src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, src/DVIToSVG.cpp, 
-    src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h: 
-  corrected handling of background color special across DVI pages 
-
-  * src/DVIReader.h, src/FontStyle.h, src/SVGTree.cpp, 
-    src/TriangularPatch.cpp: 
-  updated/fixed some comments 
-
-2016-01-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * src/GFReader.cpp, src/GFReader.h: 
-  added checks for misplaced GF commands 
-
-2016-01-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * .travis.yml: 
-  force Travis to use legacy builds due to an issue with clang and gtest 
-
-  * .travis.yml, configure.ac, src/Doxyfile: 
-  set version to 1.14.1 
-
-  * Makefile.am, README, README.md, configure.ac, doc/Makefile.am, 
-    doc/conf-dblatex-man.xsl, doc/conf-dblatex-pdf.xsl, doc/db2html.xsl, 
-    doc/dvisvgm.txt.in, src/BasicDVIReader.cpp, src/BasicDVIReader.h, 
-    src/Bezier.cpp, src/Bezier.h, src/BgColorSpecialHandler.cpp, 
-    src/BgColorSpecialHandler.h, src/Bitmap.cpp, src/Bitmap.h, 
-    src/BoundingBox.cpp, src/BoundingBox.h, src/CMap.cpp, src/CMap.h, 
-    src/CMapManager.cpp, src/CMapManager.h, src/CMapReader.cpp, 
-    src/CMapReader.h, src/CRC32.cpp, src/CRC32.h, src/Calculator.cpp, 
-    src/Calculator.h, src/CharMapID.cpp, src/CharMapID.h, src/Character.h, 
-    src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, src/Color.cpp, 
-    src/Color.h, src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/CommandLine.cpp, src/CommandLine.h, src/DLLoader.cpp, src/DLLoader.h, 
-    src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, 
-    src/DVIToSVG.h, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/DependencyGraph.h, src/Directory.cpp, src/Directory.h, 
-    src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
-    src/EPSFile.cpp, src/EPSFile.h, src/EPSToSVG.cpp, src/EPSToSVG.h, 
-    src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, src/EncFile.cpp, 
-    src/EncFile.h, src/FileFinder.cpp, src/FileFinder.h, src/FilePath.cpp, 
-    src/FilePath.h, src/FileSystem.cpp, src/FileSystem.h, src/Font.cpp, 
-    src/Font.h, src/FontCache.cpp, src/FontCache.h, src/FontEncoding.cpp, 
-    src/FontEncoding.h, src/FontEngine.cpp, src/FontEngine.h, 
-    src/FontManager.cpp, src/FontManager.h, src/FontMap.cpp, src/FontMap.h, 
-    src/FontMetrics.cpp, src/FontMetrics.h, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.h, src/GFReader.cpp, src/GFReader.h, src/GFTracer.cpp, 
-    src/GFTracer.h, src/Ghostscript.cpp, src/Ghostscript.h, src/Glyph.h, 
-    src/GlyphTracerMessages.h, src/GraphicsPath.h, 
-    src/HtmlSpecialHandler.cpp, src/HtmlSpecialHandler.h, 
-    src/InputBuffer.cpp, src/InputBuffer.h, src/InputReader.cpp, 
-    src/InputReader.h, src/JFM.cpp, src/JFM.h, src/Length.cpp, src/Length.h, 
-    src/Makefile.am, src/Makefile.old, src/MapLine.cpp, src/MapLine.h, 
-    src/Matrix.cpp, src/Matrix.h, src/Message.cpp, src/Message.h, 
-    src/MessageException.h, src/MetafontWrapper.cpp, src/MetafontWrapper.h, 
-    src/MiKTeXCom.cpp, src/MiKTeXCom.h, src/NoPsSpecialHandler.cpp, 
-    src/NoPsSpecialHandler.h, src/NumericRanges.h, src/PSFilter.h, 
-    src/PSInterpreter.cpp, src/PSInterpreter.h, src/PSPattern.cpp, 
-    src/PSPattern.h, src/PSPreviewFilter.cpp, src/PSPreviewFilter.h, 
-    src/PageRanges.cpp, src/PageRanges.h, src/PageSize.cpp, src/PageSize.h, 
-    src/Pair.h, src/PathClipper.cpp, src/PathClipper.h, 
-    src/PdfSpecialHandler.cpp, src/PdfSpecialHandler.h, 
-    src/PreScanDVIReader.cpp, src/PreScanDVIReader.h, src/Process.cpp, 
-    src/Process.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/RangeMap.cpp, src/RangeMap.h, src/SVGOutput.cpp, src/SVGOutput.h, 
-    src/SVGTree.cpp, src/SVGTree.h, src/SWFWriter.cpp, src/SWFWriter.h, 
-    src/ShadingPatch.cpp, src/ShadingPatch.h, src/SignalHandler.cpp, 
-    src/SignalHandler.h, src/SpecialActions.h, src/SpecialHandler.h, 
-    src/SpecialManager.cpp, src/SpecialManager.h, src/StreamReader.cpp, 
-    src/StreamReader.h, src/StreamWriter.cpp, src/StreamWriter.h, 
-    src/Subfont.cpp, src/Subfont.h, src/System.cpp, src/System.h, 
-    src/TFM.cpp, src/TFM.h, src/TensorProductPatch.cpp, 
-    src/TensorProductPatch.h, src/Terminal.cpp, src/Terminal.h, 
-    src/ToUnicodeMap.cpp, src/ToUnicodeMap.h, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h, src/TriangularPatch.cpp, src/TriangularPatch.h, 
-    src/Unicode.cpp, src/Unicode.h, src/VFActions.h, src/VFReader.cpp, 
-    src/VFReader.h, src/VectorIterator.h, src/VectorStream.h, 
-    src/XMLDocument.cpp, src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h, 
-    src/XMLString.cpp, src/XMLString.h, src/dvisvgm.cpp, src/macros.h, 
-    src/options.dtd, src/options.ggo, src/options.xml, src/psdefs.cpp, 
-    src/psdefs.ps, src/types.h, tests/BezierTest.cpp, tests/BitmapTest.cpp, 
-    tests/BoundingBoxTest.cpp, tests/CMapReaderTest.cpp, tests/CMapTest.cpp, 
-    tests/CRC32Test.cpp, tests/CalculatorTest.cpp, 
-    tests/ColorSpecialTest.cpp, tests/ColorTest.cpp, 
-    tests/CommandLineTest.cpp, tests/DependencyGraphTest.cpp, 
-    tests/DirectoryTest.cpp, tests/DvisvgmSpecialTest.cpp, 
-    tests/FileFinderTest.cpp, tests/FilePathTest.cpp, 
-    tests/FileSystemTest.cpp, tests/FontManagerTest.cpp, 
-    tests/FontMapTest.cpp, tests/GFGlyphTracerTest.cpp, 
-    tests/GFReaderTest.cpp, tests/GraphicsPathTest.cpp, tests/LengthTest.cpp, 
-    tests/Makefile.am, tests/MapLineTest.cpp, tests/MatrixTest.cpp, 
-    tests/MessageExceptionTest.cpp, tests/PSInterpreterTest.cpp, 
-    tests/PageRagesTest.cpp, tests/PageSizeTest.cpp, tests/PairTest.cpp, 
-    tests/RangeMapTest.cpp, tests/SVGOutputTest.cpp, 
-    tests/ShadingPatchTest.cpp, tests/SplittedCharInputBufferTest.cpp, 
-    tests/StreamInputBufferTest.cpp, tests/StreamReaderTest.cpp, 
-    tests/StreamWriterTest.cpp, tests/SubfontTest.cpp, 
-    tests/TensorProductPatchTest.cpp, tests/ToUnicodeMapTest.cpp, 
-    tests/TriangularPatchTest.cpp, tests/TypesTest.cpp, 
-    tests/UnicodeTest.cpp, tests/VectorIteratorTest.cpp, 
-    tests/VectorStreamTest.cpp, tests/XMLNodeTest.cpp, 
-    tests/XMLStringTest.cpp, tests/check-conv, tests/create-makefile, 
-    tests/normalize.xsl: 
-  updated year in copyright statements to 2016 
-
-2015-12-31  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp, src/PsSpecialHandler.h: 
-  reset PS graphics state at end of every DVI page 
-
-2015-12-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * .travis.yml, configure.ac, src/Doxyfile: 
-  set version to 1.14 
-
-2015-12-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp: 
-  added evaluation of PSTricks specials 'pst:' and 'PST:' 
-
-2015-12-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/GraphicsPath.h, tests/GraphicsPathTest.cpp: 
-  fixed memory issue in class GraphicsPath<T> 
-
-  * src/FileFinder.cpp: 
-  lookup files in the current working directory before searching the texmf 
-  tree 
-
-2015-12-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/EPSToSVG.h, 
-    src/PSPreviewFilter.cpp, src/PSPreviewFilter.h, src/PsSpecialHandler.cpp, 
-    src/SpecialActions.h, src/dvisvgm.cpp: 
-  added option --bbox=preview; adapt preview data if --bbox=min 
-
-2015-12-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/GhostscriptTest.cpp: 
-  prevent opening a graphics window when running GhostscriptTest 
-
-  * src/FileFinder.cpp: 
-  return entire kpathsea version string if it doesn't start with 
-  'kpathsea' 
-
-2015-12-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * clipper/clipper.cpp, clipper/clipper.hpp: 
-  replaced DOS line endings of the Clipper sources to Unix ones 
-
-  * NEWS: 
-  updated NEWS 
-
-  * .travis.yml, configure.ac, src/Doxyfile: 
-  set version to 1.13 
-
-2015-12-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * CMakeLists.txt, src/Font.cpp, src/Font.h, src/Glyph.h, 
-    src/GraphicPath.h, src/GraphicsPath.h, src/Makefile.am, 
-    src/PathClipper.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/ShadingPatch.h, src/TensorProductPatch.cpp, src/TensorProductPatch.h, 
-    src/TpicSpecialHandler.cpp, src/TriangularPatch.cpp, 
-    src/TriangularPatch.h, tests/GraphicPathTest.cpp, 
-    tests/GraphicsPathTest.cpp, tests/Makefile.am, 
-    tests/TensorProductPatchTest.cpp, tests/TriangularPatchTest.cpp: 
-  renamed class GraphicPath to GraphicsPath 
-
-2015-11-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/GraphicPath.h, src/PsSpecialHandler.cpp: 
-  remove redundant moveto commands from graphics paths 
-
-  * doc/dvisvgm.txt.in: 
-  added a couple of links to the manpage 
-
-2015-11-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * .gitignore, CMakeLists.txt, cmake/FindGhostscript.cmake, 
-    cmake/FindKpathsea.cmake, cmake/FindPotrace.cmake: 
-  added files for cmake 
-
-2015-11-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVGActions.cpp, src/DVIToSVGActions.h: 
-  removed redundant methods 
-
-  * src/DVIToSVGActions.cpp, src/EPSToSVG.cpp: 
-  remove progress message before printing a PS error message 
-
-2015-11-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * xxHash/xxhash.c: 
-  updated xxHash to version r42 
-
-  * src/psdefs.cpp, src/psdefs.ps: 
-  added evaluation of PS operators ashow, awidthshow, and widthshow (fixes 
-  #49) 
-
-2015-11-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.cpp, src/psdefs.ps: 
-  propagate call of PS operator 'setcolor' to the PS handler 
-
-  * src/psdefs.cpp, src/psdefs.ps: 
-  reduce rounding errors produced by PS operator 'charpath' 
-
-  * src/PsSpecialHandler.cpp, src/psdefs.cpp, src/psdefs.ps: 
-  minor code cleanup and reordering 
-
-2015-11-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * .travis.yml, configure.ac, src/Doxyfile: 
-  set version to 1.12 
-
-2015-11-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontEngine.cpp: 
-  treat character code as character index if no font mapping is set 
-
-  * src/FontManager.cpp: 
-  removed redundant #include 
-
-2015-11-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README, README.md: 
-  updated links to Google Test framework 
-
-2015-11-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/Color.cpp, src/Color.h, src/CommandLine.cpp, 
-    src/CommandLine.h, src/DVIToSVGActions.cpp, 
-    src/DvisvgmSpecialHandler.cpp, src/EmSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.cpp, src/PSPattern.cpp, src/PsSpecialHandler.cpp, 
-    src/SVGTree.cpp, src/TpicSpecialHandler.cpp, src/dvisvgm.cpp, 
-    src/options.xml, tests/ColorTest.cpp: 
-  added option --colornames to replace RGB color values with SVG color 
-  names 
-
-  * tests/Makefile.am, tests/ShadingPatch.cpp, tests/ShadingPatchTest.cpp: 
-  renamed ShadingPatchTest 
-
-  * src/Color.cpp, src/Color.h, src/ColorSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.cpp, tests/ColorTest.cpp: 
-  renamed Color::setName() to Color::setPSName() 
-
-2015-10-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Process.cpp, src/Process.h: 
-  fixed invalid access to freed string memory 
-
-2015-09-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, README, README.md: 
-  updated NEWS and README files 
-
-2015-09-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * .travis.yml, configure.ac, src/Doxyfile: 
-  set version to 1.11 
-
-2015-09-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/Unicode.cpp, src/Unicode.h, tests/UnicodeTest.cpp: 
-  renamed Unicode::psName2Codepoint to Unicode::psNameToCodepoint 
-
-  * src/Font.cpp, src/ToUnicodeMap.cpp, src/Unicode.cpp, src/Unicode.h, 
-    tests/UnicodeTest.cpp: 
-  improved handling of invalid Unicode points 
-
-2015-09-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/HtmlSpecialHandler.cpp: 
-  quote XML metacharacters in xlink:title attributes 
-
-  * src/Font.cpp: 
-  prevent creating 0x00 codepoints if PS character name is unknown 
-
-2015-09-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/SVGTree.cpp: 
-  force creating a new text element after appending a different node to 
-  the page 
-
-2015-08-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README, README.md: 
-  minor updates to README and README.md 
-
-2015-07-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/CommandLineTest.cpp, tests/MessageExceptionTest.cpp: 
-  use ASSERT_STREQ in tests 
-
-  * tests/UnicodeTest.cpp: 
-  improved UnicodeTest 
-
-  * tests/GhostscriptTest.cpp, tests/Makefile.am: 
-  added GhostscriptTest 
-
-2015-07-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README, README.md, doc/dvisvgm.txt.in: 
-  updated links to project website again (relocated to 
-  dvisvgm.bplaced.net) 
-
-2015-07-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README, README.md, doc/dvisvgm.txt.in: 
-  updated info about new project website 
-
-2015-07-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * .travis.yml, configure.ac, src/Doxyfile: 
-  set version to 1.10 
-
-2015-07-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README.md, doc/dvisvgm.txt.in, src/BasicDVIReader.cpp, 
-    src/BasicDVIReader.h, src/DVIReader.cpp, src/DVIReader.h, src/Font.h, 
-    src/FontManager.cpp, src/FontManager.h: 
-  added support for new XDV format 6 
-
-2015-07-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README, README.md: 
-  updated README 
-
-2015-07-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/MiKTeXCom.cpp: 
-  added some comments to MiKTeXCom.cpp 
-
-  * src/dvisvgm.cpp: 
-  check for option --help before initializing the FileFinder 
-
-2015-07-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/Makefile.am, src/Unicode.cpp, src/Unicode.h, 
-    tests/Makefile.am, tests/create-makefile: 
-  added mapping from character names to unicode for PostScript fonts 
-
-  * Makefile.am, configure.ac, xxHash/LICENSE, xxHash/Makefile.am, 
-    xxHash/xxhash.c, xxHash/xxhash.h: 
-  added xxHash library (https://github.com/Cyan4973/xxHash) 
-
-  * tests/BezierTest.cpp: 
-  removed #include "debug.h" from test 
-
-2015-04-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/SVGTree.cpp: 
-  apply --precision settings to font-size attributes too 
-
-  * NEWS, README.md: 
-  updated NEWS and README.md 
-
-  * .travis.yml, configure.ac, src/Doxyfile: 
-  set version to 1.9.2 
-
-2015-04-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/SVGOutputTest.cpp: 
-  remove output files created by SVGOutputTest::getPageStream() 
-
-2015-04-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README.md: 
-  minor additions to README.md 
-
-2015-03-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/GFReader.cpp, src/GFReader.h, tests/GFReaderTest.cpp: 
-  improved GFReaderTest 
-
-  * src/GlyphTracerMessages.h: 
-  always skip tracer message if no glyphs have been traced 
-
-2015-03-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp: 
-  avoid retracing of fonts if option --no-fonts is given 
-
-  * src/GFGlyphTracer.cpp, src/GFTracer.h, tests/GFGlyphTracerTest.cpp, 
-    tests/Makefile.am: 
-  ensure GFGlyphTracer::executeChar() returns the correct status; added 
-  GFGlyphtracerTest 
-
-2015-03-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/SVGOutputTest.cpp: 
-  improved SVGOutputTest 
-
-  * tests/StreamWriterTest.cpp: 
-  fixed StreamWriterTest 
-
-2015-03-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/Makefile.am, tests/ShadingPatch.cpp: 
-  added ShadingPatchTest 
-
-2015-03-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TensorProductPatch.h, tests/TensorProductPatchTest.cpp: 
-  improved TensorProductPatchTest 
-
-  * src/Bezier.cpp, src/Bezier.h, src/TensorProductPatch.cpp, 
-    src/TriangularPatch.cpp, src/TriangularPatch.h, 
-    tests/TriangularPatchTest.cpp: 
-  renamed method pointAt() of class Bezier and TriangularPatch to 
-  valueAt() 
-
-  * src/ShadingPatch.h, src/TensorProductPatch.cpp, 
-    src/TensorProductPatch.h, src/TriangularPatch.cpp, src/TriangularPatch.h, 
-    tests/Makefile.am, tests/TriangularPatchTest.cpp: 
-  added test for class  TriangularPatch 
-
-2015-03-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * autogen.sh: 
-  updated autogen.sh 
-
-2015-03-15  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/Makefile.am, tests/VectorIteratorTest.cpp: 
-  added VectorIteratorTest 
-
-  * Makefile.am, clipper/Makefile.am, configure.ac, m4/ax_code_coverage.m4, 
-    src/Makefile.am, tests/Makefile.am, tests/create-makefile: 
-  extended build system to generate coverage reports 
-
-  * src/XMLNode.cpp, src/XMLNode.h, tests/Makefile.am, 
-    tests/XMLNodeTest.cpp: 
-  fixed a few issues in class XMLElementNode; added XMLNodeTest 
-
-2015-03-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/XMLStringTest.cpp: 
-  fixed test class name of XMLString 
-
-2015-03-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/GraphicPathTest.cpp: 
-  extended tests of class GraphicPath 
-
-  * tests/CRC32Test.cpp: 
-  added test for 'compute' methods of class CRC32 
-
-2015-03-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/StreamReaderTest.cpp: 
-  exteded StreamReader tests 
-
-2015-03-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * .gitignore: 
-  added .gitignore 
-
-  * src/XMLString.cpp, tests/Makefile.am, tests/XMLStringTest.cpp: 
-  fixed conversion from C and C++ strings to XMLString; added 
-  XMLStringTest 
-
-2015-03-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BoundingBox.cpp, src/BoundingBox.h, tests/BoundingBoxTest.cpp: 
-  improved BoundingBox tests 
-
-  * src/Bitmap.cpp, src/Bitmap.h, tests/BitmapTest.cpp, 
-    tests/GFReaderTest.cpp, tests/Makefile.am: 
-  small refactorings of class Bitmap; added tests for class Bitmap 
-
-2015-03-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README.md: 
-  added license badge to README.md 
-
-  * .travis.yml: 
-  Travis conf: added configuration data for Coverity Scan 
-
-2015-02-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, README.md: 
-  updated NEWS and README.md 
-
-2015-02-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Calculator.cpp: 
-  replaced while(1) with for(;;) for consistency 
-
-2015-02-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.9.1 
-
-2015-02-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Ghostscript.cpp: 
-  disable lookup of GS library in Windows registry for old gcc versions 
-
-2015-02-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/Makefile.am, doc/db2html.xsl, doc/dvisvgm.css: 
-  create html manpage with a separate stylesheet matching the new website 
-  theme 
-
-  * doc/Makefile.am, doc/conf-dblatex-man.xsl, doc/conf-dblatex-pdf.xsl, 
-    doc/dvisvgm.sty, doc/dvisvgm.xpr, doc/tweak-dblatex-pdf.xsl: 
-  improved the layout of the pdf manpage 
-
-  * doc/dvisvgm.txt.in: 
-  minor additions and formatting changes of the manpage 
-
-  * src/DVIToSVG.cpp, src/EPSToSVG.cpp, src/Makefile.am, src/SVGOutput.cpp, 
-    src/SVGOutput.h, src/SVGOutputBase.h, src/dvisvgm.cpp: 
-  moved class SVGOutput to separate compilation unit 
-
-2015-02-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * .travis.yml: 
-  Travis conf: build gtest libraries since Ubuntu doesn't provide the 
-  binaries 
-
-  * .travis.yml: 
-  Travis conf: added missing call of 'configure' 
-
-  * .travis.yml: 
-  added dependency 'libgtest-dev' to Travis configuration; ensure call of 
-  'make check' 
-
-  * .travis.yml: 
-  added dependency 'python-lxml' to Travis configuration 
-
-  * .travis.yml: 
-  added configuration file for Travis CI 
-
-2015-02-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TpicSpecialHandler.cpp: 
-  use constant M_PI rather than computing PI locally 
-
-2015-01-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TensorProductPatch.cpp, src/TriangularPatch.cpp: 
-  renamed static helper function clip() to snap() 
-
-2015-01-15  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Color.cpp: 
-  resolved ambiguous call of pow (patch by Peter Breitenlohner) 
-
-2015-01-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/VectorIterator.h: 
-  removed redundant method VectorIterator::distanceToLast() 
-
-2014-12-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * Makefile.am, README, README.md, configure.ac, doc/Makefile.am, 
-    doc/dvisvgm.txt.in, src/BasicDVIReader.cpp, src/BasicDVIReader.h, 
-    src/Bezier.cpp, src/Bezier.h, src/BgColorSpecialHandler.cpp, 
-    src/BgColorSpecialHandler.h, src/Bitmap.cpp, src/Bitmap.h, 
-    src/BoundingBox.cpp, src/BoundingBox.h, src/CMap.cpp, src/CMap.h, 
-    src/CMapManager.cpp, src/CMapManager.h, src/CMapReader.cpp, 
-    src/CMapReader.h, src/CRC32.cpp, src/CRC32.h, src/Calculator.cpp, 
-    src/Calculator.h, src/CharMapID.cpp, src/CharMapID.h, src/Character.h, 
-    src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, src/Color.cpp, 
-    src/Color.h, src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/CommandLine.cpp, src/CommandLine.h, src/DLLoader.cpp, src/DLLoader.h, 
-    src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, 
-    src/DVIToSVG.h, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/DependencyGraph.h, src/Directory.cpp, src/Directory.h, 
-    src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
-    src/EPSFile.cpp, src/EPSFile.h, src/EPSToSVG.cpp, src/EPSToSVG.h, 
-    src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, src/EncFile.cpp, 
-    src/EncFile.h, src/FileFinder.cpp, src/FileFinder.h, src/FilePath.cpp, 
-    src/FilePath.h, src/FileSystem.cpp, src/FileSystem.h, src/Font.cpp, 
-    src/Font.h, src/FontCache.cpp, src/FontCache.h, src/FontEncoding.cpp, 
-    src/FontEncoding.h, src/FontEngine.cpp, src/FontEngine.h, 
-    src/FontManager.cpp, src/FontManager.h, src/FontMap.cpp, src/FontMap.h, 
-    src/FontMetrics.cpp, src/FontMetrics.h, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.h, src/GFReader.cpp, src/GFReader.h, src/GFTracer.cpp, 
-    src/GFTracer.h, src/Ghostscript.cpp, src/Ghostscript.h, src/Glyph.h, 
-    src/GlyphTracerMessages.h, src/GraphicPath.h, src/HtmlSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.h, src/InputBuffer.cpp, src/InputBuffer.h, 
-    src/InputReader.cpp, src/InputReader.h, src/JFM.cpp, src/JFM.h, 
-    src/Length.cpp, src/Length.h, src/Makefile.am, src/Makefile.old, 
-    src/MapLine.cpp, src/MapLine.h, src/Matrix.cpp, src/Matrix.h, 
-    src/Message.cpp, src/Message.h, src/MessageException.h, 
-    src/MetafontWrapper.cpp, src/MetafontWrapper.h, src/MiKTeXCom.cpp, 
-    src/MiKTeXCom.h, src/NoPsSpecialHandler.cpp, src/NoPsSpecialHandler.h, 
-    src/NumericRanges.h, src/PSFilter.h, src/PSInterpreter.cpp, 
-    src/PSInterpreter.h, src/PSPattern.cpp, src/PSPattern.h, 
-    src/PSPreviewFilter.cpp, src/PSPreviewFilter.h, src/PageRanges.cpp, 
-    src/PageRanges.h, src/PageSize.cpp, src/PageSize.h, src/Pair.h, 
-    src/PathClipper.cpp, src/PathClipper.h, src/PdfSpecialHandler.cpp, 
-    src/PdfSpecialHandler.h, src/PreScanDVIReader.cpp, 
-    src/PreScanDVIReader.h, src/Process.cpp, src/Process.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/RangeMap.cpp, 
-    src/RangeMap.h, src/SVGOutputBase.h, src/SVGTree.cpp, src/SVGTree.h, 
-    src/SWFWriter.cpp, src/SWFWriter.h, src/ShadingPatch.cpp, 
-    src/ShadingPatch.h, src/SignalHandler.cpp, src/SignalHandler.h, 
-    src/SpecialActions.h, src/SpecialHandler.h, src/SpecialManager.cpp, 
-    src/SpecialManager.h, src/StreamReader.cpp, src/StreamReader.h, 
-    src/StreamWriter.cpp, src/StreamWriter.h, src/Subfont.cpp, src/Subfont.h, 
-    src/System.cpp, src/System.h, src/TFM.cpp, src/TFM.h, 
-    src/TensorProductPatch.cpp, src/TensorProductPatch.h, src/Terminal.cpp, 
-    src/Terminal.h, src/ToUnicodeMap.cpp, src/ToUnicodeMap.h, 
-    src/TpicSpecialHandler.cpp, src/TpicSpecialHandler.h, 
-    src/TriangularPatch.cpp, src/TriangularPatch.h, src/Unicode.cpp, 
-    src/Unicode.h, src/VFActions.h, src/VFReader.cpp, src/VFReader.h, 
-    src/VectorIterator.h, src/VectorStream.h, src/XMLDocument.cpp, 
-    src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h, src/XMLString.cpp, 
-    src/XMLString.h, src/dvisvgm.cpp, src/gfprint.mak, src/macros.h, 
-    src/options.dtd, src/options.xml, src/psdefs.cpp, src/psdefs.ps, 
-    src/types.h, tests/BoundingBoxTest.cpp, tests/CMapReaderTest.cpp, 
-    tests/CMapTest.cpp, tests/CRC32Test.cpp, tests/CalculatorTest.cpp, 
-    tests/ColorSpecialTest.cpp, tests/ColorTest.cpp, 
-    tests/CommandLineTest.cpp, tests/DependencyGraphTest.cpp, 
-    tests/DirectoryTest.cpp, tests/DvisvgmSpecialTest.cpp, 
-    tests/FileFinderTest.cpp, tests/FilePathTest.cpp, 
-    tests/FileSystemTest.cpp, tests/FontManagerTest.cpp, 
-    tests/FontMapTest.cpp, tests/GFReaderTest.cpp, tests/GraphicPathTest.cpp, 
-    tests/LengthTest.cpp, tests/Makefile.am, tests/MapLineTest.cpp, 
-    tests/MatrixTest.cpp, tests/MessageExceptionTest.cpp, 
-    tests/PSInterpreterTest.cpp, tests/PageRagesTest.cpp, 
-    tests/PageSizeTest.cpp, tests/PairTest.cpp, tests/RangeMapTest.cpp, 
-    tests/SplittedCharInputBufferTest.cpp, tests/StreamInputBufferTest.cpp, 
-    tests/StreamReaderTest.cpp, tests/StreamWriterTest.cpp, 
-    tests/SubfontTest.cpp, tests/TensorProductPatchTest.cpp, 
-    tests/ToUnicodeMapTest.cpp, tests/TypesTest.cpp, 
-    tests/VectorStreamTest.cpp, tests/check-conv, tests/create-makefile, 
-    tests/normalize.xsl: 
-  updated year in copyright statements to 2015 
-
-2014-12-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.9 
-
-  * src/dvisvgm.cpp: 
-  clear line before printing the message about user interruption to avoid 
-  trailing text fragments 
-
-  * src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/EPSToSVG.cpp, 
-    src/EPSToSVG.h, src/SpecialActions.h, src/SpecialManager.cpp, 
-    src/dvisvgm.cpp: 
-  show PS instruction counter when processing EPS files with option 
-  --progress 
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/ShadingPatch.h, 
-    src/TensorProductPatch.cpp, src/TensorProductPatch.h, 
-    src/TriangularPatch.cpp, src/TriangularPatch.h, src/dvisvgm.cpp, 
-    src/options.xml: 
-  added command-line options --grad-overlap, --grad-segments, and 
-  --grad-simplify 
-
-2014-12-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp: 
-  check validity of DVI file before trying to collect the BOPs 
-
-2014-12-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Color.cpp, src/Color.h, src/Makefile.am, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/VectorIterator.h, src/psdefs.cpp, 
-    src/psdefs.ps: 
-  extended PS operator 'shfill' to support triangular patch meshes 
-
-  * src/Makefile.am, src/PsSpecialHandler.cpp, src/ShadingPatch.cpp, 
-    src/ShadingPatch.h, src/TensorProductPatch.cpp, src/TensorProductPatch.h: 
-  extracted common interface class ShadingPatch from TensorProductPatch 
-
-  * src/Makefile.am, src/TriangularPatch.cpp, src/TriangularPatch.h: 
-  added class to compute triangular shading patches 
-
-2014-12-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp, src/PsSpecialHandler.h: 
-  added processing of the optional 'BBox' entry in a PS shading dictionary 
-
-2014-12-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Color.cpp, tests/ColorSpecialTest.cpp, tests/ColorTest.cpp: 
-  fixed CMYK to RGB approximation 
-
-  * src/CommandLine.cpp, src/CommandLine.h, src/dvisvgm.cpp, 
-    src/options.xml: 
-  disable option --clipjoin if PS support is disabled 
-
-2014-11-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PSInterpreter.cpp, src/PSInterpreter.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/psdefs.cpp, src/psdefs.ps, 
-    tests/PSInterpreterTest.cpp: 
-  added evaluation of PS operator "shfill" (Coons and tensor product 
-  patches only) 
-
-2014-11-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README.md: 
-  added list of features and a download button to README.md 
-
-2014-11-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/MiKTeXCom.cpp: 
-  added missing includes to make MinGW-w64 happy 
-
-2014-11-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * clipper/clipper.cpp, clipper/clipper.hpp: 
-  updated clipper library to version 6.2.1 
-
-2014-11-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Bezier.cpp, src/Bezier.h, src/BoundingBox.h, src/GraphicPath.h, 
-    src/Makefile.am, src/TensorProductPatch.cpp, src/TensorProductPatch.h, 
-    tests/Makefile.am, tests/TensorProductPatchTest.cpp: 
-  added code to compute tensor-product patches required for gradient fills 
-
-2014-11-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Matrix.cpp: 
-  use constant M_PI rather than defining PI locally 
-
-2014-10-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Color.cpp, src/Color.h, tests/ColorTest.cpp: 
-  added deltaE and L*a*b* color space methods to class Color 
-
-  * src/Color.cpp, src/Color.h: 
-  replaced vectors with valarrays in class Color 
-
-  * src/Color.cpp, src/Color.h, src/ColorSpecialHandler.cpp, 
-    src/DVIReader.cpp, src/HtmlSpecialHandler.cpp, src/PsSpecialHandler.cpp, 
-    tests/ColorTest.cpp: 
-  renamed RGB setters/getters of class Color 
-
-  * src/Color.cpp, src/Color.h, src/ColorSpecialHandler.cpp, 
-    src/PsSpecialHandler.cpp, tests/ColorTest.cpp: 
-  replaced float by double in class Color 
-
-2014-10-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/GraphicPath.h, src/PathClipper.cpp, src/PathClipper.h, 
-    src/XMLNode.h: 
-  fixed a couple of doxygen comments; removed redundant 
-  PathClipperException 
-
-  * clipper/clipper.cpp, clipper/clipper.hpp: 
-  updated clipper library to version 6.2.0 
-
-2014-10-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Ghostscript.cpp: 
-  try to lookup the location of the GS DLL in the Windows registry 
-
-  * src/CommandLine.cpp: 
-  updated CommandLine.cpp with description of option --no-merge 
-
-2014-10-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/options.xml: 
-  added info about option --no-merge to the manpage 
-
-2014-09-24  Khaled Hosny  <khaled.hosny at hindawi.com>
-
-  * src/Makefile.am: 
-  Add an opt2cpp Python script
-
-A very ugly script that should work as a 
-  drop in replacement for the
-opt2cpp XSLT. 
-
-2014-09-15  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp, src/PsSpecialHandler.h: 
-  ensure that colors set by a color special are always considered by the 
-  PS handler 
-
-2014-09-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BasicDVIReader.cpp, src/DVIReader.cpp, src/FontCache.cpp, 
-    src/GFReader.cpp, src/dvisvgm.cpp: 
-  replaced namespace 'ios_base' with 'ios' 
-
-2014-08-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.8.1 
-
-  * src/FontEngine.cpp, tests/PageRagesTest.cpp: 
-  removed unused static functions 
-
-  * src/PsSpecialHandler.cpp: 
-  added missing whitespace boundaries in PS code 
-
-2014-08-20  Khaled Hosny  <khaled.hosny at hindawi.com>
-
-  * src/CommandLine.cpp, src/CommandLine.h, src/SVGTree.cpp, src/SVGTree.h, 
-    src/dvisvgm.cpp, src/options.xml: 
-  Add an option not to merge adjacent chars
-
-With this option on, each DVI 
-  character is put in its own <text> tag.
-Makes post processing the SVG 
-  file a bit simpler. 
-
-2014-08-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp, src/DependencyGraph.h, src/Makefile.am, 
-    src/SVGTree.cpp, src/SVGTree.h, src/XMLNode.cpp, src/XMLNode.h, 
-    tests/DependencyGraphTest.cpp, tests/Makefile.am: 
-  remove redundant clipPath elements from generated SVG files 
-
-2014-08-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PSPattern.cpp, src/XMLNode.cpp, src/XMLNode.h: 
-  renamed XMLElementNode::findDescendants() and made it constant 
-
-2014-08-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/Makefile.am, tests/create-makefile: 
-  link tests against FreeType library 
-
-2014-08-10  Khaled Hosny  <khaledhosny at eglug.org>
-
-  * configure.ac, src/Makefile.am: 
-  Don't override CPPFLAGS and LDFLAGS in configure
-
-For the same reasons 
-  as the previous commit 
-
-  * configure.ac, src/Makefile.am: 
-  Don't override CXXFLAGS in configure script
-
-Breaks standard things 
-  like:
-
-     make CXXFLAGS="-g -O0 -pg" 
-
-  * configure.ac, src/Makefile.am: 
-  EXTRA_LIBS is not used anymore 
-
-2014-08-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/XMLDocument.cpp, src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h: 
-  removed unused emit() methods from XML classes 
-
-  * src/dvisvgm.cpp: 
-  removed old code that moved cache files to new location 
-
-2014-07-31  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp, src/psdefs.cpp, src/psdefs.ps: 
-  prevent side-effects caused by bop/eop operators present in PS specials 
-
-2014-07-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-2014-07-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.8 
-
-  * src/GraphicPath.h, src/PSInterpreter.cpp, src/PSInterpreter.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/psdefs.cpp, 
-    src/psdefs.ps, tests/PSInterpreterTest.cpp: 
-  added evaluation of PS operator 'clippath' (copies clipping path into 
-  graphics path) 
-
-2014-07-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/GFGlyphTracer.cpp, src/GraphicPath.h, 
-    src/PsSpecialHandler.cpp: 
-  renamed GraphicPath::newpath() to GraphicPath::clear() 
-
-2014-07-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/InputReader.cpp, src/PSInterpreter.cpp: 
-  ensure that InputReader::compare() checks whole and not just partial 
-  words 
-
-2014-07-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/dvisvgm.cpp, 
-    src/options.xml: 
-  added option --clippath to compute the intersection of clipping paths 
-
-  * README, README.md, src/Bezier.cpp, src/Bezier.h, src/GraphicPath.h, 
-    src/Makefile.am, src/PathClipper.cpp, src/PathClipper.h, src/dvisvgm.cpp: 
-  added class PathClipper to compute intersections of closed curved 
-  graphics paths 
-
-  * src/GraphicPath.h: 
-  added field to store the winding rule to class GraphicPath 
-
-  * Makefile.am, clipper/License.txt, clipper/Makefile.am, 
-    clipper/clipper.cpp, clipper/clipper.hpp, configure.ac, src/Makefile.am: 
-  added slightly modified sources of clipper library (computes boolops on 
-  polygons) 
-
-  * src/DVIToSVG.h, src/dvisvgm.cpp: 
-  prevent throwing a DVIException when option -l is present 
-
-2014-07-20  Khaled Hosny  <khaledhosny at eglug.org>
-
-  * src/FontEngine.cpp: 
-  free existing FT_Face before creating a new one 
-
-2014-07-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TpicSpecialHandler.cpp: 
-  TPIC handler: use class GraphicPath to create SVG path commands 
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/GraphicPath.h, src/PsSpecialHandler.cpp, src/SVGTree.cpp, 
-    src/SVGTree.h, src/dvisvgm.cpp, src/options.xml, 
-    tests/GraphicPathTest.cpp: 
-  added option to create relative rather than absolute path commands 
-
-2014-07-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVGActions.h, src/Doxyfile, src/HtmlSpecialHandler.h, 
-    src/RangeMap.cpp, src/SpecialManager.cpp, src/ToUnicodeMap.cpp: 
-  fixed a couple of broken doxygen comments 
-
-2014-06-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Ghostscript.cpp: 
-  get proper name of Ghostscript library when building for Cygwin 
-
-2014-06-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README.md: 
-  added markdown version of README 
-
-2014-06-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.cpp, src/psdefs.ps: 
-  suppress output of PS operator ':show' to prevent the creation of 
-  additional graphic elements 
-
-2014-06-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.7 
-
-  * src/InputReader.cpp: 
-  added missing include 
-
-  * doc/dvisvgm.txt.in, src/DVIToSVGActions.cpp, 
-    src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
-    tests/DvisvgmSpecialTest.cpp, tests/Makefile.am: 
-  added/improved dvisvgm::raw* specials 
-
-  * src/SpecialManager.cpp, src/SpecialManager.h: 
-  removed redundant method SpecialManager::leavePSHeaderSection() 
-
-2014-06-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/XMLNode.cpp, src/XMLNode.h: 
-  added clear() to XMLNode classes; added XMLTextNode::getText() 
-
-2014-06-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp, src/SpecialHandler.h, src/SpecialManager.cpp, 
-    src/SpecialManager.h: 
-  added listener to allow SpecialHandlers being notified when 
-  pre-processing has finished 
-
-  * src/InputReader.cpp, src/InputReader.h: 
-  added InputReader::getLine() 
-
-2014-06-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/SpecialActions.h, tests/ColorSpecialTest.cpp: 
-  renamed class SpecialEmptyActions to EmptySpecialActions 
-
-2014-06-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.h, src/SpecialManager.h: 
-  removed redundant definition of assignment operators 
-
-  * src/DVIReader.cpp, src/Ghostscript.cpp: 
-  removed unused variable; call Ghostscript::exit() with explicitely given 
-  object 
-
-2014-06-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BasicDVIReader.cpp, src/BasicDVIReader.h, src/Bitmap.h, 
-    src/BoundingBox.h, src/CMap.h, src/CMapManager.cpp, src/CMapManager.h, 
-    src/CMapReader.h, src/CRC32.h, src/Calculator.cpp, src/Calculator.h, 
-    src/CmdLineParserBase.h, src/Color.cpp, src/ColorSpecialHandler.cpp, 
-    src/ColorSpecialHandler.h, src/CommandLine.cpp, src/CommandLine.h, 
-    src/DLLoader.h, src/DVIReader.cpp, src/DVIToSVG.h, src/DVIToSVGActions.h, 
-    src/Directory.h, src/DvisvgmSpecialHandler.h, src/EmSpecialHandler.cpp, 
-    src/EmSpecialHandler.h, src/EncFile.h, src/FileFinder.h, 
-    src/FileSystem.cpp, src/Font.cpp, src/Font.h, src/FontCache.h, 
-    src/FontEncoding.cpp, src/FontEngine.cpp, src/FontEngine.h, 
-    src/FontManager.cpp, src/FontManager.h, src/FontMap.cpp, src/FontMap.h, 
-    src/GFGlyphTracer.cpp, src/GFGlyphTracer.h, src/GFReader.cpp, 
-    src/GFReader.h, src/GFTracer.h, src/Ghostscript.cpp, src/Ghostscript.h, 
-    src/GraphicPath.h, src/HtmlSpecialHandler.h, src/InputBuffer.cpp, 
-    src/InputBuffer.h, src/JFM.h, src/Length.cpp, src/Length.h, 
-    src/MapLine.cpp, src/MapLine.h, src/Matrix.cpp, src/Matrix.h, 
-    src/MessageException.h, src/MetafontWrapper.cpp, src/MetafontWrapper.h, 
-    src/NoPsSpecialHandler.h, src/NumericRanges.h, src/PSInterpreter.h, 
-    src/PSPattern.h, src/PSPreviewFilter.h, src/PageRanges.h, src/PageSize.h, 
-    src/Pair.h, src/PdfSpecialHandler.cpp, src/PdfSpecialHandler.h, 
-    src/Process.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/SVGTree.h, src/SWFWriter.cpp, src/SignalHandler.h, 
-    src/SpecialActions.h, src/SpecialManager.h, src/StreamWriter.h, 
-    src/Subfont.cpp, src/Subfont.h, src/TFM.h, src/ToUnicodeMap.h, 
-    src/TpicSpecialHandler.cpp, src/TpicSpecialHandler.h, src/VFReader.cpp, 
-    src/VectorStream.h, src/XMLDocument.h, src/XMLNode.h, src/XMLString.cpp, 
-    src/XMLString.h, src/dvisvgm.cpp, src/types.h: 
-  replaced leading spaces by tabs; removed trailing whitespace 
-
-  * doc/dvisvgm.txt.in, src/BasicDVIReader.h, src/DVIToSVG.cpp, 
-    src/DVIToSVG.h, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/EPSToSVG.cpp, src/EPSToSVG.h, src/HtmlSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.h, src/PreScanDVIReader.cpp, 
-    src/PreScanDVIReader.h, src/SpecialActions.h: 
-  process hyperref anchors and links across pages 
-
-  * src/BasicDVIReader.h, src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h: 
-  allow to replace the DVI reader assigned to an instance of 
-  DVIToSVGActions 
-
-  * src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVGActions.cpp, 
-    src/SpecialManager.cpp, src/SpecialManager.h, src/dvisvgm.cpp: 
-  made class SpecialManager a singleton 
-
-  * src/DVIActions.h, src/DVIReader.cpp, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Makefile.am, 
-    src/PreScanDVIReader.cpp, src/PreScanDVIReader.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/SpecialHandler.h, 
-    src/SpecialManager.cpp, src/SpecialManager.h, src/StreamReader.cpp, 
-    src/StreamReader.h: 
-  pre-process DVI file to collect required data not present in the page 
-  ranges to be converted 
-
-  * src/BasicDVIReader.h, src/DVIReader.cpp, src/DVIToSVG.cpp, 
-    src/DVIToSVG.h, src/dvisvgm.cpp: 
-  moved call of executePreamble() and executePostamble() from DVIToSVG to 
-  DVIReader 
-
-  * src/BasicDVIReader.cpp, src/BasicDVIReader.h, src/DVIReader.cpp, 
-    src/DVIReader.h, src/Makefile.am: 
-  moved basic funtionality of DVIReader to base class BasicDVIReader 
-
-2014-06-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp: 
-  fixed incorrect extent values shown when applying a preview bbox 
-  (bp->pt) 
-
-  * rpm/Makefile.am: 
-  removed outdated project folder 'rpm' 
-
-  * src/DVIReader.cpp, src/DVIReader.h: 
-  removed redundant variable DVIReader::_prevBop 
-
-2014-06-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/DVIReader.h: 
-  removed redundant code from DVIReader::evalCommand() 
-
-  * src/EPSFile.cpp, src/GFReader.cpp: 
-  replaced relative variant of seekg() by absolute one where possible 
-
-2014-05-31  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/StreamReader.h, src/VFReader.cpp: 
-  renamed some methods of class StreamReader 
-
-  * src/DVIReader.cpp, src/StreamReader.cpp, src/StreamReader.h, 
-    src/VFReader.cpp: 
-  removed StreamReader::in() 
-
-  * src/DVIReader.cpp, src/VFReader.cpp: 
-  few code adjustments 
-
-2014-05-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/DVIReader.h: 
-  simplified DVIReader::executePage; removed DVIReader::executePages 
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/dvisvgm.cpp: 
-  simplified computation of progress ratio 
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVG.h: 
-  removed DVIReader::_totalPages; use number of BOP offsets instead 
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/StreamReader.h: 
-  collect all DVI BOP offsets to reach them quickly 
-
-2014-05-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Makefile.am: 
-  Makefiles: put source files on separate lines 
-
-  * src/Makefile.am, src/RangeMap.h, src/ToUnicodeMap.cpp, 
-    src/ToUnicodeMap.h, tests/Makefile.am, tests/ToUnicodeMapTest.cpp: 
-  added class ToUnicodeMap to handle mappings from character indexes to 
-  unicode points 
-
-  * src/DVIToSVG.cpp, src/Makefile.am, src/NumericRanges.h, 
-    src/PageRanges.cpp, src/PageRanges.h, tests/PageRagesTest.cpp: 
-  extracted functionality of class PageRanges to separate class 
-  NumericRanges 
-
-  * src/CharMap.cpp, src/CharMap.h, src/Font.cpp, src/Font.h, 
-    src/FontEngine.cpp, src/FontEngine.h, src/Makefile.am: 
-  replaced class CharMap with more generic class RangeMap 
-
-  * src/RangeMap.cpp: 
-  fixed right joins of touching ranges in a RangeMap 
-
-  * src/CMap.cpp, src/CMap.h, src/Makefile.am, src/RangeMap.cpp, 
-    src/RangeMap.h, tests/Makefile.am, tests/RangeMapTest.cpp: 
-  extracted class RangeMap previously implemented as part of SegmentedCMap 
-
-  * src/CharMap.cpp, src/CharMap.h, src/Font.cpp, src/FontEngine.cpp, 
-    src/FontEngine.h: 
-  removed redundant method CharMap::invert() 
-
-2014-04-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CharMapID.cpp, src/CharMapID.h, src/DVIReader.cpp, src/Font.cpp, 
-    src/Font.h, src/FontEngine.cpp, src/FontEngine.h: 
-  try to add unicode mappings missing in a font's cmap table 
-
-2014-04-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/SVGTree.cpp: 
-  don't add unnecessary element 'missing-glyph' to SVG files 
-
-2014-04-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/options.xml: 
-  renamed argument of option --linkmark from 'type' to 'style' 
-
-2014-04-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.6 
-
-2014-04-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/DVIToSVG.cpp, src/EPSToSVG.cpp: 
-  removed date and machine triplet from generated SVG files 
-
-2014-04-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/HtmlSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.h: 
-  added optional selection of line/box colors to option --linkmark 
-
-2014-04-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/options.xml: 
-  changed default argument of option --linkmark to 'box' 
-
-  * src/DVIReader.h, src/DVIToSVGActions.h, src/HtmlSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.h, src/SpecialActions.h: 
-  only split hyperlink boxes on line breaks 
-
-  * src/CommandLine.h, src/DVIToSVG.cpp, src/EPSToSVG.cpp: 
-  don't link GS messages unnecessarily if HAVE_LIBGS is defined 
-
-2014-04-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/SVGTree.cpp, src/SVGTree.h, src/dvisvgm.cpp, src/options.xml: 
-  added command-line option --zoom 
-
-  * src/Ghostscript.cpp, src/dvisvgm.cpp: 
-  moved lookup of MiKTeX's GS DLL to get_libgs() 
-
-  * doc/dvisvgm.txt.in, src/Ghostscript.cpp: 
-  if libgs is loaded during runtime, look for libgs.so.X instead of 
-  libgs.so 
-
-  * src/DLLoader.cpp: 
-  prevent calling dlopen() if the length of the string argument is 0 
-
-2014-04-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.5.3 
-
-  * src/CMap.cpp, src/CmdLineParserBase.cpp, src/ColorSpecialHandler.cpp, 
-    src/DVIReader.cpp, src/DVIToSVGActions.cpp, src/Doxyfile, 
-    src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
-    src/EPSFile.cpp, src/EmSpecialHandler.cpp, src/FileFinder.cpp, 
-    src/FileSystem.cpp, src/Font.cpp, src/FontCache.cpp, src/FontEncoding.h, 
-    src/FontEngine.cpp, src/FontMap.cpp, src/GraphicPath.h, 
-    src/PSInterpreter.cpp, src/PageRanges.cpp, src/PsSpecialHandler.cpp, 
-    src/SVGTree.cpp, src/SVGTree.h, src/SpecialManager.cpp, src/Subfont.cpp, 
-    src/TFM.cpp, src/TpicSpecialHandler.cpp, src/XMLDocument.cpp, 
-    src/XMLNode.cpp, src/dvisvgm.cpp: 
-  fixed issues in the doxygen documentation 
-
-2014-04-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BoundingBox.h, src/DVIActions.cpp, src/DVIActions.h, 
-    src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/DvisvgmSpecialHandler.cpp, src/EPSToSVG.cpp, 
-    src/EmSpecialHandler.cpp, src/Font.h, src/FontManager.cpp, 
-    src/GFGlyphTracer.cpp, src/GFReader.cpp, src/GFTracer.cpp, 
-    src/GFTracer.h, src/GraphicPath.h, src/HtmlSpecialHandler.h, 
-    src/Makefile.am, src/PSPattern.cpp, src/PSPreviewFilter.cpp, 
-    src/PSPreviewFilter.h, src/PageSize.cpp, src/PageSize.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/SVGTree.cpp, 
-    src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h, 
-    src/TFM.cpp, src/TpicSpecialHandler.cpp, src/TpicSpecialHandler.h, 
-    src/VFReader.cpp: 
-  switched internal computations from TeX points (pt) to PS points (bp) 
-
-  * src/DVIToSVGActions.cpp: 
-  equalize implementations of moveToX and moveToY 
-
-2014-02-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/DVIReader.h: 
-  ensure updating the SVG cursor position when executing DVI command 
-  set_rule 
-
-2014-01-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Ghostscript.cpp: 
-  check if library given by --libgs is actually a GS library 
-
-2014-01-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-2014-01-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.5.2 
-
-  * src/FileFinder.cpp: 
-  return 'unknown' if MiKTeX version can't be retrieved 
-
-  * src/Directory.cpp: 
-  initialize Directory member variables (Win only) 
-
-  * src/FileFinder.cpp: 
-  catch exceptions thrown by MiKTeXCom object 
-
-2014-01-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * Makefile.am, README, configure.ac, doc/Makefile.am, doc/dvisvgm.txt.in, 
-    src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h, 
-    src/Bitmap.cpp, src/Bitmap.h, src/BoundingBox.cpp, src/BoundingBox.h, 
-    src/CMap.cpp, src/CMap.h, src/CMapManager.cpp, src/CMapManager.h, 
-    src/CMapReader.cpp, src/CMapReader.h, src/CRC32.cpp, src/CRC32.h, 
-    src/Calculator.cpp, src/Calculator.h, src/CharMap.cpp, src/CharMap.h, 
-    src/CharMapID.cpp, src/CharMapID.h, src/Character.h, 
-    src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, src/Color.cpp, 
-    src/Color.h, src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/CommandLine.cpp, src/CommandLine.h, src/DLLoader.cpp, src/DLLoader.h, 
-    src/DVIActions.cpp, src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h, 
-    src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/Directory.cpp, src/Directory.h, 
-    src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
-    src/EPSFile.cpp, src/EPSFile.h, src/EPSToSVG.cpp, src/EPSToSVG.h, 
-    src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, src/EncFile.cpp, 
-    src/EncFile.h, src/FileFinder.cpp, src/FileFinder.h, src/FilePath.cpp, 
-    src/FilePath.h, src/FileSystem.cpp, src/FileSystem.h, src/Font.cpp, 
-    src/Font.h, src/FontCache.cpp, src/FontCache.h, src/FontEncoding.cpp, 
-    src/FontEncoding.h, src/FontEngine.cpp, src/FontEngine.h, 
-    src/FontManager.cpp, src/FontManager.h, src/FontMap.cpp, src/FontMap.h, 
-    src/FontMetrics.cpp, src/FontMetrics.h, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.h, src/GFReader.cpp, src/GFReader.h, src/GFTracer.cpp, 
-    src/GFTracer.h, src/Ghostscript.cpp, src/Ghostscript.h, src/Glyph.h, 
-    src/GlyphTracerMessages.h, src/GraphicPath.h, src/HtmlSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.h, src/InputBuffer.cpp, src/InputBuffer.h, 
-    src/InputReader.cpp, src/InputReader.h, src/JFM.cpp, src/JFM.h, 
-    src/Length.cpp, src/Length.h, src/Makefile.am, src/Makefile.old, 
-    src/MapLine.cpp, src/MapLine.h, src/Matrix.cpp, src/Matrix.h, 
-    src/Message.cpp, src/Message.h, src/MessageException.h, 
-    src/MetafontWrapper.cpp, src/MetafontWrapper.h, src/MiKTeXCom.cpp, 
-    src/MiKTeXCom.h, src/NoPsSpecialHandler.cpp, src/NoPsSpecialHandler.h, 
-    src/PSFilter.h, src/PSInterpreter.cpp, src/PSInterpreter.h, 
-    src/PSPattern.cpp, src/PSPattern.h, src/PSPreviewFilter.cpp, 
-    src/PSPreviewFilter.h, src/PageRanges.cpp, src/PageRanges.h, 
-    src/PageSize.cpp, src/PageSize.h, src/Pair.h, src/PdfSpecialHandler.cpp, 
-    src/PdfSpecialHandler.h, src/Process.cpp, src/Process.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/SVGOutputBase.h, 
-    src/SVGTree.cpp, src/SVGTree.h, src/SWFWriter.cpp, src/SWFWriter.h, 
-    src/SignalHandler.cpp, src/SignalHandler.h, src/SpecialActions.h, 
-    src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h, 
-    src/StreamReader.cpp, src/StreamReader.h, src/StreamWriter.cpp, 
-    src/StreamWriter.h, src/Subfont.cpp, src/Subfont.h, src/System.cpp, 
-    src/System.h, src/TFM.cpp, src/TFM.h, src/Terminal.cpp, src/Terminal.h, 
-    src/TpicSpecialHandler.cpp, src/TpicSpecialHandler.h, src/VFActions.h, 
-    src/VFReader.cpp, src/VFReader.h, src/VectorStream.h, 
-    src/XMLDocument.cpp, src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h, 
-    src/XMLString.cpp, src/XMLString.h, src/dvisvgm.cpp, src/macros.h, 
-    src/options.dtd, src/options.xml, src/psdefs.cpp, src/psdefs.ps, 
-    src/types.h, tests/BoundingBoxTest.cpp, tests/CMapReaderTest.cpp, 
-    tests/CMapTest.cpp, tests/CRC32Test.cpp, tests/CalculatorTest.cpp, 
-    tests/ColorSpecialTest.cpp, tests/ColorTest.cpp, 
-    tests/CommandLineTest.cpp, tests/DirectoryTest.cpp, 
-    tests/FileFinderTest.cpp, tests/FilePathTest.cpp, 
-    tests/FileSystemTest.cpp, tests/FontManagerTest.cpp, 
-    tests/FontMapTest.cpp, tests/GFReaderTest.cpp, tests/GraphicPathTest.cpp, 
-    tests/LengthTest.cpp, tests/Makefile.am, tests/MapLineTest.cpp, 
-    tests/MatrixTest.cpp, tests/MessageExceptionTest.cpp, 
-    tests/PSInterpreterTest.cpp, tests/PageRagesTest.cpp, 
-    tests/PageSizeTest.cpp, tests/PairTest.cpp, 
-    tests/SplittedCharInputBufferTest.cpp, tests/StreamInputBufferTest.cpp, 
-    tests/StreamReaderTest.cpp, tests/StreamWriterTest.cpp, 
-    tests/SubfontTest.cpp, tests/TypesTest.cpp, tests/VectorStreamTest.cpp, 
-    tests/check-conv, tests/create-makefile, tests/normalize.xsl: 
-  updated year in copyright statements to 2014 
-
-2013-12-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontCache.cpp: 
-  catch potential StreamReaderException 
-
-  * src/Directory.cpp, src/Directory.h, src/FontMap.cpp, 
-    tests/DirectoryTest.cpp: 
-  changed directory entry types from char to enums 
-
-  * src/Font.cpp: 
-  check if units per EM are not 0 to prevent divisions by zero 
-
-2013-12-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/Directory.cpp, src/GFReader.cpp: 
-  added missing initializations of member variables 
-
-  * src/FontCache.cpp, src/SpecialManager.cpp: 
-  restore stream format flags 
-
-  * src/DvisvgmSpecialHandler.cpp, src/FontCache.cpp: 
-  ensure null pointer checks before dereferencing 
-
-  * src/DVIReader.cpp: 
-  check if denominator of DVI unit is non-zero 
-
-  * src/Matrix.cpp: 
-  ensure return value of istream::get() is assigned to int vars 
-
-  * src/FontCache.cpp: 
-  avoid accessing strings constructed from temporaries 
-
-  * src/BoundingBox.cpp: 
-  explicitely initialize BoundingBox fields 
-
-2013-11-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/SVGTree.cpp, src/SVGTree.h: 
-  don't let global font colors interfere with color specials 
-
-2013-10-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-2013-10-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.5.1 
-
-  * src/DVIReader.cpp: 
-  temporarily reactivated processing of font definitions located in the 
-  postamble 
-
-  * src/FileSystem.cpp, src/MetafontWrapper.cpp: 
-  added explicit casts from ifstream to bool 
-
-  * src/Bitmap.cpp, src/Color.cpp, src/JFM.cpp, src/Matrix.cpp: 
-  added missing #includes of header file <algorithm> 
-
-2013-10-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp: 
-  suppress output of logical page number if it equals physical page number 
-
-2013-10-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PSPreviewFilter.cpp, src/PsSpecialHandler.cpp: 
-  ensure proper evaluation of tightpage data if multiple pages are 
-  processed 
-
-2013-10-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Color.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h: 
-  added 'const' to read-only methods 
-
-  * src/InputBuffer.h: 
-  don't check unsigned variables for negative values 
-
-2013-09-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp: 
-  changed warning message that appears if PS support has been disabled 
-  permanently 
-
-  * src/DVIToSVG.cpp, src/Ghostscript.h, src/dvisvgm.cpp: 
-  added missing guards and functions to prevent compilation errors if 
-  DISABLE_GS is set 
-
-  * src/FontCache.cpp, src/FontCache.h: 
-  renamed FontCache::VERSION to FontCache::FORMAT_VERSION 
-
-2013-09-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.5 
-
-  * src/DLLoader.h, src/Directory.h: 
-  moved #define NOMINMAX to Windows config.h 
-
-  * src/BgColorSpecialHandler.cpp, src/Bitmap.cpp, src/BoundingBox.cpp, 
-    src/CMap.cpp, src/CMapManager.cpp, src/CMapReader.cpp, src/CRC32.cpp, 
-    src/Calculator.cpp, src/CharMap.cpp, src/CmdLineParserBase.cpp, 
-    src/Color.cpp, src/ColorSpecialHandler.cpp, src/CommandLine.cpp, 
-    src/CommandLine.h, src/DLLoader.cpp, src/DVIActions.cpp, 
-    src/DVIReader.cpp, src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, 
-    src/Directory.cpp, src/DvisvgmSpecialHandler.cpp, src/EPSFile.cpp, 
-    src/EPSToSVG.cpp, src/EmSpecialHandler.cpp, src/EncFile.cpp, 
-    src/FileFinder.cpp, src/FilePath.cpp, src/FileSystem.cpp, src/Font.cpp, 
-    src/FontCache.cpp, src/FontEncoding.cpp, src/FontEngine.cpp, 
-    src/FontManager.cpp, src/FontMap.cpp, src/FontMetrics.cpp, 
-    src/GFGlyphTracer.cpp, src/GFReader.cpp, src/GFTracer.cpp, 
-    src/Ghostscript.cpp, src/Ghostscript.h, src/HtmlSpecialHandler.cpp, 
-    src/InputBuffer.cpp, src/InputReader.cpp, src/JFM.cpp, src/Length.cpp, 
-    src/MapLine.cpp, src/Matrix.cpp, src/Message.cpp, 
-    src/MetafontWrapper.cpp, src/MiKTeXCom.cpp, src/NoPsSpecialHandler.cpp, 
-    src/PSInterpreter.cpp, src/PSPattern.cpp, src/PSPreviewFilter.cpp, 
-    src/PageRanges.cpp, src/PageSize.cpp, src/PdfSpecialHandler.cpp, 
-    src/Process.cpp, src/PsSpecialHandler.cpp, src/SVGTree.cpp, 
-    src/SignalHandler.cpp, src/SpecialManager.cpp, src/StreamReader.cpp, 
-    src/StreamWriter.cpp, src/Subfont.cpp, src/System.cpp, src/TFM.cpp, 
-    src/Terminal.cpp, src/TpicSpecialHandler.cpp, src/VFReader.cpp, 
-    src/XMLDocument.cpp, src/XMLNode.cpp, src/XMLString.cpp, src/dvisvgm.cpp: 
-  include config.h at the top of every translation unit 
-
-2013-08-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in: 
-  updated manpage 
-
-  * src/Font.cpp, src/Font.h, src/XMLString.cpp: 
-  replaced entity references by corresponding UTF-8 characters; use 
-  correct unicode points rather than DVI charcodes 
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/Font.cpp, src/Font.h, 
-    src/FontEngine.cpp, src/FontEngine.h, src/FontManager.cpp, 
-    src/FontManager.h, src/FontStyle.h, src/SVGTree.cpp, src/dvisvgm.cpp: 
-  added support for XDV (DVI format 5) files 
-
-  * src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Font.cpp, src/Font.h, 
-    src/FontEngine.cpp, src/FontEngine.h, src/FontMetrics.h, src/JFM.h, 
-    src/SVGTree.cpp, src/SVGTree.h, src/TFM.h, src/dvisvgm.cpp: 
-  added support for DVI format 3 (pTeX, vertical mode) 
-
-  * src/FontMetrics.h, src/JFM.cpp, src/JFM.h, src/TFM.h: 
-  added retrieval of vertical mode flag to class FontMetrics 
-
-2013-08-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CharMap.cpp, src/CharMap.h, src/Font.cpp, src/Font.h, 
-    src/FontEncoding.h, src/FontEngine.cpp, src/FontEngine.h, 
-    src/FontManager.cpp, src/Makefile.am: 
-  replaced local std::map tables used in Font classes with new class 
-  CharMap 
-
-2013-08-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/SVGTree.cpp: 
-  appended px unit to font-size attributes in style section 
-
-2013-08-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp: 
-  suppress error messages from makeFOO tools 
-
-2013-08-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/Font.h, src/FontEncoding.cpp, src/FontEncoding.h, 
-    src/FontManager.cpp, src/FontMap.cpp, src/FontMap.h: 
-  moved assignment of base font map to Font class 
-
-  * src/CMap.cpp, src/CMap.h, src/CMapManager.cpp, src/CMapManager.h, 
-    src/EncFile.h, src/Font.cpp, src/Font.h, src/FontEncoding.cpp, 
-    src/FontEncoding.h, src/FontManager.cpp, src/FontMap.cpp, src/FontMap.h: 
-  derive EncodingPair from FontEncoding 
-
-2013-08-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/dvisvgm.cpp: 
-  fix number of dashes printed by -V1 
-
-  * configure.ac, src/FileFinder.cpp: 
-  check if the kpathsea library is C++-safe (patch by Peter Breitenlohner) 
-
-2013-08-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Matrix.cpp, src/Matrix.h: 
-  renamed Matrix skewing methods 
-
-2013-08-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Ghostscript.h, src/PSPreviewFilter.cpp, src/PsSpecialHandler.cpp: 
-  added missing variable initializations 
-
-  * src/Font.cpp, src/Font.h, src/FontEngine.cpp, src/FontManager.cpp, 
-    src/FontMap.cpp, src/FontMap.h, src/FontStyle.h, src/Makefile.am: 
-  store pointers to font map and encoding in Font objects to speed up 
-  looking them up 
-
-2013-08-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CMapManager.cpp, src/CMapManager.h, src/FontManager.cpp: 
-  avoid const_cast in CMapManager 
-
-2013-08-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CMap.h, src/CMapManager.cpp: 
-  properly handle 'unicode' encoding entries set in font map 
-
-  * src/DVIActions.h, src/DVIReader.cpp, src/DVIToSVG.cpp: 
-  disable font processing while scanning PS header specials 
-
-2013-08-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.4 
-
-  * NEWS: 
-  updated NEWS 
-
-  * src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVGActions.h, src/EPSToSVG.h, 
-    src/Matrix.cpp, src/Matrix.h, src/PsSpecialHandler.cpp, 
-    src/SpecialActions.h, src/dvisvgm.cpp: 
-  apply page transformations to width, height, and depth of preview bbox 
-
-  * src/DVIToSVG.cpp: 
-  removed redundant #include statements 
-
-  * src/DVIToSVG.cpp, src/Makefile.am, src/SVGTree.cpp, 
-    src/XMLDocTypeNode.h: 
-  removed DOCTYPE declaration from generated files as suggested by the SVG 
-  specification 
-
-  * src/XMLDocument.cpp, src/XMLString.cpp: 
-  changed encoding of SVG files from ISO-8859-1 to UTF-8 
-
-2013-07-31  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CMap.h, src/CMapManager.cpp, src/CMapManager.h, src/CMapReader.cpp, 
-    src/CharMapID.cpp, src/CharMapID.h, src/Font.cpp, src/Font.h, 
-    src/FontEngine.cpp, src/FontEngine.h, src/FontManager.cpp, 
-    src/FontMap.cpp, src/FontMap.h, src/Makefile.am: 
-  try to decode characters of non-CID fonts that have a CMap assigned in 
-  the fontmap 
-
-  * src/CMap.cpp, src/CMap.h, src/CMapReader.cpp, src/CMapReader.h, 
-    tests/CMapReaderTest.cpp, tests/CMapTest.cpp, tests/Makefile.am: 
-  added evaluation of base font (bf) sections in CMap files 
-
-  * src/Font.cpp, src/Font.h, src/FontMetric.cpp, src/FontMetric.h, 
-    src/FontMetrics.cpp, src/FontMetrics.h, src/Makefile.am, src/TFM.h: 
-  renamed class FontMetric to FontMetrics 
-
-  * src/FileFinder.cpp, src/Font.cpp, src/Font.h, src/FontManager.cpp: 
-  added support for OTF fonts 
-
-  * src/CMap.cpp, src/CMap.h, src/Character.h, src/EncFile.h, src/Font.cpp, 
-    src/Font.h, src/FontEncoding.h, src/FontEngine.cpp, src/FontEngine.h, 
-    src/Makefile.am, tests/CMapTest.cpp: 
-  added Character class to handle character names, codes, and indexes 
-  consistently 
-
-  * src/CMap.cpp, src/CMap.h, src/CMapManager.h, src/EncFile.cpp, 
-    src/EncFile.h, src/FileFinder.cpp, src/Font.cpp, src/Font.h, 
-    src/FontEncoding.cpp, src/FontEncoding.h, src/FontEngine.cpp, 
-    src/FontEngine.h, src/FontManager.cpp, src/Makefile.am, 
-    tests/CMapTest.cpp: 
-  derive .enc encoding vectors and CMaps from common base class 
-  FontEncoding 
-
-  * src/CMap.cpp, src/CMap.h, src/CMapManager.cpp, src/CMapManager.h, 
-    src/CMapReader.cpp, src/CMapReader.h, src/FontManager.cpp, 
-    src/Makefile.am, tests/CMapTest.cpp, tests/Makefile.am: 
-  added classes to handle CMap files 
-
-2013-07-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/DVIActions.h, src/DVIReader.cpp, 
-    src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/EPSToSVG.cpp, src/Makefile.am, src/PSFilter.h, src/PSInterpreter.cpp, 
-    src/PSInterpreter.h, src/PSPreviewFilter.cpp, src/PSPreviewFilter.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/SpecialActions.h, 
-    src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h: 
-  added evaluation of bounding box information created by preview package 
-
-  * src/PSInterpreter.cpp, src/PSInterpreter.h, src/PsSpecialHandler.cpp: 
-  added funtion to execute PS code snippets and retrieve their results 
-
-  * src/BgColorSpecialHandler.h, src/DVIToSVG.cpp, src/PSInterpreter.cpp, 
-    src/PSInterpreter.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/SpecialManager.cpp, src/SpecialManager.h: 
-  ensure that PS header code is evaluated before the page/body code; also 
-  execute bop-hook and eop-hook 
-
-  * src/JFM.cpp: 
-  fixed retrieval of char indexes if a JFM contains entries of chartype 0 
-  only 
-
-2013-07-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontMap.cpp: 
-  check for EOF prior to try to parse another mapline 
-
-  * src/psdefs.cpp, src/psdefs.ps: 
-  PS handler: call newpath before executing charpath in operator show 
-
-  * src/EPSToSVG.cpp: 
-  print warning message if height or width of EPS bbox is 0 
-
-2013-07-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.cpp, src/psdefs.ps: 
-  replaced PS operator prval with =only in psdefs 
-
-2013-07-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.cpp, src/psdefs.ps: 
-  properly store PS operator applyscalevals in systemdict 
-
-  * src/DVIToSVG.cpp: 
-  ensure catching PSExceptions while processing PS header specials to 
-  prevent segfaults 
-
-2013-07-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp, src/FileFinder.h: 
-  FileFinder: added lookup of cmap files 
-
-  * src/Process.cpp, src/Process.h: 
-  extended Process::run() to grab the output written to stdout 
-
-2013-07-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, src/CommandLine.cpp: 
-  command-line parser: changed type of argument mode from char to enum 
-
-2013-06-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp: 
-  removed redundant 'using namespace std' 
-
-2013-06-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/HtmlSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.h, src/dvisvgm.cpp: 
-  extend option --linkmark to highlight linked areas by a given background 
-  color 
-
-2013-06-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Color.cpp, src/Color.h, src/ColorSpecialHandler.cpp, 
-    src/ColorSpecialHandler.h, src/SpecialActions.h, 
-    tests/ColorSpecialTest.cpp, tests/ColorTest.cpp, tests/Makefile.am: 
-  use Color class in ColorSpecialHandler rather than local code; added 
-  ColorTest 
-
-2013-05-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/dvisvgm.cpp: 
-  added a missing (underlining) hyphen to the output of -V1 
-
-2013-05-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.3 
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/HtmlSpecialHandler.cpp, src/dvisvgm.cpp, src/options.xml: 
-  added option --linkmark to select the highlighing variant for hyperlinks 
-
-  * doc/dvisvgm.txt.in, src/DVIToSVG.cpp, src/HtmlSpecialHandler.cpp, 
-    src/HtmlSpecialHandler.h, src/Makefile.am, src/SpecialManager.cpp: 
-  added support of hyperref specials 
-
-  * src/FileFinder.cpp, src/MiKTeXCom.cpp, src/MiKTeXCom.h, src/dvisvgm.cpp: 
-  try to load the Ghostscript library that comes with MiKTeX 
-
-  * src/Font.cpp, src/FontMetric.cpp, src/FontMetric.h, src/JFM.cpp, 
-    src/JFM.h, src/Makefile.am, src/StreamReader.h, src/TFM.cpp, src/TFM.h: 
-  added support for Japanese font metric (JFM) files 
-
-  * src/Font.cpp, src/Font.h, src/FontManager.h, src/FontMetric.cpp, 
-    src/FontMetric.h, src/Makefile.am, src/TFM.cpp, src/TFM.h: 
-  handle invalid TFM files properly 
-
-2013-05-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, 
-    src/DVIToSVG.h, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, 
-    src/NoPsSpecialHandler.cpp, src/NoPsSpecialHandler.h, 
-    src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h, 
-    src/TpicSpecialHandler.cpp, src/TpicSpecialHandler.h: 
-  added page number parameter to DVIEndPageListener::dviEndPage() 
-
-  * src/EmSpecialHandler.h, src/NoPsSpecialHandler.h, src/SpecialHandler.h, 
-    src/SpecialManager.cpp, src/SpecialManager.h, src/TpicSpecialHandler.h: 
-  moved DVI listener methods to dedicated listener interface classes 
-
-  * src/HtmlSpecialHandler.h: 
-  dropped old HtmlSpecialHandler.h that should had been removed long time 
-  ago 
-
-  * src/InputReader.cpp, src/InputReader.h: 
-  added optional parameter 'quotechar' to InputReader::parseAttributes() 
-
-  * src/DVIToSVGActions.h, src/EPSToSVG.h, src/SpecialActions.h: 
-  provide the context push/pop methods of class SVGTree to special 
-  handlers 
-
-  * src/SVGTree.cpp, src/SVGTree.h: 
-  added methods to push and pop 'context elements' to a page that wrap 
-  parts of the page contents 
-
-  * AUTHORS, Makefile.am, README, configure.ac, potracelib/Makefile.am, 
-    potracelib/auxiliary.h, potracelib/bitmap.h, potracelib/curve.c, 
-    potracelib/curve.h, potracelib/decompose.c, potracelib/decompose.h, 
-    potracelib/lists.h, potracelib/potracelib.c, potracelib/potracelib.h, 
-    potracelib/progress.h, potracelib/trace.c, potracelib/trace.h: 
-  removed bundled potrace library 
-
-2013-05-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVGActions.cpp, src/Terminal.cpp, src/Terminal.h: 
-  disable cursor when showing the progress indicator (Windows only) 
-
-2013-04-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp: 
-  don't link NoPsSpecialHandler if HAVE_LIBGS 
-
-2013-04-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontEncoding.cpp: 
-  fixed bracketing bug that prevented lookup of fontmap files 
-
-2013-04-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.2.2 
-
-  * src/BoundingBox.cpp, src/BoundingBox.h, src/Calculator.cpp, 
-    src/Calculator.h, src/Matrix.cpp, src/Matrix.h, src/MessageException.h, 
-    src/PageSize.cpp, src/PageSize.h, src/StreamReader.cpp, 
-    src/StreamReader.h, src/VFReader.cpp, src/VFReader.h, src/VectorStream.h, 
-    src/XMLDocument.cpp, src/XMLDocument.h: 
-  added missing underscores to private member variables 
-
-2013-04-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BoundingBox.cpp, src/BoundingBox.h, src/Calculator.h, 
-    src/CmdLineParserBase.h, src/DVIToSVGActions.cpp, src/Message.cpp, 
-    src/VFReader.cpp: 
-  added missing member initializations to some classes 
-
-  * doc/dvisvgm.txt.in, src/CmdLineParserBase.cpp, src/CommandLine.cpp, 
-    src/options.dtd, src/options.xml: 
-  added information about 'dvisvgm -E' to usage line 
-
-2013-04-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp, src/Makefile.am, src/NoPsSpecialHandler.cpp, 
-    src/NoPsSpecialHandler.h, src/SpecialManager.cpp: 
-  print a warning message if PS specials are found but ignored 
-
-2013-04-15  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp, src/dvisvgm.cpp: 
-  catch MessageException if MiKTeX version can't be obtained 
-
-2013-04-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.2.1 
-
-  * tests/Makefile.am, tests/create-makefile: 
-  updated tests/Makefile.am to honor system potracelib if present 
-
-2013-04-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PageRanges.h: 
-  dropped unused variable PageRanges::_max 
-
-  * src/CmdLineParserBase.h, src/InputReader.h: 
-  changed 'struct InputReader' to 'class InputReader' 
-
-  * doc/dvisvgm.txt.in, src/Color.cpp, src/Color.h, src/DVIToSVGActions.cpp: 
-  allow the background color special to insert white rectancles 
-
-2013-04-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/XMLNode.cpp, src/XMLNode.h: 
-  unhide derived method XMLDeclarationNode::append 
-
-2013-03-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * Makefile.am, configure.ac: 
-  don't build bundled potracelib if system library is used (patch by 
-  Alexis Ballier) 
-
-2013-03-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * potracelib/auxiliary.h, potracelib/bitmap.h, potracelib/curve.c, 
-    potracelib/curve.h, potracelib/decompose.c, potracelib/decompose.h, 
-    potracelib/lists.h, potracelib/potracelib.c, potracelib/potracelib.h, 
-    potracelib/progress.h, potracelib/trace.c, potracelib/trace.h: 
-  updated bundled potrace library to version 1.11 
-
-2013-03-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * potracelib/auxiliary.h, potracelib/bitmap.h, potracelib/curve.c, 
-    potracelib/decompose.h, potracelib/lists.h, potracelib/progress.h, 
-    potracelib/trace.c, potracelib/trace.h, src/EPSFile.cpp, 
-    src/EPSToSVG.cpp, src/EPSToSVG.h, src/PSPattern.cpp, src/PSPattern.h, 
-    src/SVGOutputBase.h: 
-  converted DOS line endings 
-
-2013-02-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.2 
-
-  * src/psdefs.cpp, src/psdefs.ps: 
-  improved processing of PS operator "show" 
-
-  * tests/MapLineTest.cpp: 
-  prevent MapLineTest from failing if file UGBK.sfd is not available 
-
-  * src/Makefile.am, src/PSInterpreter.cpp, src/psdefs.cpp, src/psdefs.ps, 
-    src/psdefs.psc: 
-  make psdefs a separate compilation unit 
-
-  * src/Makefile.am, src/PSInterpreter.cpp, src/PSInterpreter.h, 
-    src/PSPattern.cpp, src/PSPattern.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/psdefs.ps, src/psdefs.psc, 
-    tests/PSInterpreterTest.cpp: 
-  PS handler: added support of tiling patterns 
-
-2013-02-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/XMLNode.cpp, src/XMLNode.h: 
-  added methods to lookup attribute values and selected descendant XML 
-  nodes 
-
-  * src/XMLNode.cpp, src/XMLNode.h: 
-  added virtual constructor XMLNode::clone() 
-
-2013-02-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FilePath.cpp: 
-  adapt path separators on Windows systems to get the  correct output path 
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/DVIToSVG.cpp, src/DVIToSVG.h, src/EPSFile.cpp, src/EPSFile.h, 
-    src/EPSToSVG.cpp, src/EPSToSVG.h, src/Makefile.am, 
-    src/PsSpecialHandler.cpp, src/SVGOutputBase.h, src/dvisvgm.cpp, 
-    src/options.xml: 
-  add option to directly convert EPS files to SVG 
-
-  * src/PSInterpreter.cpp, src/PSInterpreter.h: 
-  added PSInterpreter::limit() to limit the number of bytes to be 
-  processed 
-
-2013-02-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, src/CommandLine.cpp, 
-    src/CommandLine.h: 
-  applied a few refactorings to the command-line parser 
-
-2013-02-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, 
-    src/CommandLine.cpp, src/CommandLine.h, src/dvisvgm.cpp, src/options.xml: 
-  added optional parameter to option --help to specify output format 
-
-2013-01-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CommandLine.cpp: 
-  fixed alignment of --help text 
-
-2013-01-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, README: 
-  updated NEWS and README 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.1 
-
-  * src/CommandLine.cpp, src/Font.cpp, src/Font.h, src/FontEngine.cpp, 
-    src/FontEngine.h, src/FontManager.cpp, src/FontMap.cpp, src/FontMap.h, 
-    src/MapLine.cpp, src/MapLine.h, tests/MapLineTest.cpp: 
-  implemented evaluation of font style options given in a mapline 
-
-  * src/FontManager.cpp, src/FontMap.cpp, src/FontMap.h, src/MapLine.h: 
-  replaced FontMap entries by pointers; initialize entries with MapLine 
-  objects 
-
-  * src/DVIReader.cpp, src/DVIToSVG.cpp, src/FileFinder.cpp, src/Font.cpp, 
-    src/Font.h, src/FontEncoding.cpp, src/FontEngine.cpp, src/FontEngine.h, 
-    src/FontManager.cpp, src/FontMap.cpp, src/FontMap.h, src/Makefile.am, 
-    src/MapLine.cpp, src/MapLine.h, src/Subfont.cpp, src/Subfont.h, 
-    tests/FontMapTest.cpp, tests/Makefile.am, tests/MapLineTest.cpp, 
-    tests/SubfontTest.cpp, tests/create-makefile, tests/sample.sfd: 
-  added support for subfont definitions and multi-font (.ttc) files 
-
-2013-01-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontEngine.cpp, src/FontEngine.h: 
-  removed unneeded code related to font sizes from class FontEngine 
-
-2013-01-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/DVIToSVG.cpp, src/FontMap.cpp, src/FontMap.h, 
-    src/Makefile.am, src/PdfSpecialHandler.cpp, src/PdfSpecialHandler.h: 
-  added PdfSpecialHandler to evaluate pdf:mapline and pdf:mapfile specials 
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/FontMap.cpp, src/FontMap.h, src/dvisvgm.cpp, src/options.xml: 
-  renamed option --map-file to --fontmap; allow multiple mapfiles and 
-  modes 
-
-2013-01-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/FontEncoding.cpp: 
-  fixed a string exception that occurred when an encoding file or an entry 
-  in the encoding table is unavailable 
-
-2013-01-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp, src/FileFinder.h, src/FontEncoding.cpp, 
-    src/FontEncoding.h: 
-  removed font encoding methods from FileFinder 
-
-2013-01-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * Makefile.am, README, configure.ac, doc/Makefile.am, doc/dvisvgm.txt.in, 
-    src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h, 
-    src/Bitmap.cpp, src/Bitmap.h, src/BoundingBox.cpp, src/BoundingBox.h, 
-    src/CRC32.cpp, src/CRC32.h, src/Calculator.cpp, src/Calculator.h, 
-    src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, src/Color.cpp, 
-    src/Color.h, src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/CommandLine.cpp, src/CommandLine.h, src/DLLoader.cpp, src/DLLoader.h, 
-    src/DVIActions.cpp, src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h, 
-    src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/Directory.cpp, src/Directory.h, 
-    src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
-    src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, src/FileFinder.cpp, 
-    src/FileFinder.h, src/FilePath.cpp, src/FilePath.h, src/FileSystem.cpp, 
-    src/FileSystem.h, src/Font.cpp, src/Font.h, src/FontCache.cpp, 
-    src/FontCache.h, src/FontEncoding.cpp, src/FontEncoding.h, 
-    src/FontEngine.cpp, src/FontEngine.h, src/FontManager.cpp, 
-    src/FontManager.h, src/FontMap.cpp, src/FontMap.h, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.h, src/GFReader.cpp, src/GFReader.h, src/GFTracer.cpp, 
-    src/GFTracer.h, src/Ghostscript.cpp, src/Ghostscript.h, src/Glyph.h, 
-    src/GlyphTracerMessages.h, src/GraphicPath.h, src/HtmlSpecialHandler.h, 
-    src/InputBuffer.cpp, src/InputBuffer.h, src/InputReader.cpp, 
-    src/InputReader.h, src/Length.cpp, src/Length.h, src/Makefile.am, 
-    src/Matrix.cpp, src/Matrix.h, src/Message.cpp, src/Message.h, 
-    src/MessageException.h, src/MetafontWrapper.cpp, src/MetafontWrapper.h, 
-    src/MiKTeXCom.cpp, src/MiKTeXCom.h, src/PSInterpreter.cpp, 
-    src/PSInterpreter.h, src/PageRanges.cpp, src/PageRanges.h, 
-    src/PageSize.cpp, src/PageSize.h, src/Pair.h, src/Process.cpp, 
-    src/Process.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/SVGTree.cpp, src/SVGTree.h, src/SWFWriter.cpp, src/SWFWriter.h, 
-    src/SignalHandler.cpp, src/SignalHandler.h, src/SpecialActions.h, 
-    src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h, 
-    src/StreamReader.cpp, src/StreamReader.h, src/StreamWriter.cpp, 
-    src/StreamWriter.h, src/System.cpp, src/System.h, src/TFM.cpp, src/TFM.h, 
-    src/Terminal.cpp, src/Terminal.h, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h, src/VFActions.h, src/VFReader.cpp, 
-    src/VFReader.h, src/VectorStream.h, src/XMLDocTypeNode.h, 
-    src/XMLDocument.cpp, src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h, 
-    src/XMLString.cpp, src/XMLString.h, src/dvisvgm.cpp, src/macros.h, 
-    src/options.dtd, src/options.xml, src/psdefs.ps, src/psdefs.psc, 
-    src/types.h, tests/BoundingBoxTest.cpp, tests/CRC32Test.cpp, 
-    tests/CalculatorTest.cpp, tests/ColorSpecialTest.cpp, 
-    tests/CommandLineTest.cpp, tests/DirectoryTest.cpp, 
-    tests/FileFinderTest.cpp, tests/FilePathTest.cpp, 
-    tests/FileSystemTest.cpp, tests/FontManagerTest.cpp, 
-    tests/FontMapTest.cpp, tests/GFReaderTest.cpp, tests/GraphicPathTest.cpp, 
-    tests/LengthTest.cpp, tests/Makefile.am, tests/MatrixTest.cpp, 
-    tests/MessageExceptionTest.cpp, tests/PSInterpreterTest.cpp, 
-    tests/PageRagesTest.cpp, tests/PageSizeTest.cpp, tests/PairTest.cpp, 
-    tests/SplittedCharInputBufferTest.cpp, tests/StreamInputBufferTest.cpp, 
-    tests/StreamReaderTest.cpp, tests/StreamWriterTest.cpp, 
-    tests/TypesTest.cpp, tests/VectorStreamTest.cpp, tests/create-makefile: 
-  updated year in copyright statements to 2013 
-
-2012-12-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp, src/Message.cpp, src/dvisvgm.cpp: 
-  reduced scope of some variables 
-
-  * src/CmdLineParserBase.h, src/Directory.cpp, src/GFReader.cpp, 
-    src/PsSpecialHandler.cpp: 
-  initialize uninitialized member variables 
-
-  * src/FileFinder.cpp, src/MiKTeXCom.cpp, src/Process.cpp: 
-  avoid creating copies of exception objects 
-
-  * src/FontCache.cpp, src/PsSpecialHandler.cpp, src/TpicSpecialHandler.cpp: 
-  check emptiness of containers with empty() instead of size() 
-
-2012-12-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/SpecialManager.cpp: 
-  clear all corresponding containers when calling 
-  SpecialHandler::unregisterHandlers() 
-
-  * src/FontCache.cpp: 
-  replaced 'char' with 'glyph' in font cache listing 
-
-2012-12-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Ghostscript.cpp: 
-  added explicit cast to avoid signed/unsigned comparison warning 
-
-2012-12-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/Ghostscript.cpp: 
-  use gsdll64.dll for 64-bit builds; added info about gsdll64.dll to 
-  manpage 
-
-  * src/FileFinder.cpp, src/FontEngine.cpp, src/Makefile.am, 
-    src/MiKTeXCom.cpp, src/MiKTeXCom.h: 
-  moved MiKTeX COM code to separate class 
-
-  * src/MiKTeX209-session_i.c: 
-  add additiona files required to build dvisvgm with MinGW 
-
-  * src/macros.h: 
-  removed SHOW() from macros.h 
-
-  * tests/FileSystemTest.cpp, tests/GFReaderTest.cpp: 
-  ensure that tests work properly on Windows 
-
-  * src/FilePath.cpp, tests/FilePathTest.cpp: 
-  strip drive letter if it's not set (Windows only) 
-
-2012-11-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PSInterpreter.cpp, src/psdefs.ps, src/psdefs.psc: 
-  print operand stack in case of a PS error 
-
-  * src/Ghostscript.cpp, src/Ghostscript.h, src/PSInterpreter.cpp, 
-    src/PSInterpreter.h, src/dvisvgm.cpp: 
-  print an error message if the execution of PS code fails 
-
-2012-11-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Message.cpp: 
-  handle wrapping of messages containing newlines correctly 
-
-2012-11-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DLLoader.cpp, src/DLLoader.h, src/Ghostscript.cpp: 
-  renamed DLLoader::loadFunction() to DLLoader::loadSymbol() 
-
-2012-11-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/Font.h, src/FontManager.cpp: 
-  print warning if font checksums don't match 
-
-  * src/FontEngine.cpp, src/FontEngine.h: 
-  renamed FontEngine::fname to FontEngine::_fontname 
-
-2012-11-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Directory.h: 
-  undefine macro max() to avoid compilation problems on Windows 
-
-2012-11-15  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp, src/FontManager.cpp, src/FontMap.cpp, src/FontMap.h, 
-    tests/FontMapTest.cpp: 
-  adapted code to use new MapLine class; introduced support of map line 
-  modes 
-
-  * src/Makefile.am, src/MapLine.cpp, src/MapLine.h, tests/Makefile.am, 
-    tests/MapLineTest.cpp: 
-  added new class MapLine to parse and evaluate a single line of a map 
-  file 
-
-  * src/FileFinder.cpp, src/FileFinder.h, src/dvisvgm.cpp: 
-  moved initialization of FontMap from FileFinder to dvisvgm.cpp 
-
-  * src/FileFinder.cpp, src/FileFinder.h, src/FontMap.cpp, src/FontMap.h, 
-    tests/FontMapTest.cpp: 
-  made class FontMap a singleton 
-
-2012-11-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp: 
-  prevent compilation error when using a C++11 compiler (patch by Peter 
-  Breitenlohner) 
-
-  * src/FileFinder.cpp, src/FileFinder.h, src/dvisvgm.cpp, 
-    tests/FileFinderTest.cpp, tests/FontManagerTest.cpp: 
-  initialize second parameter of kpse_set_program_name() correctly 
-
-  * src/FileFinder.cpp: 
-  initialize Ghostscript when compiled for TeX Live Win32 (patch by Peter 
-  Breitenlohner) 
-
-2012-11-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/InputBuffer.cpp, src/InputBuffer.h, src/InputReader.cpp, 
-    src/InputReader.h, src/PsSpecialHandler.cpp, 
-    tests/StreamInputBufferTest.cpp: 
-  some refactorings of class InputReader; added InputReader::find() 
-
-2012-09-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/Makefile.am: 
-  remove manpage when calling 'make distclean' 
-
-  * NEWS: 
-  updated NEWS 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.0.12 
-
-2012-09-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp, src/PsSpecialHandler.h: 
-  removed Ghostscript info from ps entry in list of special handlers 
-
-2012-09-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.ps, src/psdefs.psc: 
-  ignore dvips bop operators that might be present in PS specials 
-
-2012-09-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/StreamReader.cpp: 
-  fixed reading invalid number of string characters 
-
-2012-06-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/gfprint.mak: 
-  fixed bugs in gfprint, and added gfprint.mak for easier builds 
-
-2012-04-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVGActions.cpp, src/SVGTree.cpp, src/SVGTree.h, 
-    tests/frktest-nf-cmp.svg, tests/frktest-wf-cmp.svg, 
-    tests/sample-nf-cmp.svg, tests/sample-wf-cmp.svg: 
-  scale point units in the SVG files to big points (bp) 
-
-2012-04-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Matrix.cpp, src/Matrix.h, tests/MatrixTest.cpp: 
-  added Matrix::invert() and det() 
-
-2012-03-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Matrix.cpp, src/Matrix.h, tests/MatrixTest.cpp: 
-  added start index parameter to Matrix::set(vector<>) 
-
-2012-03-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.ps, src/psdefs.psc: 
-  evaluate PS operators rectclip, rectfill, and rectstroke 
-
-2012-03-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * src/dvisvgm.cpp: 
-  added Ghostscript to library list printed by --version=yes 
-
-  * src/Ghostscript.cpp, src/Ghostscript.h: 
-  added optional parameter to Ghostscript::revision() to retrieve the 
-  revision number only 
-
-2012-03-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.0.11 
-
-2012-03-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVGActions.cpp: 
-  correct location of a rule's bounding box (lp bug #948713) 
-
-2012-02-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in: 
-  fixed a couple of mistakes and formatting flaws in the manpage 
-
-2012-02-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README: 
-  updated information about bug reporting 
-
-2012-01-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TpicSpecialHandler.cpp: 
-  added some more comments to methods of class TpicSpecialHandler 
-
-  * src/InputReader.cpp, tests/StreamInputBufferTest.cpp: 
-  fixed parsing of negative floating point numbers starting with '-0.' (SF 
-  bug #3471097) 
-
-2012-01-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * Makefile.am, README, configure.ac, doc/Makefile.am, doc/dvisvgm.txt.in, 
-    src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h, 
-    src/Bitmap.cpp, src/Bitmap.h, src/BoundingBox.cpp, src/BoundingBox.h, 
-    src/CRC32.cpp, src/CRC32.h, src/Calculator.cpp, src/Calculator.h, 
-    src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, src/Color.cpp, 
-    src/Color.h, src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/CommandLine.cpp, src/CommandLine.h, src/DLLoader.cpp, src/DLLoader.h, 
-    src/DVIActions.cpp, src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h, 
-    src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/Directory.cpp, src/Directory.h, 
-    src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
-    src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, src/FileFinder.cpp, 
-    src/FileFinder.h, src/FilePath.cpp, src/FilePath.h, src/FileSystem.cpp, 
-    src/FileSystem.h, src/Font.cpp, src/Font.h, src/FontCache.cpp, 
-    src/FontCache.h, src/FontEncoding.cpp, src/FontEncoding.h, 
-    src/FontEngine.cpp, src/FontEngine.h, src/FontManager.cpp, 
-    src/FontManager.h, src/FontMap.cpp, src/FontMap.h, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.h, src/GFReader.cpp, src/GFReader.h, src/GFTracer.cpp, 
-    src/GFTracer.h, src/Ghostscript.cpp, src/Ghostscript.h, src/Glyph.h, 
-    src/GlyphTracerMessages.h, src/GraphicPath.h, src/HtmlSpecialHandler.h, 
-    src/InputBuffer.cpp, src/InputBuffer.h, src/InputReader.cpp, 
-    src/InputReader.h, src/Length.cpp, src/Length.h, src/Makefile.am, 
-    src/Matrix.cpp, src/Matrix.h, src/Message.cpp, src/Message.h, 
-    src/MessageException.h, src/MetafontWrapper.cpp, src/MetafontWrapper.h, 
-    src/PSInterpreter.cpp, src/PSInterpreter.h, src/PageRanges.cpp, 
-    src/PageRanges.h, src/PageSize.cpp, src/PageSize.h, src/Pair.h, 
-    src/Process.cpp, src/Process.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/SVGTree.cpp, src/SVGTree.h, 
-    src/SWFWriter.cpp, src/SWFWriter.h, src/SignalHandler.cpp, 
-    src/SignalHandler.h, src/SpecialActions.h, src/SpecialHandler.h, 
-    src/SpecialManager.cpp, src/SpecialManager.h, src/StreamReader.cpp, 
-    src/StreamReader.h, src/StreamWriter.cpp, src/StreamWriter.h, 
-    src/System.cpp, src/System.h, src/TFM.cpp, src/TFM.h, src/Terminal.cpp, 
-    src/Terminal.h, src/TpicSpecialHandler.cpp, src/TpicSpecialHandler.h, 
-    src/VFActions.h, src/VFReader.cpp, src/VFReader.h, src/VectorStream.h, 
-    src/XMLDocTypeNode.h, src/XMLDocument.cpp, src/XMLDocument.h, 
-    src/XMLNode.cpp, src/XMLNode.h, src/XMLString.cpp, src/XMLString.h, 
-    src/dvisvgm.cpp, src/macros.h, src/options.dtd, src/options.xml, 
-    src/psdefs.ps, src/psdefs.psc, src/types.h, tests/BoundingBoxTest.cpp, 
-    tests/CRC32Test.cpp, tests/CalculatorTest.cpp, 
-    tests/ColorSpecialTest.cpp, tests/CommandLineTest.cpp, 
-    tests/DirectoryTest.cpp, tests/FileFinderTest.cpp, 
-    tests/FilePathTest.cpp, tests/FileSystemTest.cpp, 
-    tests/FontManagerTest.cpp, tests/FontMapTest.cpp, tests/GFReaderTest.cpp, 
-    tests/GraphicPathTest.cpp, tests/LengthTest.cpp, tests/Makefile.am, 
-    tests/MatrixTest.cpp, tests/MessageExceptionTest.cpp, 
-    tests/PSInterpreterTest.cpp, tests/PageRagesTest.cpp, 
-    tests/PageSizeTest.cpp, tests/PairTest.cpp, 
-    tests/SplittedCharInputBufferTest.cpp, tests/StreamInputBufferTest.cpp, 
-    tests/StreamReaderTest.cpp, tests/StreamWriterTest.cpp, 
-    tests/TypesTest.cpp, tests/VectorStreamTest.cpp, tests/check-conv, 
-    tests/create-makefile: 
-  updated year in copyright statements 
-
-2011-12-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.0.10 
-
-  * tests/Makefile.am, tests/create-makefile: 
-  link tests with -lpthread (required by gtest on Ubuntu) 
-
-2011-12-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in: 
-  added documentation on environment variable DVISVGM_COLORS to manpage 
-
-  * src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, src/GlyphTracerMessages.h, 
-    src/Message.cpp, src/Message.h, src/MetafontWrapper.cpp, 
-    src/Terminal.cpp, src/Terminal.h, src/dvisvgm.cpp: 
-  allow users to customize the message colors 
-
-2011-11-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/GraphicPath.h: 
-  added some more comments to the methods of GraphicPath 
-
-2011-11-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac: 
-  move linker flag -lfreetype from LDFLAGS to LIBS to avoid linking 
-  problems 
-
-2011-10-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/SVGTree.cpp: 
-  avoid possible collisions of glyph IDs 
-
-  * src/FontMap.cpp: 
-  removed unused variable eval_prefix in helper function read_entry() 
-
-2011-10-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-2011-10-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/Font.h, src/FontManager.cpp, src/FontManager.h: 
-  extended class FontManager to handle external fonts 
-
-  * src/ExternalFont.cpp, src/ExternalFont.h, src/Makefile.am: 
-  added class ExternalFont 
-
-2011-10-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/FontDB.cpp, src/FontDB.h, src/Makefile.am: 
-  added class FontDB 
-
-  * src/DirectoryTree.cpp, src/DirectoryTree.h, src/Makefile.am, 
-    tests/DirectoryTreeTest.cpp, tests/Makefile.am: 
-  added class DirectoryTree 
-
-  * src/Directory.h: 
-  dropped method Directory::getEntry() 
-
-  * src/FilePath.cpp: 
-  added some missing comments to methods of class FilePath 
-
-2011-10-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Process.cpp: 
-  exclude definition of split_paramstr() from Windows builds as it's not 
-  used there 
-
-  * src/Process.cpp: 
-  added missing include <signal.h> to Process.cpp 
-
-2011-10-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/Makefile.am: 
-  add metadata/pdfmarks to pdf version of manpage 
-
-2011-09-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/InputReader.cpp, src/InputReader.h, tests/StreamInputBufferTest.cpp: 
-  added InputReader::getUntil() to simplify parsing of an input stream 
-
-  * src/CommandLine.cpp, src/CommandLine.h, src/dvisvgm.cpp, 
-    src/options.xml: 
-  added command-line option --query 
-
-2011-09-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * potracelib/auxiliary.h, potracelib/bitmap.h, potracelib/curve.c, 
-    potracelib/curve.h, potracelib/decompose.c, potracelib/decompose.h, 
-    potracelib/lists.h, potracelib/potracelib.c, potracelib/potracelib.h, 
-    potracelib/progress.h, potracelib/trace.c, potracelib/trace.h: 
-  updated bundled potrace library to version 1.10 
-
-2011-06-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp, src/MetafontWrapper.cpp: 
-  fixed segfault occured in TeX Live Win32 caused by mf.exe being 
-  unavailable (SF bug #3308473) 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.0.9dev 
-
-2011-05-31  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp: 
-  explicitly cast double to int in call of ClippingStack::dup()/pop() 
-
-  * NEWS, configure.ac, src/Doxyfile: 
-  set version to 1.0.8; updated NEWS 
-
-2011-05-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/check-conv, tests/sample-nf-cmp.svg, tests/sample-wf-cmp.svg: 
-  updated conversion tests 
-
-2011-05-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/Makefile.am, src/MetafontWrapper.cpp, 
-    src/MetafontWrapper.h, src/Process.cpp, src/Process.h, 
-    src/SignalHandler.cpp: 
-  replaced call of system() with Process::run() and kill child process if 
-  necessary 
-
-2011-05-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/MetafontWrapper.cpp: 
-  dropped '--halt-on-error' in Metafont call to process buggy mf files 
-  completely 
-
-  * src/FileFinder.cpp: 
-  MiKTeX: maketfm and makemf have been renamed to miktex-maketfm and 
-  miktex-makemf 
-
-2011-05-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DLLoader.h: 
-  added #undef NOMINMAX before (re)defining it 
-
-2011-05-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PSInterpreter.cpp, src/PSInterpreter.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/psdefs.ps, src/psdefs.psc, 
-    tests/PSInterpreterTest.cpp: 
-  PS handler: implemented evaluation of save, restore, and grestoreall 
-
-2011-05-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp: 
-  fixed potential segfault caused by invisible zero-length paths 
-
-  * src/PsSpecialHandler.cpp: 
-  add definitions in literal PS headers to dictionary TeXDict 
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVGActions.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/SpecialActions.h: 
-  fixed interaction between PS and DVI drawing position 
-
-  * configure.ac, src/Doxyfile: 
-  set version to 1.0.8dev 
-
-2011-05-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * fedora/dvisvgm-gs.patch, fedora/dvisvgm-potrace.patch, 
-    fedora/dvisvgm.spec: 
-  removed directories 'fedora' and 'homepage' 
-
-  * NEWS, README, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.7; updated NEWS and README 
-
-2011-05-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in: 
-  added info about dvips rounding issues to manpage 
-
-  * src/DVIToSVGActions.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/psdefs.ps, src/psdefs.psc: 
-  PS handler: added missing unit conversions (pt vs. bp) 
-
-  * src/PsSpecialHandler.h: 
-  corrected scaling formula applied to PS line properties 
-
-  * src/PSInterpreter.cpp, src/PsSpecialHandler.cpp: 
-  separate PS snippets by newline characters to leave preceding comments 
-
-2011-05-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Length.h: 
-  undefine macro IN 
-
-  * src/Ghostscript.cpp, src/Ghostscript.h, src/PSInterpreter.cpp, 
-    src/PSInterpreter.h: 
-  avoid 'this' pointer in initialazation list of 
-  PSInterpreter::PSInterpreter() 
-
-  * src/PsSpecialHandler.cpp: 
-  don't call Ghostscript::revision() in initialization of static variable 
-
-2011-05-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TpicSpecialHandler.cpp, src/TpicSpecialHandler.h: 
-  tpic special 'ip' must not draw the outline of the polygon but only fill 
-  its interior 
-
-  * src/PSInterpreter.cpp, src/PSInterpreter.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/macros.h, src/psdefs.ps, src/psdefs.psc, 
-    tests/PSInterpreterTest.cpp: 
-  improved handling of pure PostScript specials 
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, 
-    src/PSInterpreter.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/SpecialActions.h, src/SpecialHandler.h, src/SpecialManager.cpp, 
-    src/SpecialManager.h, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h: 
-  replaced methods for DVI position alterations with translation semantics 
-
-2011-05-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.ps, src/psdefs.psc: 
-  PS handler: recognize save/restore operators 
-
-2011-04-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.ps, src/psdefs.psc: 
-  catch PS error /nocurrentpoint in operator 'setpos' properly 
-
-  * src/SpecialManager.cpp: 
-  register special prefix ps:: properly 
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.7dev 
-
-2011-04-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, README, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.6; updated NEWS and README 
-
-2011-04-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/Font.cpp, src/GFReader.cpp, src/Makefile.am, 
-    src/MetafontWrapper.cpp, src/PSInterpreter.cpp, src/SignalHandler.cpp, 
-    src/SignalHandler.h, src/TFM.cpp, src/dvisvgm.cpp: 
-  added class SignalHandler for CTRL-C signals 
-
-  * src/DVIToSVGActions.cpp, src/MessageException.h, src/dvisvgm.cpp, 
-    tests/Makefile.am, tests/MessageExceptionTest.cpp: 
-  derived MessageException from std::exception and replaced getMessage() 
-  with what() 
-
-2011-04-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/XMLNode.cpp, src/XMLNode.h: 
-  prepended member variables of the XMLNode classes with underscore 
-
-2011-04-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp, src/FileFinder.h, src/dvisvgm.cpp, 
-    tests/FileFinderTest.cpp: 
-  dropped class FileFinder::Impl and simplified FileFinder interface 
-
-2011-03-15  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp: 
-  throw DVI exception if set_char/put_char is executed without preceding 
-  font selection 
-
-2011-03-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * pull-wiki: 
-  updated rsync parameters in 'pull-wiki' 
-
-2011-03-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CRC32.cpp, src/StreamWriter.cpp: 
-  added missing 'const' to type casts (Peter Breitenlohner) 
-
-  * potracelib/potracelib.c, potracelib/potracelib.h: 
-  changed return type of potrace_version() to 'const char *' in order to 
-  avoid compiler warning 
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.6dev 
-
-2011-02-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.5, updated NEWS 
-
-  * src/Ghostscript.cpp: 
-  fixed formatting of GS version number 
-
-  * doc/dvisvgm.txt.in, src/FontCache.cpp, src/FontCache.h, src/dvisvgm.cpp: 
-  added code to remove outdated and corrupted cache files 
-
-2011-02-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/frktest-nf-cmp.svg, tests/frktest-wf-cmp.svg, 
-    tests/sample-nf-cmp.svg, tests/sample-wf-cmp.svg: 
-  updated conversion test files 
-
-  * src/SVGTree.cpp: 
-  added missing unit in height/width attribute of svg root element 
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/GraphicPath.h, src/SVGTree.cpp, src/SVGTree.h, src/dvisvgm.cpp, 
-    src/options.xml, tests/CommandLineTest.cpp: 
-  added option to replace use elements with paths 
-
-2011-02-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/InputBuffer.h: 
-  reference to scanned string in StringInputBuffer is constant now 
-
-2011-02-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontCache.cpp, src/FontCache.h: 
-  added CRC32 checks to cache files 
-
-  * src/StreamReader.cpp, src/StreamReader.h, src/StreamWriter.cpp, 
-    src/StreamWriter.h, tests/Makefile.am, tests/StreamReaderTest.cpp, 
-    tests/StreamWriterTest.cpp: 
-  added CRC32 computation methods to StreamReader and StreamWriter 
-
-  * src/CRC32.cpp, src/CRC32.h, src/Makefile.am, tests/CRC32Test.cpp, 
-    tests/Makefile.am: 
-  added class CRC32 and corresponding tests 
-
-  * src/FileSystem.cpp, src/FileSystem.h, src/dvisvgm.cpp, 
-    tests/FileSystemTest.cpp: 
-  merged FileSystem::move() into FileSystem::copy() 
-
-2011-01-31  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CmdLineParserBase.cpp: 
-  print character instead of ascii value in message of command-line parser 
-
-2011-01-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/FileFinder.cpp, src/FileFinder.h, src/FontEngine.cpp, 
-    src/FontEngine.h, src/dvisvgm.cpp, src/options.xml: 
-  added optional argument to --version 
-
-2011-01-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * potracelib/auxiliary.h, potracelib/bitmap.h, potracelib/curve.c, 
-    potracelib/curve.h, potracelib/decompose.c, potracelib/decompose.h, 
-    potracelib/lists.h, potracelib/potracelib.c, potracelib/potracelib.h, 
-    potracelib/progress.h, potracelib/trace.c, potracelib/trace.h: 
-  updated bundled potrace library to version 1.9 
-
-2011-01-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/dvisvgm.cpp: 
-  moved cache files to subfolder ($HOME/.dvisvgm/cache) 
-
-2011-01-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/Makefile.am, tests/PSInterpreterTest.cpp: 
-  added basic tests for class PSInterpreter 
-
-  * Makefile.am, README, configure.ac, doc/Makefile.am, doc/dvisvgm.txt.in, 
-    src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h, 
-    src/Bitmap.cpp, src/Bitmap.h, src/BoundingBox.cpp, src/BoundingBox.h, 
-    src/Calculator.cpp, src/Calculator.h, src/CmdLineParserBase.cpp, 
-    src/CmdLineParserBase.h, src/Color.cpp, src/Color.h, 
-    src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/CommandLine.cpp, src/CommandLine.h, src/DLLoader.cpp, src/DLLoader.h, 
-    src/DVIActions.cpp, src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h, 
-    src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/Directory.cpp, src/Directory.h, 
-    src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
-    src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, src/FileFinder.cpp, 
-    src/FileFinder.h, src/FilePath.cpp, src/FilePath.h, src/FileSystem.cpp, 
-    src/FileSystem.h, src/Font.cpp, src/Font.h, src/FontCache.cpp, 
-    src/FontCache.h, src/FontEncoding.cpp, src/FontEncoding.h, 
-    src/FontEngine.cpp, src/FontEngine.h, src/FontManager.cpp, 
-    src/FontManager.h, src/FontMap.cpp, src/FontMap.h, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.h, src/GFReader.cpp, src/GFReader.h, src/GFTracer.cpp, 
-    src/GFTracer.h, src/Ghostscript.cpp, src/Ghostscript.h, src/Glyph.h, 
-    src/GlyphTracerMessages.h, src/GraphicPath.h, src/HtmlSpecialHandler.h, 
-    src/InputBuffer.cpp, src/InputBuffer.h, src/InputReader.cpp, 
-    src/InputReader.h, src/Length.cpp, src/Length.h, src/Makefile.am, 
-    src/Matrix.cpp, src/Matrix.h, src/Message.cpp, src/Message.h, 
-    src/MessageException.h, src/MetafontWrapper.cpp, src/MetafontWrapper.h, 
-    src/PSInterpreter.cpp, src/PSInterpreter.h, src/PageRanges.cpp, 
-    src/PageRanges.h, src/PageSize.cpp, src/PageSize.h, src/Pair.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/SVGTree.cpp, 
-    src/SVGTree.h, src/SWFWriter.cpp, src/SWFWriter.h, src/SpecialActions.h, 
-    src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h, 
-    src/StreamReader.cpp, src/StreamReader.h, src/StreamWriter.cpp, 
-    src/StreamWriter.h, src/System.cpp, src/System.h, src/TFM.cpp, src/TFM.h, 
-    src/Terminal.cpp, src/Terminal.h, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h, src/VFActions.h, src/VFReader.cpp, 
-    src/VFReader.h, src/VectorStream.h, src/XMLDocTypeNode.h, 
-    src/XMLDocument.cpp, src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h, 
-    src/XMLString.cpp, src/XMLString.h, src/dvisvgm.cpp, src/macros.h, 
-    src/options.dtd, src/options.xml, src/psdefs.ps, src/psdefs.psc, 
-    src/types.h, tests/BoundingBoxTest.cpp, tests/CalculatorTest.cpp, 
-    tests/ColorSpecialTest.cpp, tests/CommandLineTest.cpp, 
-    tests/DirectoryTest.cpp, tests/FileFinderTest.cpp, 
-    tests/FilePathTest.cpp, tests/FontManagerTest.cpp, tests/FontMapTest.cpp, 
-    tests/GFReaderTest.cpp, tests/GraphicPathTest.cpp, tests/LengthTest.cpp, 
-    tests/Makefile.am, tests/MatrixTest.cpp, tests/PageRagesTest.cpp, 
-    tests/PageSizeTest.cpp, tests/PairTest.cpp, 
-    tests/SplittedCharInputBufferTest.cpp, tests/StreamInputBufferTest.cpp, 
-    tests/TypesTest.cpp, tests/VectorStreamTest.cpp, tests/check-conv, 
-    tests/create-makefile: 
-  updated year in copyright info 
-
-2010-12-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in: 
-  minor update to the manpage 
-
-  * NEWS, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.4; updated NEWS 
-
-  * src/PSInterpreter.cpp, src/PSInterpreter.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/psdefs.ps, src/psdefs.psc: 
-  PS handler: added missing scaling of linewidths and dash distances 
-
-  * src/PsSpecialHandler.cpp: 
-  fixed scaling issue in PS positioning 
-
-2010-12-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp: 
-  updated to MiKTeX 2.8 SDK 
-
-2010-08-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.4dev 
-
-  * src/FontEngine.cpp: 
-  fixed FreeType version check (patch by Paul Vojta) 
-
-2010-08-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/Makefile.am, tests/PairTest.cpp: 
-  added PairTest 
-
-2010-08-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, doc/dvisvgm.txt.in: 
-  updated manpage and NEWS 
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.3 
-
-2010-08-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BoundingBox.cpp, src/BoundingBox.h, src/Matrix.cpp, src/Matrix.h, 
-    src/PsSpecialHandler.cpp: 
-  revamped PsSpecialHandler::psfile() to fix a transformation issue (SF 
-  bug #3037372) 
-
-2010-07-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp: 
-  added check of DVI format version 
-
-2010-07-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp, src/PsSpecialHandler.h: 
-  restore transformation matrix after execution of psfile 
-
-2010-07-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Directory.cpp, src/Directory.h, src/GFReader.cpp, src/GFReader.h: 
-  added leading underscore to variables of GFReader 
-
-  * src/GraphicPath.h, src/PsSpecialHandler.h: 
-  fixed missing initialization of GraphicPath iterator 
-
-  * src/Terminal.cpp: 
-  replaced \e with \x1B 
-
-  * src/InputBuffer.h: 
-  added missing namespace prefix 
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.3dev 
-
-2010-06-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.2 
-
-  * src/gzstream.cpp, src/gzstream.h: 
-  fixed class variable issue introduced by previous AIX patch 
-
-2010-06-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Bitmap.cpp, tests/DirectoryTest.cpp, tests/GFReaderTest.cpp, 
-    tests/Makefile.am, tests/cmr10.600gf, tests/create-makefile: 
-  added GFReaderTest; updated DirectoryTest 
-
-2010-06-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/types.h, tests/Makefile.am, tests/TypesTest.cpp: 
-  added TypesTest 
-
-  * src/Message.cpp, src/Message.h: 
-  renamed MessageStream::putchar() to MessageStream::putChar() to avoid 
-  name clashes 
-
-  * src/Bitmap.cpp, src/Calculator.cpp, src/CmdLineParserBase.cpp, 
-    src/Color.cpp, src/ColorSpecialHandler.cpp, src/DVIReader.cpp, 
-    src/DVIReader.h, src/DVIToSVGActions.cpp, src/DvisvgmSpecialHandler.cpp, 
-    src/EmSpecialHandler.cpp, src/FontCache.cpp, src/FontEncoding.cpp, 
-    src/GFGlyphTracer.cpp, src/Pair.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/TFM.cpp, src/TFM.h: 
-  fixed some type conversion warnings 
-
-2010-06-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * potracelib/curve.c, potracelib/curve.h, potracelib/decompose.c: 
-  renamed internal potrace functions path_new() and path_free() to prevent 
-  linker conflicts on OS X 
-
-  * configure.ac, src/CmdLineParserBase.h, src/FileFinder.h, 
-    src/FontCache.cpp, src/FontCache.h, src/FontEncoding.cpp, 
-    src/FontEngine.cpp, src/GFGlyphTracer.h, src/MetafontWrapper.cpp, 
-    src/gzstream.cpp: 
-  applied latest TL patches from Peter Breitenlohner and Karl Berry 
-
-2010-06-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.2dev 
-
-2010-06-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.1 
-
-  * src/Message.cpp: 
-  suppress ANSI color code by default 
-
-2010-06-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.ps, src/psdefs.psc: 
-  fixed recursion issue in PS operator charpath 
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0.1dev 
-
-2010-06-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PSInterpreter.cpp, src/PSInterpreter.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h: 
-  fixed PS destructor issue (SF bug #3013392) 
-
-  * NEWS, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0 
-
-  * doc/Makefile.am, doc/dvisvgm.txt.in: 
-  documented option --help and --version in manpage 
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/DVIActions.h, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/Makefile.am, src/Message.cpp, src/Message.h, src/PSInterpreter.cpp, 
-    src/PSInterpreter.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/SpecialActions.h, src/System.cpp, src/System.h, src/dvisvgm.cpp, 
-    src/options.xml: 
-  added percentage-based progress indicator 
-
-  * src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h: 
-  added method to compute length of DVI command 
-
-  * src/PSInterpreter.cpp, src/PSInterpreter.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/psdefs.ps, src/psdefs.psc: 
-  evaluate Ghostscript operator .setopacityalpha 
-
-  * src/Font.cpp: 
-  print error message if Metafont failed 
-
-  * configure.ac, doc/Makefile.am, doc/dvisvgm.txt.in, src/CommandLine.cpp, 
-    src/CommandLine.h, src/DVIActions.h, src/DVIToSVG.cpp, src/GFTracer.cpp, 
-    src/GlyphTracerMessages.h, src/Makefile.am, src/Message.cpp, 
-    src/Message.h, src/MetafontWrapper.cpp, src/Terminal.cpp, src/Terminal.h, 
-    src/dvisvgm.cpp, src/options.xml: 
-  improved output of messages including optional colorization 
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Makefile.am, 
-    src/PageRanges.cpp, src/PageRanges.h, src/StreamCounter.h, 
-    src/dvisvgm.cpp, src/options.xml, tests/BoundingBoxTest.cpp, 
-    tests/CommandLineTest.cpp, tests/Makefile.am, tests/PageRagesTest.cpp, 
-    tests/StreamCounterTest.cpp: 
-  added conversion of multiple pages 
-
-  * src/InputBuffer.h, tests/ColorSpecialTest.cpp, 
-    tests/StreamInputBufferTest.cpp: 
-  added InputBuffer::invalidate() 
-
-  * src/FilePath.cpp, src/FilePath.h, src/FileSystem.cpp, src/FileSystem.h, 
-    src/Makefile.am, tests/FilePathTest.cpp, tests/Makefile.am: 
-  added class FilePath 
-
-  * doc/dvisvgm.txt.in, src/BoundingBox.cpp, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/DvisvgmSpecialHandler.cpp, 
-    src/EmSpecialHandler.cpp, src/PsSpecialHandler.cpp, src/SpecialActions.h, 
-    src/SpecialManager.cpp, src/TpicSpecialHandler.cpp: 
-  added special for creating local bounding boxes 
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 1.0dev 
-
-  * configure.ac, doc/Makefile.am, src/Makefile.am: 
-  cleaned up configuration scripts 
-
-2010-05-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac: 
-  fixed whitespace issue in CPPFLAGS and LDFLAGS 
-
-2010-05-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/FileFinderTest.cpp, tests/FontManagerTest.cpp, tests/check-conv: 
-  fixed segfaults in tests 
-
-  * configure.ac: 
-  fixed kpathsea check; use pkg-config to check freetype availability 
-
-2010-04-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 0.9.1 
-
-  * tests/check-conv, tests/frktest-wf-cmp.svg, tests/sample-wf-cmp.svg: 
-  adapted conversion tests to new output format 
-
-  * src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, 
-    src/DVIToSVG.h, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h: 
-  print page count and page number of DVI page being processed 
-
-  * src/SVGTree.cpp: 
-  fixed broken validity when using SVG fonts 
-
-  * src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/SVGTree.cpp, src/SVGTree.h, src/XMLNode.cpp, src/XMLNode.h: 
-  ignore unused fonts in CSS styles list 
-
-  * src/CommandLine.cpp, src/options.xml: 
-  output of option --help: replaced '(default: FOO)' by '[FOO]' 
-
-2010-04-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontEncoding.cpp: 
-  fixed memory bug in FontEncoding::encoding() 
-
-2010-04-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVGActions.cpp: 
-  replaced wrong font pointer that could lead to segfaults 
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 0.9.1dev 
-
-2010-03-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * fedora/dvisvgm.spec: 
-  updated spec file 
-
-2010-03-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * transfer-cs: 
-  added extension .patch to exported changesets 
-
-  * tests/frktest-nf-cmp.svg, tests/frktest-wf-cmp.svg, 
-    tests/sample-nf-cmp.svg, tests/sample-wf-cmp.svg: 
-  updated conversion tests 
-
-  * NEWS, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 0.9 
-
-  * src/FontCache.cpp, src/GFGlyphTracer.cpp, src/GFReader.cpp: 
-  variable _fontname is now correctly set in class FontCache 
-
-  * src/CmdLineParserBase.cpp, src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, 
-    src/FontEngine.cpp, src/GlyphTracerMessages.h, src/Message.cpp, 
-    src/Message.h, src/MetafontWrapper.cpp, src/dvisvgm.cpp: 
-  added class MessageStream, updated message output 
-
-  * src/FontCache.cpp, src/Makefile.am, src/StreamWriter.cpp, 
-    src/StreamWriter.h, src/TFM.cpp: 
-  replaced local stream IO functions by StreamReader/StreamWriter methods 
-
-  * doc/dvisvgm.txt.in, src/BoundingBox.cpp, src/BoundingBox.h, 
-    src/CommandLine.cpp, src/CommandLine.h, src/DVIToSVG.cpp, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Font.cpp, src/Font.h, 
-    src/GlyphTracerMessages.h, src/Makefile.am, src/dvisvgm.cpp, 
-    src/options.xml: 
-  added command-line option --exact 
-
-  * src/Font.cpp, src/Font.h, src/dvisvgm.cpp: 
-  moved some methods from PhysicalFontImpl to PysicalFont 
-
-2010-03-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/Font.cpp, src/Font.h, src/dvisvgm.cpp, src/options.xml: 
-  added command-line option --keep 
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/DVIToSVG.cpp, src/DVIToSVG.h, src/Font.cpp, src/Font.h, 
-    src/dvisvgm.cpp, src/options.xml, tests/CommandLineTest.cpp: 
-  reactivated option --trace-all, and added optional argument 'retrace' to 
-  it 
-
-  * src/CmdLineParserBase.cpp, src/CmdLineParserBase.h: 
-  added evaluation of boolean and char arguments to the command-line 
-  parser 
-
-  * src/DVIToSVG.cpp, src/Font.cpp, src/Font.h, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.h, src/SVGTree.cpp, src/SVGTree.h: 
-  added class GFGlyphTracer::Callback providing an interface used to print 
-  status information about the tracer 
-
-  * src/DVIToSVG.cpp, src/SVGTree.cpp: 
-  moved creation of SVG 'use' elements from class DVIToSVG to class 
-  SVGTree 
-
-2010-03-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BoundingBox.cpp, src/Calculator.cpp, src/Matrix.cpp, 
-    src/PSInterpreter.cpp, src/PSInterpreter.h: 
-  fixed a couple of comments 
-
-  * src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVGActions.cpp, src/Font.cpp, 
-    src/Font.h, src/FontEmitter.h, src/GFGlyphTracer.h, src/Makefile.am, 
-    src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, src/SVGTree.cpp, 
-    src/SVGTree.h, src/dvisvgm.cpp, tests/Makefile.am, tests/check-conv, 
-    tests/create-makefile: 
-  removed emitter classes; incorporated their functionality into SVGTree 
-  and PhysicalFontImpl 
-
-  * src/FontCache.cpp, src/FontCache.h: 
-  added method FontCache::write(const char *dir) that updates the cache 
-  file of the current font 
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, 
-    src/DVIToSVGActions.cpp, src/FontManager.cpp, src/FontManager.h, 
-    src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, src/SVGTree.cpp, 
-    src/SVGTree.h, src/VFReader.h, tests/FontManagerTest.cpp: 
-  made FontManager a singleton 
-
-  * src/CharmapTranslator.cpp, src/CharmapTranslator.h, src/DVIToSVG.cpp, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Font.cpp, src/Font.h, 
-    src/Makefile.am, src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, src/SVGTree.cpp, 
-    src/SVGTree.h: 
-  removed class CharmapTranslator 
-
-  * src/GFReader.cpp, src/GFReader.h: 
-  replaced GFReader messages by exceptions 
-
-2010-02-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/FontCache.cpp, src/FontCache.h, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.h, src/GFReader.cpp, src/GFReader.h, src/GFTracer.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h: 
-  refactorings of GF tracer class; removed transferGlyph() 
-
-2010-02-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CharmapTranslator.cpp, src/CharmapTranslator.h, src/Font.cpp, 
-    src/Font.h, src/FontCache.cpp, src/FontCache.h, src/FontEngine.cpp, 
-    src/FontEngine.h, src/Glyph.cpp, src/Glyph.h, src/Makefile.am, 
-    src/SVGFontEmitter.cpp, src/SVGFontEmitter.h: 
-  removed class Glyph and incorporated its functionality into Font class 
-
-  * src/Font.h, src/FontEncoding.cpp, src/FontEncoding.h, 
-    src/FontManager.cpp, src/FontManager.h, src/SVGFontEmitter.cpp: 
-  moved method encoding() from class FontManager to class FontEncoding 
-
-2010-02-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp: 
-  added evaluation of literal PS headers to PSHeaderActions 
-
-2010-02-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.ps, src/psdefs.psc: 
-  removed PS error handler nocurrentpoint 
-
-2010-02-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * fedora/dvisvgm.spec: 
-  updated homepage and spec file 
-
-  * NEWS, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  version updated to 0.8.8 
-
-2010-02-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/check-conv: 
-  skip conversion checks by default 
-
-2010-01-31  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/normalize.xsl: 
-  some improvements to normalize.xsl 
-
-  * tests/Makefile.am, tests/check-conv, tests/create-makefile, 
-    tests/frktest-nf-cmp.svg, tests/frktest-wf-cmp.svg, tests/frktest.dvi, 
-    tests/normalize.xsl, tests/sample-nf-cmp.svg, tests/sample-wf-cmp.svg, 
-    tests/sample.dvi: 
-  added tests to check conversion results 
-
-2010-01-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/GraphicPath.h: 
-  fixed scaling bug in computation of glyph paths when using -n 
-
-  * src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, src/CommandLine.cpp, 
-    src/CommandLine.h: 
-  removed CmdLineParserBase::numOptions() 
-
-2010-01-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/FontCache.h, src/dvisvgm.cpp, src/options.dtd, src/options.xml: 
-  added command-line option --libgs 
-
-2010-01-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CommandLine.cpp, src/options.dtd, src/options.xml: 
-  added DTD for options.xml 
-
-2010-01-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Ghostscript.cpp: 
-  fixed typo in variable name 
-
-  * NEWS: 
-  updated NEWS 
-
-  * doc/dvisvgm.txt.in, src/FileFinder.cpp, src/Ghostscript.cpp, 
-    src/Ghostscript.h, src/dvisvgm.cpp: 
-  environment variable LIBGS can now be used to set the name of the GS 
-  shared library 
-
-  * Makefile.am, README, configure.ac, doc/dvisvgm.txt.in, 
-    src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h, 
-    src/Bitmap.cpp, src/Bitmap.h, src/BoundingBox.cpp, src/BoundingBox.h, 
-    src/Calculator.cpp, src/Calculator.h, src/CharmapTranslator.cpp, 
-    src/CharmapTranslator.h, src/CmdLineParserBase.cpp, 
-    src/CmdLineParserBase.h, src/Color.cpp, src/Color.h, 
-    src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/CommandLine.cpp, src/CommandLine.h, src/DLLoader.cpp, src/DLLoader.h, 
-    src/DVIActions.cpp, src/DVIActions.h, src/DVIReader.cpp, src/DVIReader.h, 
-    src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/Directory.cpp, src/Directory.h, 
-    src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
-    src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, src/FileFinder.cpp, 
-    src/FileFinder.h, src/FileSystem.cpp, src/FileSystem.h, src/Font.cpp, 
-    src/Font.h, src/FontCache.cpp, src/FontCache.h, src/FontEmitter.h, 
-    src/FontEncoding.cpp, src/FontEncoding.h, src/FontEngine.cpp, 
-    src/FontEngine.h, src/FontManager.cpp, src/FontManager.h, 
-    src/FontMap.cpp, src/FontMap.h, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.h, src/GFReader.cpp, src/GFReader.h, src/GFTracer.cpp, 
-    src/GFTracer.h, src/Ghostscript.cpp, src/Ghostscript.h, src/Glyph.cpp, 
-    src/Glyph.h, src/GraphicPath.h, src/HtmlSpecialHandler.h, 
-    src/InputBuffer.cpp, src/InputBuffer.h, src/InputReader.cpp, 
-    src/InputReader.h, src/Length.cpp, src/Length.h, src/Makefile.am, 
-    src/Matrix.cpp, src/Matrix.h, src/Message.cpp, src/Message.h, 
-    src/MessageException.h, src/MetafontWrapper.cpp, src/MetafontWrapper.h, 
-    src/PSInterpreter.cpp, src/PSInterpreter.h, src/PageSize.cpp, 
-    src/PageSize.h, src/Pair.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, src/SVGTree.cpp, 
-    src/SVGTree.h, src/SWFWriter.cpp, src/SWFWriter.h, src/SpecialActions.h, 
-    src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h, 
-    src/StreamCounter.h, src/StreamReader.cpp, src/StreamReader.h, 
-    src/TFM.cpp, src/TFM.h, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h, src/VFActions.h, src/VFReader.cpp, 
-    src/VFReader.h, src/VectorStream.h, src/XMLDocTypeNode.h, 
-    src/XMLDocument.cpp, src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h, 
-    src/XMLString.cpp, src/XMLString.h, src/dvisvgm.cpp, src/macros.h, 
-    src/options.xml, src/psdefs.ps, src/psdefs.psc, src/types.h, 
-    tests/BoundingBoxTest.cpp, tests/CalculatorTest.cpp, 
-    tests/ColorSpecialTest.cpp, tests/CommandLineTest.cpp, 
-    tests/DirectoryTest.cpp, tests/FileFinderTest.cpp, 
-    tests/FontManagerTest.cpp, tests/FontMapTest.cpp, 
-    tests/GraphicPathTest.cpp, tests/LengthTest.cpp, tests/Makefile.am, 
-    tests/MatrixTest.cpp, tests/PageSizeTest.cpp, 
-    tests/SplittedCharInputBufferTest.cpp, tests/StreamCounterTest.cpp, 
-    tests/StreamInputBufferTest.cpp, tests/VectorStreamTest.cpp, 
-    tests/create-makefile: 
-  updated boilerplates 
-
-  * doc/dvisvgm.txt.in, src/BoundingBox.cpp, src/BoundingBox.h, 
-    src/DVIToSVG.cpp, tests/BoundingBoxTest.cpp, tests/Makefile.am: 
-  added support for enlarging the minimal bbox by a given amount. 
-
-  * configure.ac: 
-  updated type of kpathsea_version_string (patch by lomov_vl) 
-
-2009-12-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/InputReader.cpp: 
-  fixed bug in InputReader::parseUInt() 
-
-2009-12-15  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/dvisvgm.cpp: 
-  appied get_time patch sent by Peter Breitenlohner 
-
-2009-12-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BoundingBox.h, src/Calculator.h, src/CharmapTranslator.h, 
-    src/DVIReader.h, src/DVIToSVG.h, src/DVIToSVGActions.h, src/Font.h, 
-    src/FontEngine.h, src/FontManager.h, src/FontMap.h, src/GFGlyphTracer.h, 
-    src/GFReader.h, src/MessageException.h, src/MetafontWrapper.h, 
-    src/PageSize.h, src/SVGTree.cpp, src/SVGTree.h, src/StreamReader.h, 
-    src/VFActions.h, src/VFReader.h, src/XMLDocTypeNode.h, src/XMLDocument.h, 
-    src/XMLNode.h, src/XMLString.h: 
-  removed using statements from header files 
-
-2009-11-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontCache.cpp, src/FontCache.h, src/FontEngine.cpp, 
-    src/FontEngine.h, src/FontGlyph.cpp, src/FontGlyph.h, 
-    src/GFGlyphTracer.cpp, src/GFGlyphTracer.h, src/GFTracer.cpp, 
-    src/Glyph.cpp, src/Glyph.h, src/GraphicPath.h, src/Makefile.am, 
-    src/Pair.h, src/SVGFontEmitter.cpp, src/SVGFontTraceEmitter.cpp, 
-    tests/GraphicPathTest.cpp: 
-  removed FEGlyphCommands and replaced separate glyph class implementation 
-  by class GraphicPath 
-
-2009-11-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp: 
-  avoid scaling by 1 in use elements 
-
-2009-11-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DLLoader.cpp, src/DLLoader.h: 
-  fixed line endings 
-
-  * src/Ghostscript.cpp, src/Ghostscript.h: 
-  replaced #if HAVE_LIBGS by #if defined(HAVE_LIBGS) 
-
-  * src/DVIToSVG.cpp, src/Ghostscript.cpp, src/Ghostscript.h: 
-  replaced #if !DISABLE_GS by #if !defined(DISABLE_GS) (Peter 
-  Breitenlohner) 
-
-2009-11-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  updated NEWS 
-
-  * src/dvisvgm.cpp: 
-  don't use email adress PACKAGE_BUGREPORT for copyright notice 
-
-  * src/CmdLineParserBase.h, src/GraphicPath.h, src/InputReader.h, 
-    src/Makefile.am, src/PSInterpreter.h, src/SpecialManager.h: 
-  added missing virtual destructors to avoid warnings 
-
-  * src/InputReader.cpp: 
-  added missing initialization value (Peter Breitenlohner) 
-
-  * src/Color.cpp, src/ColorSpecialHandler.cpp, src/FontManager.cpp, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/TpicSpecialHandler.cpp: 
-  added explicit casts to avoid compiler warnings (Peter Breitenlohner) 
-
-  * potracelib/potracelib.c, potracelib/potracelib.h: 
-  replaced outdated string constant type char* by const char* in 
-  potrace_version() 
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 0.8.8dev 
-
-2009-11-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * fedora/dvisvgm.spec: 
-  updated spec file 
-
-2009-11-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 0.8.7 
-
-  * NEWS, src/Color.cpp, src/Color.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/SVGTree.cpp: 
-  PS handler: colors set by color specials are now considered properly 
-
-  * src/DVIToSVG.cpp, src/dvisvgm.cpp: 
-  added total number of pages to message text 
-
-2009-11-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, src/PsSpecialHandler.cpp: 
-  fixed path scaling issue in PS handler 
-
-  * NEWS, doc/dvisvgm.txt.in: 
-  updated NEWS and manpage 
-
-  * src/GraphicPath.h, src/PsSpecialHandler.cpp: 
-  PS handler: replace zero-length paths by dots 
-
-2009-10-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DvisvgmSpecialHandler.cpp: 
-  added macro {?nl} to dvisvgm:raw evaluator 
-
-2009-10-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/TFM.cpp, src/TFM.h: 
-  added italic correction values to character widths 
-
-2009-10-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/Doxyfile: 
-  increased version to 0.8.7dev 
-
-  * tests/Makefile.am, tests/create-makefile: 
-  added script to create tests/Makefile.am 
-
-2009-10-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * README, tests/CalculatorTest.cpp, tests/CalculatorTest.h, 
-    tests/ColorSpecialTest.cpp, tests/ColorSpecialTest.h, 
-    tests/CommandLineTest.cpp, tests/CommandLineTest.h, 
-    tests/DirectoryTest.cpp, tests/DirectoryTest.h, tests/FileFinderTest.cpp, 
-    tests/FileFinderTest.h, tests/FontManagerTest.cpp, 
-    tests/FontManagerTest.h, tests/FontMapTest.cpp, tests/FontMapTest.h, 
-    tests/GraphicPathTest.cpp, tests/GraphicPathTest.h, tests/LengthTest.cpp, 
-    tests/LengthTest.h, tests/Makefile.am, tests/MatrixTest.cpp, 
-    tests/MatrixTest.h, tests/PageSizeTest.cpp, tests/PageSizeTest.h, 
-    tests/SplittedCharInputBufferTest.cpp, 
-    tests/SplittedCharInputBufferTest.h, tests/StreamCounterTest.cpp, 
-    tests/StreamCounterTest.h, tests/StreamInputBufferTest.cpp, 
-    tests/StreamInputBufferTest.h, tests/VectorStreamTest.cpp, 
-    tests/VectorStreamTest.h: 
-  replaced cxxtest by googletest 
-
-  * doc/Makefile.am: 
-  added missing dvi suffix in Makefile target dvi-pdf 
-
-  * fedora/dvisvgm.spec: 
-  updated spec file 
-
-  * doc/Makefile.am, doc/dvisvgm.txt.in: 
-  removed outdated post-processing of manpage 
-
-2009-10-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontInfo.cpp, src/FontInfo.h, src/FontTracer.h, src/PSObject.cpp, 
-    src/PSObject.h, src/PSState.cpp, src/PSState.h, src/global.cpp, 
-    src/global.h: 
-  removed unused source files 
-
-  * src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h, 
-    src/Bitmap.cpp, src/Bitmap.h, src/BoundingBox.cpp, src/BoundingBox.h, 
-    src/Calculator.cpp, src/Calculator.h, src/CharmapTranslator.cpp, 
-    src/CharmapTranslator.h, src/CmdLineParserBase.cpp, 
-    src/CmdLineParserBase.h, src/Color.cpp, src/Color.h, 
-    src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, src/DLLoader.cpp, 
-    src/DLLoader.h, src/DVIActions.cpp, src/DVIActions.h, src/DVIReader.cpp, 
-    src/DVIReader.h, src/DVIToSVG.h, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/Directory.cpp, src/Directory.h, 
-    src/DvisvgmSpecialHandler.h, src/EmSpecialHandler.cpp, 
-    src/EmSpecialHandler.h, src/FileFinder.cpp, src/FileFinder.h, 
-    src/FileSystem.cpp, src/FileSystem.h, src/Font.cpp, src/Font.h, 
-    src/FontCache.cpp, src/FontCache.h, src/FontEmitter.h, 
-    src/FontEncoding.cpp, src/FontEncoding.h, src/FontEngine.cpp, 
-    src/FontEngine.h, src/FontGlyph.cpp, src/FontGlyph.h, 
-    src/FontManager.cpp, src/FontManager.h, src/FontMap.cpp, src/FontMap.h, 
-    src/GFGlyphTracer.cpp, src/GFGlyphTracer.h, src/GFReader.cpp, 
-    src/GFReader.h, src/GFTracer.cpp, src/GFTracer.h, src/Ghostscript.cpp, 
-    src/Ghostscript.h, src/GraphicPath.h, src/InputBuffer.cpp, 
-    src/InputBuffer.h, src/InputReader.cpp, src/InputReader.h, 
-    src/Matrix.cpp, src/Matrix.h, src/Message.cpp, src/Message.h, 
-    src/MessageException.h, src/MetafontWrapper.cpp, src/MetafontWrapper.h, 
-    src/PSInterpreter.cpp, src/PSInterpreter.h, src/PageSize.cpp, 
-    src/PageSize.h, src/Pair.h, src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, 
-    src/SpecialActions.h, src/SpecialHandler.h, src/SpecialManager.cpp, 
-    src/SpecialManager.h, src/StreamCounter.h, src/StreamReader.cpp, 
-    src/StreamReader.h, src/TFM.cpp, src/TFM.h, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h, src/VFActions.h, src/VFReader.cpp, 
-    src/VFReader.h, src/VectorStream.h, src/XMLDocTypeNode.h, 
-    src/XMLDocument.cpp, src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h, 
-    src/XMLString.cpp, src/XMLString.h, src/macros.h, src/types.h: 
-  code cleanup 
-
-2009-10-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS: 
-  NEWS updated 
-
-  * src/DVIToSVG.cpp, src/DvisvgmSpecialHandler.cpp, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/SVGTree.cpp, 
-    src/SVGTree.h: 
-  suppress empty style and transformation elements 
-
-  * transfer-cs: 
-  improved transfer-cs 
-
-2009-10-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp: 
-  scale clipping paths by 72.27/72 
-
-2009-10-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Makefile.am: 
-  fixed Makefile 
-
-  * src/Length.cpp, src/Length.h, tests/LengthTest.h: 
-  fixed unit conversion bug 
-
-  * doc/dvisvgm.txt.in: 
-  fixed formatting of manual page 
-
-  * transfer-cs: 
-  added script to transfer changesets to dvisvgm-pub 
-
-  * autogen.sh, prepare: 
-  prepare script replaced by autogen.sh 
-
-  * src/Bitmap.h: 
-  fixed bit shift overflow in Bitmap class occured on 64-bit systems 
-
-2009-10-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/dvisvgm.cpp: 
-  fixed uncaught PageSizeException 
-
-  * src/MetafontWrapper.cpp: 
-  fixed file permissions 
-
-  * NEWS, src/GraphicPath.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h: 
-  PS clipping path sequences and intersections are now handled correctly 
-
-  * NEWS, doc/dvisvgm.txt.in, src/BoundingBox.cpp, src/CommandLine.cpp, 
-    src/CommandLine.h, src/DVIToSVG.cpp, src/DVIToSVG.h, src/dvisvgm.cpp, 
-    src/options.xml, tests/CommandLineTest.h, tests/Makefile.am: 
-  cmdline parameter --bbox can now be used to set the absolute bounding 
-  box 
-
-2009-10-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BoundingBox.cpp, src/BoundingBox.h, src/Length.cpp, src/Length.h, 
-    src/Makefile.am, tests/LengthTest.h: 
-  class Length provides length unit calculations 
-
-  * NEWS, doc/dvisvgm.txt.in, src/BoundingBox.cpp, src/BoundingBox.h, 
-    src/DvisvgmSpecialHandler.cpp: 
-  added the special variant 'dvisvgm:bbox abs' and 'dvisvgm:bbox fix' 
-
-2009-10-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  set version to 0.8.6 
-
-  * src/BoundingBox.cpp, src/BoundingBox.h, src/GraphicPath.h, 
-    src/PSInterpreter.cpp, src/PSInterpreter.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/psdefs.ps, src/psdefs.psc: 
-  fixed some PS bounding box and positioning issues introduced by previous 
-  changesets 
-
-2009-10-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, src/PsSpecialHandler.cpp: 
-  fixed another positioning bug reported by John Bowman 
-
-2009-10-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Makefile.old, src/Makefile.orig: 
-  renamed the old original Makefile 
-
-  * src/GraphicPath.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h: 
-  corrected positioning bug introduced with previous PS positioning fix 
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/SpecialActions.h, src/psdefs.ps, src/psdefs.psc: 
-  fixed positioning bug reported by John Bowman 
-
-2009-10-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/Makefile.am, doc/dvisvgm.txt.in: 
-  generate pdf manpage directly with groff; adapted manpage source to work 
-  with latest asciidoc 
-
-2009-09-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * Makefile.am, configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  increased version number to 0.8.5 
-
-  * LGPL-2.1.txt, NEWS, README: 
-  updated README and NEWS, and added file with LGPL license text 
-
-  * doc/dvisvgm.txt.in: 
-  added dvisvgm:raw example to man page 
-
-  * src/DvisvgmSpecialHandler.cpp: 
-  added optional depth parameter to special dvisvgm:raw 
-
-2009-09-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in: 
-  minor changes of the documentation 
-
-  * doc/dvisvgm.txt.in: 
-  corrected info about --verbosity in manual page (reported by John 
-  Bowman) 
-
-  * src/PsSpecialHandler.h: 
-  increased the default linewidth to 0.5 
-
-  * NEWS: 
-  added cretdit to John Bowman for sending a patch for the already fixed 
-  clipping bug 
-
-2009-09-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileSystem.cpp, src/MetafontWrapper.cpp: 
-  Windows: Metafont is now called via CreateProcess() 
-
-  * NEWS, doc/dvisvgm.txt.in, src/CommandLine.cpp, src/CommandLine.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/SpecialManager.cpp, 
-    src/SpecialManager.h, src/dvisvgm.cpp, src/options.xml: 
-  added option --progress for enabling a progress indicator (feature #22) 
-
-  * NEWS, src/CmdLineParserBase.cpp, src/FontCache.cpp, 
-    src/SVGFontTraceEmitter.cpp: 
-  fixed memory bug in tracer module (issue #21) 
-
-2009-09-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileSystem.cpp, src/FontCache.cpp: 
-  fixed Windows-related bug in FileSystem::collect 
-
-  * NEWS, doc/dvisvgm.txt.in, src/FileSystem.cpp, src/FileSystem.h, 
-    src/FontCache.cpp, src/FontCache.h, src/dvisvgm.cpp: 
-  option --cache prints additional information about the cached fonts 
-  (feature #7) 
-
-  * src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h, 
-    src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, src/DVIToSVG.cpp, 
-    src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
-    src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/SpecialHandler.h, 
-    src/SpecialManager.cpp, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h: 
-  refactored prefixes methods of the SpecialHandlers (ticket #20) 
-
-2009-09-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, README: 
-  updated NEWS and README 
-
-2009-09-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, src/CommandLine.cpp, 
-    src/InputBuffer.h, src/InputReader.h, src/psdefs.psc, 
-    tests/CommandLineTest.h: 
-  improved the command line parser to make it more POSIX-compliant 
-  (feature #17) 
-
-  * src/dvisvgm.cpp: 
-  fixed evaluation of option --help 
-
-  * src/BoundingBox.cpp, src/BoundingBox.h, src/PsSpecialHandler.cpp: 
-  linewidths are now considered properly in computation of bounding box 
-  (issue #13) 
-
-  * configure.ac, fedora/dvisvgm.spec, src/Doxyfile: 
-  increased version number to 0.8.4 
-
-2009-09-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp, src/psdefs.ps, src/psdefs.psc: 
-  fixed flattened clipping path bug (issue #11) 
-
-2009-08-31  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Makefile.am: 
-  added error checks; disallow numeric optional arguments w/o default 
-  value 
-
-2009-08-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, src/PSInterpreter.cpp, src/PsSpecialHandler.cpp, src/dvisvgm.cpp, 
-    src/psdefs.ps, src/psdefs.psc: 
-  added evaluation of PS 'show' operator in order to evaluate PSTricks 
-  Type 3 fonts properly 
-
-2009-08-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac, doc/dvisvgm.txt.in, src/CmdLineParserBase.cpp, 
-    src/CommandLine.cpp, src/Doxyfile, src/dvisvgm.cpp, src/getopt.c, 
-    src/getopt.h, src/getopt1.c, src/options.xml: 
-  replaced option --cache=? by --cache; increased version number to 0.8.3 
-
-2009-08-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/PsSpecialHandler.cpp, 
-    src/SpecialManager.cpp, src/SpecialManager.h: 
-  PS prologue files referenced in first page are now always loaded 
-
-  * fedora/dvisvgm-0.8.1-potrace.patch, fedora/dvisvgm-gs.patch, 
-    fedora/dvisvgm-potrace.patch, fedora/dvisvgm.spec: 
-  updated Fedora files 
-
-  * configure.ac, fedora/dvisvgm.spec, src/Ghostscript.cpp, 
-    src/Ghostscript.h, src/Makefile.am: 
-  improved Ghostscript and potrace linking checks to simplify usage of 
-  external devel files 
-
-2009-08-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, src/DVIToSVGActions.cpp, src/Ghostscript.cpp, 
-    src/Ghostscript.h: 
-  added configuration method to directly bind the Ghostscript shared 
-  library 
-
-2009-08-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CommandLine.cpp, src/CommandLine.h: 
-  speed up printing help by using puts() instead of C++ streams 
-
-2009-08-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac, src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, 
-    src/Doxyfile: 
-  increased version number to 0.8.2 
-
-  * src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, src/Makefile.am, 
-    src/dvisvgm.cpp, src/options.xml, tests/CommandLineTest.h, 
-    tests/Makefile.am: 
-  improved CmdLineParserBase and replaced gengetopt-based parser 
-
-  * src/FontMap.cpp: 
-  fixed memory bug in FontMap 
-
-2009-08-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * COPYING: 
-  added copy of file COPYING 
-
-  * src/CmdLineParserBase.cpp, src/CmdLineParserBase.h: 
-  finished cmdline parser 
-
-  * src/CmdLineParserBase.cpp, src/CmdLineParserBase.h, src/options.xml: 
-  added files for replacement of gengetopt (not active yet) 
-
-  * src/InputReader.cpp, src/InputReader.h: 
-  added method parseUInt() 
-
-2009-08-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * COPYING, LICENSE, Makefile.am, README, doc/dvisvgm.txt.in, 
-    src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h, 
-    src/Bitmap.cpp, src/Bitmap.h, src/BoundingBox.cpp, src/BoundingBox.h, 
-    src/Calculator.cpp, src/Calculator.h, src/CharmapTranslator.cpp, 
-    src/CharmapTranslator.h, src/Color.cpp, src/Color.h, 
-    src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, src/DLLoader.cpp, 
-    src/DLLoader.h, src/DVIActions.cpp, src/DVIActions.h, src/DVIReader.cpp, 
-    src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Directory.cpp, 
-    src/Directory.h, src/DvisvgmSpecialHandler.cpp, 
-    src/DvisvgmSpecialHandler.h, src/EmSpecialHandler.cpp, 
-    src/EmSpecialHandler.h, src/FileFinder.cpp, src/FileFinder.h, 
-    src/FileSystem.cpp, src/FileSystem.h, src/Font.cpp, src/Font.h, 
-    src/FontCache.cpp, src/FontCache.h, src/FontEmitter.h, 
-    src/FontEncoding.cpp, src/FontEncoding.h, src/FontEngine.cpp, 
-    src/FontEngine.h, src/FontGlyph.cpp, src/FontGlyph.h, src/FontInfo.cpp, 
-    src/FontInfo.h, src/FontManager.cpp, src/FontManager.h, src/FontMap.cpp, 
-    src/FontMap.h, src/FontTracer.h, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.h, src/GFReader.cpp, src/GFReader.h, src/GFTracer.cpp, 
-    src/GFTracer.h, src/Ghostscript.cpp, src/Ghostscript.h, 
-    src/GraphicPath.h, src/HtmlSpecialHandler.h, src/InputBuffer.cpp, 
-    src/InputBuffer.h, src/InputReader.cpp, src/InputReader.h, 
-    src/Matrix.cpp, src/Matrix.h, src/Message.cpp, src/Message.h, 
-    src/MessageException.h, src/MetafontWrapper.cpp, src/MetafontWrapper.h, 
-    src/PSInterpreter.cpp, src/PSInterpreter.h, src/PSObject.cpp, 
-    src/PSObject.h, src/PSState.cpp, src/PSState.h, src/PageSize.cpp, 
-    src/PageSize.h, src/Pair.h, src/PsSpecialHandler.cpp, 
-    src/PsSpecialHandler.h, src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, src/SVGTree.cpp, 
-    src/SVGTree.h, src/SWFWriter.cpp, src/SWFWriter.h, src/SpecialActions.h, 
-    src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h, 
-    src/StreamCounter.h, src/StreamReader.cpp, src/StreamReader.h, 
-    src/TFM.cpp, src/TFM.h, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h, src/VFActions.h, src/VFReader.cpp, 
-    src/VFReader.h, src/VectorStream.h, src/XMLDocTypeNode.h, 
-    src/XMLDocument.cpp, src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h, 
-    src/XMLString.cpp, src/XMLString.h, src/dvisvgm.cpp, src/global.cpp, 
-    src/global.h, src/inttypes.h, src/macros.h, src/psdefs.ps, 
-    src/psdefs.psc, src/types.h, tests/CalculatorTest.h, 
-    tests/ColorSpecialTest.h, tests/DirectoryTest.h, tests/FileFinderTest.h, 
-    tests/FontManagerTest.h, tests/FontMapTest.h, tests/GraphicPathTest.h, 
-    tests/MatrixTest.h, tests/PageSizeTest.h, 
-    tests/SplittedCharInputBufferTest.h, tests/StreamCounterTest.h, 
-    tests/StreamInputBufferTest.h, tests/VectorStreamTest.h: 
-  changed license to GPL version 3 or later 
-
-  * tests/Makefile.am: 
-  added include path to fix broken distcheck 
-
-2009-08-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * tests/Makefile.am: 
-  added generated file test-all.cpp to CLEANFILES 
-
-  * Makefile.am, configure.ac, src/Makefile.am, src/tests/CalculatorTest.h, 
-    src/tests/ColorSpecialTest.h, src/tests/DirectoryTest.h, 
-    src/tests/FileFinderTest.h, src/tests/FontManagerTest.h, 
-    src/tests/FontMapTest.h, src/tests/GraphicPathTest.h, 
-    src/tests/MatrixTest.h, src/tests/PageSizeTest.h, 
-    src/tests/SplittedCharInputBufferTest.h, src/tests/StreamCounterTest.h, 
-    src/tests/StreamInputBufferTest.h, src/tests/VectorStreamTest.h, 
-    src/tests/dvipdfm_test.map, src/tests/dvips_test.map, 
-    tests/CalculatorTest.h, tests/ColorSpecialTest.h, tests/DirectoryTest.h, 
-    tests/FileFinderTest.h, tests/FontManagerTest.h, tests/FontMapTest.h, 
-    tests/GraphicPathTest.h, tests/Makefile.am, tests/MatrixTest.h, 
-    tests/PageSizeTest.h, tests/SplittedCharInputBufferTest.h, 
-    tests/StreamCounterTest.h, tests/StreamInputBufferTest.h, 
-    tests/VectorStreamTest.h, tests/dvipdfm_test.map, tests/dvips_test.map: 
-  moved tests from src/tests to ./tests 
-
-  * fedora/dvisvgm-0.8.1-potrace.patch, fedora/dvisvgm.spec, 
-    rpm/dvisvgm.spec: 
-  added spec file and patch for Fedora builds 
-
-2009-08-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * LICENSE, Makefile.am, rpm/dvisvgm.spec, rpm/dvisvgm.spec.in, 
-    src/Ghostscript.cpp: 
-  modified package to be compatible with prerequisites of Fedora 
-
-2009-07-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVGActions.cpp, src/Ghostscript.cpp, src/Ghostscript.h, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h: 
-  added Ghostscript revision info to output of dvisvgm -l 
-
-  * configure.ac, src/DVIToSVG.cpp: 
-  added target triplet to version string in SVG output 
-
-2009-07-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.psc: 
-  added vim tag to psdefs.psc 
-
-2009-07-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/psdefs.psc: 
-  cleaned up VC++ build files; added batch file to generate cmdline.c; 
-  added generated file psdefs.psc for convenience 
-
-  * NEWS, src/FileSystem.cpp, src/FontEngine.cpp, src/FontManager.cpp, 
-    src/Ghostscript.cpp, src/PageSize.cpp, src/dvisvgm.cpp: 
-  fixed bug related to unsigned/size_t mismatch on x64 systems 
-
-  * NEWS, configure.ac, src/Doxyfile: 
-  updated version number to 0.8.1 
-
-  * src/PsSpecialHandler.cpp: 
-  added evaluation of more psfile parameters; fixed psfile bounding box 
-  bug 
-
-2009-07-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.h, src/InputBuffer.cpp, src/InputBuffer.h, 
-    src/InputReader.cpp, src/InputReader.h, src/Matrix.cpp, src/Matrix.h, 
-    src/PSInterpreter.h: 
-  replaced size_t parameters by unsigned 
-
-  * NEWS, README: 
-  fixed typos; updated homepage/manpage 
-
-  * src/DLLoader.cpp, src/InputReader.cpp, src/PSInterpreter.cpp: 
-  changes to make VC happy; fixed potential memory bug 
-
-2009-07-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PSInterpreter.cpp: 
-  some clean-ups 
-
-2009-07-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TpicSpecialHandler.cpp: 
-  fixed reintroduced bug in TPIC handler 
-
-  * NEWS, README, doc/dvisvgm.txt.in, src/BoundingBox.cpp, 
-    src/BoundingBox.h, src/GraphicPath.h, src/PSInterpreter.cpp, 
-    src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, src/psdefs.ps: 
-  fixed clipping bug; updated homepage, README, NEWS 
-
-2009-07-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/PsSpecialHandler.cpp, src/SVGTree.cpp: 
-  fixed bbox bug; added missing file 
-
-  * src/DvisvgmSpecialHandler.cpp, src/InputBuffer.cpp, src/InputReader.cpp, 
-    src/InputReader.h, src/PsSpecialHandler.cpp, src/PsSpecialHandler.h, 
-    src/psdefs.ps, src/tests/StreamInputBufferTest.h: 
-  implemented psfile special; fixed some bugs 
-
-2009-06-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h, 
-    src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/DvisvgmSpecialHandler.cpp, src/DvisvgmSpecialHandler.h, 
-    src/EmSpecialHandler.cpp, src/EmSpecialHandler.h, src/SpecialHandler.h, 
-    src/SpecialManager.cpp, src/SpecialManager.h, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h: 
-  transplanted changes to SpecialHandlers from branch 'pages' 
-
-  * src/GFTracer.cpp: 
-  transplanted changes to GFTracer from branch 'pages' 
-
-  * src/VFReader.cpp: 
-  transplanted changes to VFReader from branch 'pages' 
-
-  * src/FileSystem.cpp, src/FileSystem.h: 
-  transplanted changes to FileSystem from branch 'pages' 
-
-  * src/DVIReader.cpp, src/DVIReader.h: 
-  transplanted changes to DVIReader from branch 'pages' 
-
-  * src/Bitmap.cpp, src/Bitmap.h: 
-  transplanted changes to Bitmap from branch 'pages' 
-
-  * src/InputBuffer.cpp, src/InputBuffer.h, src/Makefile.am: 
-  transplanted changes to InputBuffer from branch 'pages' 
-
-2009-04-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontCache.h: 
-  increased version of font cache files to ensure their recreation due to 
-  the previously fixed shorthand path command bug 
-
-  * NEWS, configure.ac, src/Doxyfile: 
-  increased version number to 0.7.3 
-
-  * src/TpicSpecialHandler.cpp: 
-  fixed TPIC handler bug that could caused unwanted color fills of 
-  ellipses due to a missing call of reset() 
-
-2009-04-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, doc/dvisvgm.txt.in, src/MetafontWrapper.cpp, 
-    src/dvisvgm.cpp: 
-  prepared release 0.7.2 (removed inclusions of debug.h, adapted homepage 
-  and manpage) 
-
-2009-03-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Doxyfile: 
-  added doxygen files 
-
-  * src/DVIToSVG.cpp, src/DVIToSVG.h, src/FontGlyph.cpp, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, src/dvisvgm.cpp: 
-  replaced Metafont magnification variable and its setters by a public 
-  class variable 
-
-2009-03-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontGlyph.cpp: 
-  fixed memory bug in Glyph::optimizeCommands() 
-
-  * src/FontGlyph.cpp: 
-  fixed potential bug in Glyph::optimizeCommands() 
-
-  * NEWS, src/FontCache.cpp, src/FontGlyph.cpp, src/FontGlyph.h, 
-    src/GFGlyphTracer.cpp, src/Pair.h, src/SVGFontEmitter.cpp: 
-  use of shorthand path commands has been implemented 
-
-2009-03-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontCache.cpp: 
-  cache files are being compressed now to reduce the file size 
-
-2009-03-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontCache.cpp, src/SVGFontTraceEmitter.cpp: 
-  don't read existing cache file if --trace-all is given (trace complete 
-  font and then write cache file instead) 
-
-  * NEWS, doc/dvisvgm.txt.in, src/FontEmitter.h, src/GFGlyphTracer.cpp, 
-    src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, src/dvisvgm.cpp, 
-    src/options.ggo: 
-  added option --trace-all that forces tracing of all glyphs of all 
-  currently used bitmap fonts 
-
-2009-03-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVG.cpp, src/TFM.cpp, src/TFM.h: 
-  added firstChar()/lastChar() to TFM class, removed unnecessary mag 
-  member variable and its setter 
-
-  * src/FontCache.cpp: 
-  fixed bug in read/write functions of FontCache 
-
-2009-03-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontCache.cpp: 
-  reduced size of cache file format by using variable integer sizes 
-
-  * doc/dvisvgm.txt.in, src/dvisvgm.cpp: 
-  added option variant --cache=? to display the default cache directory 
-
-  * doc/dvisvgm.txt.in, src/DVIToSVG.cpp, src/FileSystem.cpp, 
-    src/FileSystem.h, src/FontCache.cpp, src/FontCache.h, src/FontGlyph.h, 
-    src/GFGlyphTracer.cpp, src/GFGlyphTracer.h, src/Makefile.am, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, src/dvisvgm.cpp: 
-  completed font caching support 
-
-2009-03-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac, doc/dvisvgm.txt.in, src/DVIToSVG.cpp, 
-    src/FileSystem.cpp, src/FileSystem.h, src/FontCache.cpp, src/FontCache.h, 
-    src/FontGlyph.cpp, src/FontGlyph.h, src/GFGlyphTracer.cpp, 
-    src/GFGlyphTracer.h, src/GFTracer.cpp, src/options.ggo: 
-  first additions to support font caching; not working yet 
-
-2009-03-11  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/FontEmitter.h, src/SVGFontEmitter.cpp, 
-    src/SVGFontEmitter.h, src/SVGFontTraceEmitter.cpp, 
-    src/SVGFontTraceEmitter.h: 
-  improved font embedding algorithm in case of --no-fonts (identical 
-  glyphs in different sizes are now referenced rather than duplicated) 
-
-2009-03-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, src/Font.h, 
-    src/SVGFontEmitter.cpp, src/SVGFontTraceEmitter.cpp: 
-  all glyph sizes are now computed correctly in conjuction with option 
-  --no-fonts 
-
-2009-03-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp: 
-  fixed transformation bug (transformations are now applied properly to 
-  the page) 
-
-  * src/types.h: 
-  minor changes to homepage and .hgignore 
-
-  * src/BgColorSpecialHandler.cpp, src/SpecialManager.cpp, 
-    src/TpicSpecialHandler.cpp: 
-  adapted Code to make VC happy 
-
-2009-03-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BgColorSpecialHandler.cpp, src/BgColorSpecialHandler.h: 
-  added missing background color handler 
-
-  * NEWS, README, src/Color.cpp, src/Color.h, src/ColorSpecialHandler.cpp, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/DvisvgmSpecialHandler.cpp, src/EmSpecialHandler.cpp, src/Makefile.am, 
-    src/TpicSpecialHandler.cpp: 
-  added bgcolor support, updated homepage, fixed color handler bug 
-
-2009-03-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TpicSpecialHandler.cpp, src/TpicSpecialHandler.h: 
-  implemented splines of tpic specials 
-
-  * src/TpicSpecialHandler.cpp, src/TpicSpecialHandler.h: 
-  implemented arc drawing of tpic special set 
-
-2009-03-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/dvisvgm.txt.in, src/DvisvgmSpecialHandler.cpp, 
-    src/DvisvgmSpecialHandler.h: 
-  minor code improvements; comments added 
-
-  * doc/Makefile.am, doc/dvisvgm.txt.in, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/DvisvgmSpecialHandler.cpp, 
-    src/DvisvgmSpecialHandler.h, src/InputBuffer.cpp, src/InputBuffer.h, 
-    src/SpecialActions.h: 
-  implemented the dvisvgm specials raw, image, and bbox 
-
-  * src/BoundingBox.cpp, src/BoundingBox.h, src/Color.cpp, 
-    src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, src/DVIActions.h, 
-    src/DVIBBoxActions.h, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/EmSpecialHandler.cpp, 
-    src/Makefile.am, src/SpecialActions.h, src/SpecialHandler.h, 
-    src/TpicSpecialHandler.cpp: 
-  improved computation of the bounding box (works with specials now); 
-  added dummy function for background color assignments 
-
-2009-02-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/Makefile.am, doc/dvisvgm.txt.in: 
-  improved manpage 
-
-  * doc/Makefile.am, doc/dvisvgm.txt, doc/dvisvgm.txt.in: 
-  removed generated file, added dvisvgm.txt.in 
-
-2009-02-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac, doc/Makefile.am, doc/caution.png, doc/dvisvgm.1.in, 
-    doc/dvisvgm.txt, doc/note.png: 
-  replaced manually written dvisvgm.1.in by an asciidoc file 
-  (dvisvgm.txt.in) 
-
-2009-02-24  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, doc/dvisvgm.1.in, src/TpicSpecialHandler.cpp: 
-  few additions to tpic handler 
-
-  * NEWS, src/Color.cpp, src/Color.h, src/DVIToSVGActions.cpp, 
-    src/Makefile.am, src/Pair.h, src/SpecialHandler.h, 
-    src/SpecialManager.cpp, src/SpecialManager.h, src/TpicSpecialHandler.cpp, 
-    src/TpicSpecialHandler.h: 
-  first tpic implementations; not complete yet 
-
-  * src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/DVIToSVGActions.cpp, src/DvisvgmSpecialHandler.cpp, 
-    src/DvisvgmSpecialHandler.h, src/EmSpecialHandler.cpp, 
-    src/EmSpecialHandler.h, src/HtmlSpecialHandler.h, src/Makefile.am, 
-    src/SpecialColorHandler.cpp, src/SpecialColorHandler.h, 
-    src/SpecialDvisvgmHandler.cpp, src/SpecialDvisvgmHandler.h, 
-    src/SpecialEmHandler.cpp, src/SpecialEmHandler.h, src/SpecialHandler.h, 
-    src/SpecialHtmlHandler.h, src/SpecialManager.cpp, src/SpecialManager.h, 
-    src/tests/ColorSpecialTest.h: 
-  improved SpecialHandler is now able to handle unprefixed specials 
-
-2009-02-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac, doc/dvisvgm.1.in, src/DVIBBoxActions.h, 
-    src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/FontEmitter.h, src/FontEngine.cpp, 
-    src/FontEngine.h, src/FontGlyph.cpp, src/FontGlyph.h, 
-    src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, src/XMLNode.cpp, 
-    src/XMLNode.h, src/dvisvgm.cpp, src/options.ggo, 
-    src/tests/ColorSpecialTest.h: 
-  added option --no-fonts wich uses path elements instead of fonts 
-
-2009-02-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, doc/dvisvgm.1.in, src/Color.cpp, src/Color.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Makefile.am, 
-    src/SpecialActions.h, src/SpecialColorHandler.cpp, 
-    src/SpecialDvisvgmHandler.cpp, src/SpecialDvisvgmHandler.h, 
-    src/SpecialEmHandler.cpp, src/SpecialEmHandler.h, 
-    src/SpecialHtmlHandler.h, src/VerbSpecialHandler.cpp, 
-    src/VerbSpecialHandler.h: 
-  fixed bug in color handler, added skeletons of dvisvgm/hyperref special 
-  handlers 
-
-2009-02-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, src/SpecialActions.h, src/tests/ColorSpecialTest.h: 
-  adapted color test to new interface, added emtex info 
-
-  * src/Color.h, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/Makefile.am, src/SpecialActions.h, src/SpecialColorHandler.cpp, 
-    src/SpecialEmHandler.cpp: 
-  added color support to emTeX specials, removed Color class 
-
-2009-02-17  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/BoundingBox.cpp, src/ColorSpecialHandler.cpp, 
-    src/ColorSpecialHandler.h, src/DVIToSVGActions.cpp, src/FontGlyph.cpp, 
-    src/InputBuffer.cpp, src/InputBuffer.h, src/Makefile.am, src/Pair.h, 
-    src/SpecialActions.h, src/SpecialColorHandler.cpp, 
-    src/SpecialColorHandler.h, src/SpecialEmHandler.cpp, 
-    src/SpecialEmHandler.h, src/TransformationMatrix.cpp, 
-    src/tests/ColorSpecialTest.h: 
-  added skeleton of em special handler; doesn't work yet 
-
-2009-02-15  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Makefile.am, 
-    src/SpecialActions.h, src/SpecialManager.cpp, src/VerbSpecialHandler.cpp, 
-    src/VerbSpecialHandler.h, src/XMLString.cpp, src/XMLString.h: 
-  added special handler for verbatim output 
-
-2009-02-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac: 
-  prepared release of version 0.7 
-
-  * doc/dvisvgm.1.in, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/dvisvgm.cpp, src/options.ggo: 
-  added option --no-style 
-
-  * NEWS, configure.ac: 
-  increased version number to 0.6.2, updated NEWS 
-
-  * src/dvisvgm.cpp: 
-  fixed incorrect behavior of option -V/--version 
-
-  * src/Color.h, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h: 
-  finished color support 
-
-2009-02-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/ColorSpecialHandler.cpp, src/Makefile.am, 
-    src/tests/ColorSpecialTest.h: 
-  added tests for ColorSpecialHandler 
-
-  * prepare: 
-  updated administrative files 
-
-  * src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Makefile.am, 
-    src/SpecialActions.h, src/SpecialHandler.h, src/SpecialManager.cpp, 
-    src/SpecialManager.h: 
-  color specials are now processed by DVIToSVGActions, but don't create 
-  any results yet 
-
-  * src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h: 
-  reverted to previous version, removed dependency on Color class 
-
-  * hgauthors, prepare: 
-  added administrative files 
-
-  * Makefile.am, configure.ac, src/tests/DirectoryTest.h: 
-  removed rpm support 
-
-  * src/types.h: 
-  replaced static definition of sized integers by template program 
-
-2009-02-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Color.h, src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/Makefile.am: 
-  replaced RGB arrays by Color class 
-
-2009-02-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TransformationMatrix.cpp: 
-  made y-coordinate of cmdline-option -t optional 
-
-2009-02-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp: 
-  changed lookup order of font maps 
-
-  * doc/dvisvgm.1.in, src/ColorSpecialHandler.h, src/DVIToSVG.cpp, 
-    src/DVIToSVG.h, src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, 
-    src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h, 
-    src/dvisvgm.cpp, src/options.ggo: 
-  added option --list-specials that lists all registered special handlers 
-
-2009-02-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIToSVGActions.cpp: 
-  replaced special ignore list evaluation algorithm 
-
-  * src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/dvisvgm.cpp, src/options.ggo: 
-  added optional prefix list to commandline option --no-specials 
-
-  * src/extract-colors.php: 
-  added php-script that extracts color definitions from color.pro 
-
-2009-02-04  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontMap.cpp: 
-  added output of font encoding in write method 
-
-  * src/FileFinder.cpp: 
-  added option for additional loading of user maps 
-
-2009-02-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * map/cork-lm.map: 
-  removed deprecated map subdirectory 
-
-  * src/FileFinder.cpp, src/FileFinder.h, src/dvisvgm.cpp: 
-  option -m/--map-file is now evaluated properly 
-
-  * src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/SpecialHandler.h, 
-    src/SpecialManager.cpp, src/SpecialManager.h, src/options.ggo: 
-  more color special implementation (color constants), still not ready 
-
-2009-02-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h: 
-  some refactorings in color handler 
-
-  * src/ColorSpecialHandler.cpp, src/ColorSpecialHandler.h, src/Makefile.am, 
-    src/SpecialHandler.h, src/SpecialManager.cpp, src/SpecialManager.h: 
-  added special support skeletons; not working yet 
-
-  * NEWS, src/FileFinder.cpp: 
-  fixed buggy call of maketfm/makemf in Windows version 
-
-2009-01-30  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, src/DVIReader.cpp, src/DVIReader.h: 
-  fixed magnification bug 
-
-  * src/dvisvgm.cpp: 
-  prevented writing zero-length svg files; simplified main code by using 
-  auto pointers 
-
-2009-01-29  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FileFinder.cpp: 
-  adapted Windows version to new release 
-
-2009-01-28  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * NEWS, configure.ac, doc/dvisvgm.1.in: 
-  adapted configuration and documentation to new dvips map file support 
-
-  * src/FileFinder.cpp, src/FontMap.cpp, src/FontMap.h, 
-    src/tests/FontMapTest.h, src/tests/dvips_test.map: 
-  FontMap now supports dvips and dvipdfm maps 
-
-  * src/Calculator.cpp, src/DVIToSVG.cpp, src/FontEncoding.cpp, 
-    src/FontMap.cpp, src/SVGFontEmitter.cpp, src/SVGFontTraceEmitter.cpp: 
-  replaced comparisions with "" with calls of empty() 
-
-  * src/FontMap.cpp, src/Makefile.am, src/tests/FontMapTest.h, 
-    src/tests/dvipdfm_test.map, src/tests/dvips_test.map: 
-  extensions to FontMap almost complete but not finished yet 
-
-  * src/GFReader.h, src/GFTracer.cpp, src/GFTracer.h: 
-  improved GFTracer to support unscaled results 
-
-  * src/dvisvgm.cpp: 
-  use new initialisation of FileFinder 
-
-  * src/FileFinder.cpp, src/FileFinder.h, src/Makefile.am, 
-    src/tests/DirectoryTest.h, src/tests/FileFinderTest.h, 
-    src/tests/FontManagerTest.h, src/tests/KPSFileFinderTest.h: 
-  refactored FileFinder (implementation as singleton) 
-
-2009-01-27  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/GFGlyphTracer.cpp, src/GFGlyphTracer.h, src/GFTracer.cpp, 
-    src/GFTracer.h, src/Makefile.am, src/SVGFontTraceEmitter.cpp, 
-    src/SVGFontTraceEmitter.h: 
-  made GFTracer a generic class with template methods 
-
-2009-01-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/InputBuffer.h: 
-  fixed incompatible types bug 
-
-  * src/Bitmap.cpp, src/Bitmap.h, src/GFReader.cpp, src/GFReader.h, 
-    src/GFTracer.cpp, src/Makefile.am: 
-  improvements to GF handling, first skeletton of gf->metapost (gfprint) 
-
-2009-01-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/FontMap.cpp: 
-  basic dvips font map support, not complete yet 
-
-  * src/CharmapTranslator.cpp, src/DVIToSVG.cpp, src/FileFinder.cpp, 
-    src/FileFinder.h, src/Font.cpp, src/FontEncoding.cpp, 
-    src/FontManager.cpp, src/KPSFileFinder.cpp, src/KPSFileFinder.h, 
-    src/Makefile.am, src/MetafontWrapper.cpp, src/TFM.cpp, src/dvisvgm.cpp: 
-  renamed KPSFileFinder to FileFinder 
-
-  * src/FontMap.cpp, src/FontMap.h: 
-  started redesign of FontMap, not complete yet 
-
-  * src/InputBuffer.cpp, src/InputBuffer.h: 
-  added missing include 
-
-2009-01-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * doc/Makefile.am, doc/dvisvgm.1.in: 
-  manpage updates 
-
-2009-01-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac: 
-  added test whether dvipdfm.map is available 
-
-  * doc/dvisvgm.1.in, rpm/dvisvgm.spec.in, src/Bitmap.cpp, src/Bitmap.h, 
-    src/BoundingBox.cpp, src/BoundingBox.h, src/Calculator.cpp, 
-    src/Calculator.h, src/CharmapTranslator.cpp, src/CharmapTranslator.h, 
-    src/DVIActions.cpp, src/DVIActions.h, src/DVIBBoxActions.h, 
-    src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Directory.cpp, 
-    src/Directory.h, src/FileFinder.cpp, src/FileFinder.h, 
-    src/FileSystem.cpp, src/FileSystem.h, src/Font.cpp, src/Font.h, 
-    src/FontEmitter.h, src/FontEncoding.cpp, src/FontEncoding.h, 
-    src/FontEngine.cpp, src/FontEngine.h, src/FontGlyph.cpp, src/FontGlyph.h, 
-    src/FontInfo.cpp, src/FontInfo.h, src/FontManager.cpp, src/FontManager.h, 
-    src/FontMap.cpp, src/FontMap.h, src/FontTracer.h, src/GFReader.cpp, 
-    src/GFReader.h, src/GFTracer.cpp, src/GFTracer.h, src/InputBuffer.cpp, 
-    src/InputBuffer.h, src/KPSFileFinder.cpp, src/KPSFileFinder.h, 
-    src/Makefile.am, src/Makefile.orig, src/Matrix.cpp, src/Matrix.h, 
-    src/Message.cpp, src/Message.h, src/MessageException.h, 
-    src/MetafontWrapper.cpp, src/MetafontWrapper.h, src/PSInterpreter.cpp, 
-    src/PSInterpreter.h, src/PSObject.cpp, src/PSObject.h, src/PSState.cpp, 
-    src/PSState.h, src/PageSize.cpp, src/PageSize.h, src/Pair.h, 
-    src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, 
-    src/StreamCounter.h, src/StreamReader.cpp, src/StreamReader.h, 
-    src/TFM.cpp, src/TFM.h, src/TransformationMatrix.cpp, 
-    src/TransformationMatrix.h, src/VFActions.h, src/VFReader.cpp, 
-    src/VFReader.h, src/VectorStream.h, src/XMLDocTypeNode.h, 
-    src/XMLDocument.cpp, src/XMLDocument.h, src/XMLNode.cpp, src/XMLNode.h, 
-    src/XMLString.cpp, src/XMLString.h, src/dvisvgm.cpp, src/global.cpp, 
-    src/global.h, src/macros.h, src/options.ggo, src/types.h: 
-  updated file header comments 
-
-  * src/tests/CalculatorTest.h, src/tests/DirectoryTest.h, 
-    src/tests/FontManagerTest.h, src/tests/FontMapTest.h, 
-    src/tests/KPSFileFinderTest.h, src/tests/PageSizeTest.h, 
-    src/tests/StreamCounterTest.h, src/tests/VectorStreamTest.h: 
-  updated tests 
-
-  * Makefile.am, NEWS, README, configure.ac, potracelib/Makefile.am: 
-  updated version info to 0.6 
-
-  * src/KPSFileFinder.cpp: 
-  fixed throwing of COM exception 
-
-  * src/DVIReader.cpp, src/FontManager.cpp, src/KPSFileFinder.cpp: 
-  memory leak fixed 
-
-  * src/KPSFileFinder.cpp, src/KPSFileFinder.h, src/dvisvgm.cpp: 
-  added support for MiKTeX' new COM interface 
-
-  * src/FontMap.cpp: 
-  forgot to remove address operator 
-
-2009-01-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Calculator.cpp, src/DVIReader.cpp, src/DVIToSVGActions.cpp, 
-    src/Directory.cpp, src/FontEncoding.cpp, src/FontEngine.cpp, 
-    src/FontManager.cpp, src/FontMap.cpp, src/KPSFileFinder.cpp, 
-    src/MetafontWrapper.cpp, src/PageSize.cpp, src/StreamReader.cpp, 
-    src/TFM.cpp, src/TransformationMatrix.cpp, src/VFReader.cpp, 
-    src/XMLDocument.cpp, src/XMLNode.cpp: 
-  added in/out attributes to parameter documentation 
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, 
-    src/FontEncoding.cpp, src/FontGlyph.cpp: 
-  fixed bugs in handling of font encodings and virtual fonts 
-
-2009-01-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/SVGFontEmitter.cpp: 
-  fixed memory bug 
-
-  * src/FontEngine.cpp, src/FontEngine.h, src/SVGFontEmitter.cpp: 
-  fixed glyph positioning bug occured in conjunction with font encoding 
-
-  * src/DVIReader.cpp, src/DVIToSVG.cpp, src/Font.h, src/FontEncoding.cpp, 
-    src/FontEncoding.h, src/FontEngine.cpp, src/FontEngine.h, 
-    src/FontGlyph.cpp, src/FontGlyph.h, src/FontManager.cpp, 
-    src/FontManager.h, src/InputBuffer.cpp, src/InputBuffer.h, 
-    src/SVGFontEmitter.cpp, src/SVGFontEmitter.h: 
-  first working version with font encoding support 
-
-2009-01-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/FontEncoding.cpp, src/FontEncoding.h, 
-    src/FontEngine.cpp, src/FontEngine.h, src/FontManager.cpp, 
-    src/FontManager.h, src/FontMap.cpp: 
-  partly working mapping support, but yet too slow 
-
-  * src/FontEncoding.cpp, src/FontEncoding.h, src/FontEngine.cpp, 
-    src/FontEngine.h, src/FontManager.cpp, src/FontManager.h, 
-    src/FontMap.cpp, src/FontMap.h, src/KPSFileFinder.cpp, 
-    src/KPSFileFinder.h: 
-  more encoding implementations, not complete yet 
-
-2009-01-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TransformationMatrix.cpp: 
-  fixed bug in argument assignment of transformation command M 
-
-2009-01-15  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/TransformationMatrix.cpp: 
-  removed a dangerous loop remained from previous code 
-
-2009-01-14  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/KPSFileFinder.cpp: 
-  added enc-file support 
-
-  * src/dvisvgm.cpp: 
-  updated copyright string 
-
-  * src/FileSystem.cpp, src/FileSystem.h: 
-  const string parameters 
-
-  * src/FontEncoding.cpp, src/FontEncoding.h, src/InputBuffer.cpp, 
-    src/InputBuffer.h, src/Makefile.am: 
-  added basic skeleton for handling of font encodings 
-
-  * potracelib/auxiliary.h, potracelib/bitmap.h, potracelib/curve.c, 
-    potracelib/curve.h, potracelib/decompose.c, potracelib/decompose.h, 
-    potracelib/lists.h, potracelib/potracelib.c, potracelib/potracelib.h, 
-    potracelib/progress.h, potracelib/trace.c, potracelib/trace.h: 
-  updated libpotrace to version 1.8 
-
-2009-01-13  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CharmapTranslator.cpp: 
-  fixed crash on loading corrupt pfb-files 
-
-2008-06-18  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Makefile.am: 
-  adapted to latest gengetopt version 
-
-2008-04-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp: 
-  minor change 
-
-2007-03-26  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIActions.cpp, src/DVIReader.cpp, src/DVIReader.h, 
-    src/FontManager.cpp, src/tests/FontManagerTest.h: 
-  few minor changes 
-
-  * NEWS, src/CharmapTranslator.cpp, src/CharmapTranslator.h, 
-    src/DVIActions.h, src/DVIReader.cpp, src/DVIToSVG.cpp, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Font.h, 
-    src/FontManager.cpp, src/Makefile.am, src/SVGFontTraceEmitter.cpp, 
-    src/SVGFontTraceEmitter.h: 
-  redesigned DVIActions and CharmapTranslator 
-
-2007-03-25  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/DVIReader.h, src/VFActions.h: 
-  minor fixes 
-
-  * src/DVIActions.cpp, src/DVIActions.h, src/DVIBBoxActions.h, 
-    src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/Font.cpp, src/Font.h, 
-    src/FontManager.cpp, src/FontManager.h, src/StreamReader.cpp, 
-    src/StreamReader.h, src/VFActions.h, src/VFReader.cpp, src/VFReader.h, 
-    src/VectorStream.h: 
-  first working version 0.5, release candidate 1 
-
-2007-03-23  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/FontManager.cpp, src/FontManager.h, 
-    src/KPSFileFinder.cpp, src/KPSFileFinder.h, src/VFReader.cpp: 
-  more vf implementations, not complete yet 
-
-2007-03-22  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/Font.cpp, src/Font.h, src/FontManager.cpp, 
-    src/VFActions.h, src/VFReader.cpp, src/VFReader.h: 
-  more vf implementations 
-
-  * NEWS, doc/Makefile.in, src/DVIReader.cpp, src/DVIReader.h, 
-    src/DVIToSVG.cpp, src/DVIToSVG.h, src/FileSystem.cpp, src/FileSystem.h, 
-    src/KPSFileFinder.cpp, src/KPSFileFinder.h, src/Makefile.am, 
-    src/dvisvgm.cpp, src/tests/DirectoryTest.h, src/tests/FontManagerTest.h: 
-  reintegrated font map initialization into KPSFileFinderm adapted some 
-  tests 
-
-2007-03-21  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/KPSFileFinder.cpp, src/KPSFileFinder.h, src/dvisvgm.cpp: 
-  implemented options -n and -m 
-
-  * src/Directory.cpp, src/Directory.h, src/KPSFileFinder.cpp, 
-    src/KPSFileFinder.h, src/dvisvgm.cpp: 
-  completed MiKTeX font map file look-up, fixed bug in Directory class 
-
-  * src/Calculator.cpp, src/DVIReader.cpp, src/Directory.cpp, src/Font.h, 
-    src/FontManager.cpp, src/Makefile, src/Makefile.am, src/Makefile.in, 
-    src/MetafontWrapper.cpp, src/VFReader.cpp, src/VectorStream.h, 
-    src/test-all.cpp, src/tests/VectorStreamTest.h: 
-  removed redundant code and commented code fragments, added 
-  VectorInputStream class 
-
-  * AUTHORS, Makefile.am, README, potracelib/Makefile.am, 
-    rpm/dvisvgm.spec.in, src/Directory.cpp, src/Directory.h, 
-    src/KPSFileFinder.cpp, src/Makefile, src/Makefile.am, src/Makefile.in, 
-    src/SVGFontTraceEmitter.cpp, src/test-all.cpp, src/tests/DirectoryTest.h: 
-  implemented Directory class for Linux, added DirectoryTest 
-
-2007-03-20  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Directory.cpp, src/Directory.h, src/FileSystem.cpp, src/FontMap.cpp, 
-    src/FontMap.h, src/KPSFileFinder.cpp: 
-  more changes for MiKTeX support 
-
-  * NEWS, doc/Makefile, doc/Makefile.in, doc/dvisvgm.1.in, 
-    src/DVIReader.cpp, src/DVIToSVG.cpp, src/Font.cpp, src/Font.h, 
-    src/FontManager.cpp, src/KPSFileFinder.cpp, src/Makefile, 
-    src/Makefile.am, src/Makefile.in, src/VFReader.cpp, src/dvisvgm.cpp, 
-    src/test-all.cpp, src/tests/KPSFileFinderTest.h: 
-  added KPSFileFinderTest, added EmptyFont, fixed compilation error 
-
-2007-03-19  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/Font.h, src/FontManager.cpp, src/FontMap.cpp, 
-    src/FontMap.h, src/KPSFileFinder.cpp: 
-  made sources comaptible with MikTeX 
-
-  * src/KPSFileFinder.cpp: 
-  bug fixed, font maps work now 
-
-  * src/CharmapTranslator.cpp, src/DVIToSVG.cpp, src/FontManager.cpp, 
-    src/KPSFileFinder.cpp, src/KPSFileFinder.h, src/Makefile, 
-    src/Makefile.am, src/Makefile.in, src/MetafontWrapper.cpp, src/TFM.cpp: 
-  added mktexFOO support and font map lookups to KPSFileFinder 
-
-2007-03-16  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/Font.h, src/FontManager.cpp, src/FontMap.cpp, 
-    src/FontMap.h, src/KPSFileFinder.cpp, src/Makefile, src/Makefile.am, 
-    src/Makefile.in, src/StreamReader.cpp, src/TFM.cpp, src/options.ggo, 
-    src/tests/FontMapTest.h: 
-  more coding in the font department, not finished yet 
-
-2007-03-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/CharmapTranslator.cpp, src/CharmapTranslator.h, src/DVIReader.cpp, 
-    src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, src/Font.cpp, 
-    src/FontInfo.cpp, src/FontManager.cpp, src/GFTracer.cpp, 
-    src/KPSFileFinder.cpp, src/KPSFileFinder.h, src/Makefile, 
-    src/Makefile.am, src/Makefile.in, src/MetafontWrapper.cpp, 
-    src/MetafontWrapper.h, src/SVGFontTraceEmitter.cpp, 
-    src/SVGFontTraceEmitter.h, src/StreamReader.cpp, src/StreamReader.h, 
-    src/TFM.cpp, src/TFM.h, src/VFReader.cpp, src/VFReader.h, 
-    src/dvisvgm.cpp, src/options.ggo, src/test-all.cpp: 
-  refactorings: extracted StreamReader class, replaced generic FileFinder 
-  support by KPSFileFinder calls 
-
-2007-03-08  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/DVIToSVGActions.cpp, src/Font.h, src/Makefile, 
-    src/Makefile.am, src/Makefile.in, src/Makefile.orig, src/VFActions.h, 
-    src/VFReader.cpp, src/VFReader.h, src/dvisvgm.cpp: 
-  plugged VFReader and its actions into the code (not usable yet) 
-
-  * src/DVIBBoxReader.cpp, src/DVIBBoxReader.h, src/Font.cpp, src/Font.h, 
-    src/Makefile.orig, src/StreamCounter.h, src/dvisvgm.cpp: 
-  fixed memory bug 
-
-  * doc/dvisvgm.1, src/FontEngine.h, src/Makefile.orig, src/dvisvgm.cpp, 
-    src/tests/FontManagerTest.h: 
-  minor changes 
-
-  * COPYING, Makefile, Makefile.am, Makefile.in, Martins_svg_neu.svg, NEWS, 
-    aclocal.m4, cmdline.c, config.guess, config.h, config.h.in, 
-    config.status, config.sub, configure.ac, depcomp, doc/Makefile, 
-    doc/dvisvgm.1, doc/dvisvgm.1.in, gpl.txt, install-sh, missing, 
-    src/FontManager.cpp, src/FontManager.h, src/Makefile.am, 
-    src/VFReader.cpp, src/tests/FontManagerTest.h, stamp-h1, table.txt: 
-  removed some garbage from the repository, added initial FontManagerTest 
-
-  * src/DVIActions.h, src/DVIBBoxActions.h, src/DVIReader.cpp, 
-    src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/Font.cpp, src/Font.h, src/FontManager.cpp, 
-    src/FontManager.h, src/KPSFileFinder.cpp, src/KPSFileFinder.h, 
-    src/Makefile, src/Makefile.am, src/Makefile.in, src/Message.cpp, 
-    src/dvisvgm.cpp, src/macros.h, src/test-all.cpp: 
-  first unstable version with redesigned font handling 
-
-2007-03-07  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/Font.cpp, src/Font.h: 
-  added Font classes (not yet error-free) 
-
-2007-03-06  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.h, src/DVIToSVG.cpp, src/FontManager.cpp, 
-    src/FontManager.h: 
-  added FontManager skeleton, fixed bug in makehead 
-
-2007-03-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/FontManager.cpp, src/VFReader.cpp: 
-  added some more skeleton code 
-
-2007-03-02  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/DVIReader.cpp, src/Makefile, src/Makefile.in, src/VFReader.cpp, 
-    src/VFReader.h, src/options.ggo: 
-  added skeleton of VFReader 
-
-2007-01-10  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * INSTALL, Makefile.am, NEWS, README, configure.ac, doc/Makefile, 
-    doc/Makefile.am, doc/Makefile.in, doc/dvisvgm.1, doc/dvisvgm.1.in, 
-    gzstream/COPYING.LIB, gzstream/Makefile, gzstream/README, 
-    gzstream/gzstream.cpp, gzstream/gzstream.h, gzstream/index.html, 
-    gzstream/logo.gif, gzstream/test_gunzip.C, gzstream/test_gzip.C, 
-    gzstream/version, map/cork-lm.map, mkwindist.pl, potracelib/Makefile.am, 
-    potracelib/auxiliary.h, potracelib/bitmap.h, potracelib/curve.c, 
-    potracelib/curve.h, potracelib/decompose.c, potracelib/decompose.h, 
-    potracelib/lists.h, potracelib/potracelib.c, potracelib/potracelib.h, 
-    potracelib/progress.h, potracelib/trace.c, potracelib/trace.h, 
-    rpm/Makefile, rpm/Makefile.am, rpm/Makefile.in, rpm/dvisvgm.spec, 
-    rpm/dvisvgm.spec.in: 
-  moved sources 
-
-2007-01-09  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * map/cork-lm.map, rpm/Makefile, rpm/Makefile.am, rpm/Makefile.in, 
-    rpm/dvisvgm.spec, rpm/dvisvgm.spec.in: 
-  moved files to trunk 
-
-  * INSTALL, Makefile.am, NEWS, README, configure.ac, doc/Makefile, 
-    doc/Makefile.am, doc/Makefile.in, doc/dvisvgm.1, doc/dvisvgm.1.in, 
-    gzstream/COPYING.LIB, gzstream/Makefile, gzstream/README, 
-    gzstream/gzstream.cpp, gzstream/gzstream.h, gzstream/index.html, 
-    gzstream/logo.gif, gzstream/test_gunzip.C, gzstream/test_gzip.C, 
-    gzstream/version, mkwindist.pl, potracelib/Makefile.am, 
-    potracelib/auxiliary.h, potracelib/bitmap.h, potracelib/curve.c, 
-    potracelib/curve.h, potracelib/decompose.c, potracelib/decompose.h, 
-    potracelib/lists.h, potracelib/potracelib.c, potracelib/potracelib.h, 
-    potracelib/progress.h, potracelib/trace.c, potracelib/trace.h, 
-    rpm/Makefile, rpm/Makefile.am, rpm/Makefile.in, rpm/dvisvgm.spec, 
-    rpm/dvisvgm.spec.in, src/A, src/Bitmap.cpp, src/Bitmap.h, 
-    src/BoundingBox.cpp, src/BoundingBox.h, src/Calculator.cpp, 
-    src/Calculator.h, src/CharmapTranslator.cpp, src/CharmapTranslator.h, 
-    src/DVIActions.h, src/DVIBBoxActions.h, src/DVIBBoxReader.cpp, 
-    src/DVIBBoxReader.h, src/DVIReader.cpp, src/DVIReader.h, 
-    src/DVIToSVG.cpp, src/DVIToSVG.h, src/DVIToSVGActions.cpp, 
-    src/DVIToSVGActions.h, src/FileFinder.cpp, src/FileFinder.h, 
-    src/FileSystem.cpp, src/FileSystem.h, src/FontEmitter.h, 
-    src/FontEngine.cpp, src/FontEngine.h, src/FontGlyph.cpp, src/FontGlyph.h, 
-    src/FontInfo.cpp, src/FontInfo.h, src/FontMap.cpp, src/FontMap.h, 
-    src/FontTracer.h, src/GFReader.cpp, src/GFReader.h, src/GFTracer.cpp, 
-    src/GFTracer.h, src/KPSFileFinder.cpp, src/KPSFileFinder.h, src/Makefile, 
-    src/Makefile.am, src/Makefile.in, src/Makefile.orig, src/Matrix.cpp, 
-    src/Matrix.h, src/Message.cpp, src/Message.h, src/MessageException.h, 
-    src/MetafontWrapper.cpp, src/MetafontWrapper.h, src/PSInterpreter.cpp, 
-    src/PSInterpreter.h, src/PSObject.cpp, src/PSObject.h, src/PSState.cpp, 
-    src/PSState.h, src/PageSize.cpp, src/PageSize.h, src/Pair.h, 
-    src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, 
-    src/StreamCounter.h, src/TFM.cpp, src/TFM.h, 
-    src/TransformationMatrix.cpp, src/TransformationMatrix.h, 
-    src/XMLDocTypeNode.h, src/XMLDocument.cpp, src/XMLDocument.h, 
-    src/XMLNode.cpp, src/XMLNode.h, src/XMLString.cpp, src/XMLString.h, 
-    src/cmdline.c, src/cmdline.h, src/dvisvgm.cpp, src/getopt.c, 
-    src/getopt.h, src/getopt1.c, src/global.cpp, src/global.h, 
-    src/gzstream.cpp, src/gzstream.h, src/macros.h, src/miktex-core.def, 
-    src/miktex-kps.def, src/miktex-kps.h, src/options.ggo, src/test-all.cpp, 
-    src/tests/CalculatorTest.h, src/tests/PageSizeTest.h, 
-    src/tests/StreamCounterTest.h, src/types.h: 
-  moved files to trunk subfolder 
-
-2007-01-05  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * Makefile, Makefile.am, Makefile.in, README, config.status, configure.ac, 
-    potracelib/Makefile.am, potracelib/bitops.h, potracelib/flate.c, 
-    potracelib/flate.h, src/Bitmap.cpp, src/Bitmap.h, src/BoundingBox.cpp, 
-    src/BoundingBox.h, src/Calculator.cpp, src/Calculator.h, 
-    src/CharmapTranslator.cpp, src/CharmapTranslator.h, src/DVIActions.h, 
-    src/DVIBBoxActions.h, src/DVIBBoxReader.cpp, src/DVIBBoxReader.h, 
-    src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/FileFinder.cpp, 
-    src/FileFinder.h, src/FileSystem.cpp, src/FileSystem.h, 
-    src/FontEmitter.h, src/FontEngine.cpp, src/FontEngine.h, 
-    src/FontGlyph.cpp, src/FontGlyph.h, src/FontInfo.cpp, src/FontInfo.h, 
-    src/FontMap.cpp, src/FontMap.h, src/FontTracer.h, src/GFReader.cpp, 
-    src/GFReader.h, src/GFTracer.cpp, src/GFTracer.h, src/KPSFileFinder.cpp, 
-    src/KPSFileFinder.h, src/Makefile.am, src/Matrix.cpp, src/Matrix.h, 
-    src/Message.cpp, src/Message.h, src/MessageException.h, 
-    src/MetafontWrapper.cpp, src/MetafontWrapper.h, src/PSInterpreter.cpp, 
-    src/PSInterpreter.h, src/PSObject.cpp, src/PSObject.h, src/PSState.cpp, 
-    src/PSState.h, src/PageSize.cpp, src/PageSize.h, src/Pair.h, 
-    src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, 
-    src/StreamCounter.h, src/TFM.cpp, src/TFM.h, 
-    src/TransformationMatrix.cpp, src/TransformationMatrix.h, 
-    src/XMLDocTypeNode.h, src/XMLDocument.cpp, src/XMLDocument.h, 
-    src/XMLNode.cpp, src/XMLNode.h, src/XMLString.cpp, src/XMLString.h, 
-    src/dvisvgm.cpp, src/global.cpp, src/global.h, src/macros.h, 
-    src/test-all.cpp, src/types.h: 
-  minor modifications 
-
-2007-01-03  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure: 
-  removed configure from repository 
-
-  * Makefile, Makefile.am, Makefile.in, config.h, config.h.in, 
-    config.status, configure, configure.ac, doc/Makefile, 
-    potracelib/Makefile.am, potracelib/auxiliary.h, potracelib/bitmap.h, 
-    potracelib/bitops.h, potracelib/curve.c, potracelib/curve.h, 
-    potracelib/decompose.c, potracelib/decompose.h, potracelib/flate.c, 
-    potracelib/flate.h, potracelib/lists.h, potracelib/potracelib.c, 
-    potracelib/potracelib.h, potracelib/progress.h, potracelib/trace.c, 
-    potracelib/trace.h, src/Makefile, src/Makefile.am, src/Makefile.in: 
-  added potracelib to distribution 
-
-  * NEWS, mkwindist.pl, src/KPSFileFinder.cpp: 
-  updated homepage 
-
-2006-12-31  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/KPSFileFinder.cpp: 
-  fixed namepsace bug 
-
-  * Makefile, config.status, configure, configure.ac, doc/Makefile, 
-    doc/dvisvgm.1, src/FileSystem.cpp, src/FontEngine.cpp, 
-    src/KPSFileFinder.cpp, src/Makefile, src/dvisvgm.cpp, src/test-all.cpp: 
-  some minor fixes 
-
-  * NEWS, configure.ac, src/DVIToSVG.cpp, src/FileSystem.cpp, 
-    src/FontEngine.cpp, src/GFTracer.cpp, src/KPSFileFinder.cpp, 
-    src/Makefile.orig, src/Matrix.h, src/Message.cpp, src/PageSize.cpp, 
-    src/TransformationMatrix.cpp, src/dvisvgm.cpp: 
-  updated to MikTeX 2.5 support 
-
-2006-08-01  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * configure.ac: 
-  enabled svn keyword expansion 
-
-  * Makefile, Makefile.in, NEWS, aclocal.m4, autom4te.cache/output.0, 
-    autom4te.cache/requests, autom4te.cache/traces.0, config.h, config.log, 
-    config.status, configure, configure.ac, doc/Makefile, doc/Makefile.in, 
-    doc/dvisvgm.1, src/FontEngine.cpp, src/Makefile, src/Makefile.in, 
-    src/cmdline.c, src/cmdline.h, src/dvisvgm.cpp: 
-  added support for freetype version >= 2.1.1 
-
-2006-04-12  Martin Gieseking  <martin.gieseking at uos.de>
-
-  * src/lshort-cm.dvi, src/lshort-cm.svg, src/lshort-cm.svgz, 
-    src/lshort.dvi, src/lshort.svg, src/lshort.svgz: 
-  removed files that need not be version controlled 
-
-  * src/Bitmap.cpp, src/Bitmap.h, src/BoundingBox.cpp, src/BoundingBox.h, 
-    src/Calculator.cpp, src/Calculator.h, src/CharmapTranslator.cpp, 
-    src/CharmapTranslator.h, src/DVIActions.h, src/DVIBBoxActions.h, 
-    src/DVIBBoxReader.cpp, src/DVIBBoxReader.h, src/DVIReader.cpp, 
-    src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/FileFinder.cpp, 
-    src/FileFinder.h, src/FileSystem.cpp, src/FileSystem.h, 
-    src/FontEmitter.h, src/FontEngine.cpp, src/FontEngine.h, 
-    src/FontGlyph.cpp, src/FontGlyph.h, src/FontInfo.cpp, src/FontInfo.h, 
-    src/FontMap.cpp, src/FontMap.h, src/FontTracer.h, src/GFReader.cpp, 
-    src/GFReader.h, src/GFTracer.cpp, src/GFTracer.h, src/KPSFileFinder.cpp, 
-    src/KPSFileFinder.h, src/Message.cpp, src/Message.h, 
-    src/MessageException.h, src/MetafontWrapper.cpp, src/MetafontWrapper.h, 
-    src/PSObject.cpp, src/PSObject.h, src/PageSize.cpp, src/PageSize.h, 
-    src/Pair.h, src/SVGFontEmitter.cpp, src/SVGFontEmitter.h, 
-    src/SVGFontTraceEmitter.cpp, src/SVGFontTraceEmitter.h, 
-    src/StreamCounter.h, src/TFM.cpp, src/TFM.h, 
-    src/TransformationMatrix.cpp, src/TransformationMatrix.h, 
-    src/XMLDocTypeNode.h, src/XMLDocument.cpp, src/XMLDocument.h, 
-    src/XMLNode.cpp, src/XMLNode.h, src/XMLString.cpp, src/XMLString.h, 
-    src/dvisvgm.cpp, src/global.cpp, src/global.h, src/macros.h, 
-    src/test-all.cpp, src/tests/CalculatorTest.h, src/tests/PageSizeTest.h, 
-    src/tests/StreamCounterTest.h, src/types.h: 
-  changed keyword tags 
-
-  * COPYING, INSTALL, Makefile, Makefile.am, Makefile.in, 
-    Martins_svg_neu.svg, NEWS, README, aclocal.m4, autom4te.cache/output.0, 
-    autom4te.cache/requests, autom4te.cache/traces.0, cmdline.c, 
-    config.guess, config.h, config.h.in, config.log, config.status, 
-    config.sub, configure, configure.ac, depcomp, doc/Makefile, 
-    doc/Makefile.am, doc/Makefile.in, doc/dvisvgm.1, doc/dvisvgm.1.in, 
-    gpl.txt, gzstream/COPYING.LIB, gzstream/Makefile, gzstream/README, 
-    gzstream/gzstream.cpp, gzstream/gzstream.h, gzstream/index.html, 
-    gzstream/logo.gif, gzstream/test_gunzip.C, gzstream/test_gzip.C, 
-    gzstream/version, install-sh, map/cork-lm.map, missing, mkwindist.pl, 
-    src/A, src/Bitmap.cpp, src/Bitmap.h, src/BoundingBox.cpp, 
-    src/BoundingBox.h, src/Calculator.cpp, src/Calculator.h, 
-    src/CharmapTranslator.cpp, src/CharmapTranslator.h, src/DVIActions.h, 
-    src/DVIBBoxActions.h, src/DVIBBoxReader.cpp, src/DVIBBoxReader.h, 
-    src/DVIReader.cpp, src/DVIReader.h, src/DVIToSVG.cpp, src/DVIToSVG.h, 
-    src/DVIToSVGActions.cpp, src/DVIToSVGActions.h, src/FileFinder.cpp, 
-    src/FileFinder.h, src/FileSystem.cpp, src/FileSystem.h, 
-    src/FontEmitter.h, src/FontEngine.cpp, src/FontEngine.h, 
-    src/FontGlyph.cpp, src/FontGlyph.h, src/FontInfo.cpp, src/FontInfo.h, 
-    src/FontMap.cpp, src/FontMap.h, src/FontTracer.h, src/GFReader.cpp, 
-    src/GFReader.h, src/GFTracer.cpp, src/GFTracer.h, src/KPSFileFinder.cpp, 
-    src/KPSFileFinder.h, src/Makefile, src/Makefile.am, src/Makefile.in, 
-    src/Makefile.orig, src/Matrix.cpp, src/Matrix.h, src/Message.cpp, 
-    src/Message.h, src/MessageException.h, src/MetafontWrapper.cpp, 
-    src/MetafontWrapper.h, src/PSInterpreter.cpp, src/PSInterpreter.h, 
-    src/PSObject.cpp, src/PSObject.h, src/PSState.cpp, src/PSState.h, 
-    src/PageSize.cpp, src/PageSize.h, src/Pair.h, src/SVGFontEmitter.cpp, 
-    src/SVGFontEmitter.h, src/SVGFontTraceEmitter.cpp, 
-    src/SVGFontTraceEmitter.h, src/StreamCounter.h, src/TFM.cpp, src/TFM.h, 
-    src/TransformationMatrix.cpp, src/TransformationMatrix.h, 
-    src/XMLDocTypeNode.h, src/XMLDocument.cpp, src/XMLDocument.h, 
-    src/XMLNode.cpp, src/XMLNode.h, src/XMLString.cpp, src/XMLString.h, 
-    src/cmdline.c, src/cmdline.h, src/dvisvgm.cpp, src/getopt.c, 
-    src/getopt.h, src/getopt1.c, src/global.cpp, src/global.h, 
-    src/gzstream.cpp, src/gzstream.h, src/lshort-cm.dvi, src/lshort-cm.svg, 
-    src/lshort-cm.svgz, src/lshort.dvi, src/lshort.svg, src/lshort.svgz, 
-    src/macros.h, src/miktex-core.def, src/miktex-kps.def, src/miktex-kps.h, 
-    src/options.ggo, src/test-all.cpp, src/tests/CalculatorTest.h, 
-    src/tests/PageSizeTest.h, src/tests/StreamCounterTest.h, src/types.h, 
-    stamp-h1, table.txt: 
-  initial import 
-

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/Makefile.am	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/Makefile.am	2017-02-13 17:57:19 UTC (rev 43208)
@@ -5,7 +5,8 @@
 
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = COPYING
-SUBDIRS = libs src #TL: tests doc
+SUBDIRS = libs src tests doc
+ACLOCAL_AMFLAGS = -I m4
 
 if CODE_COVERAGE_ENABLED
 lcov_dir=$(top_builddir)/lcov

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -87,28 +87,22 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = dvisvgm-src
+target_triplet = @target@
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
-	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 \
-	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
-DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
+	$(am__configure_deps) $(am__DIST_COMMON)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_ at AM_V@)
@@ -145,8 +139,9 @@
   $(RECURSIVE_CLEAN_TARGETS) \
   $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
-am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+	cscope distdir dist dist-all distcheck
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
+	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
 # *not* preserved.
@@ -165,10 +160,21 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
+CSCOPE = cscope
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in AUTHORS COPYING ChangeLog \
-	INSTALL NEWS README
+am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \
+	COPYING INSTALL NEWS README ar-lib compile config.guess \
+	config.sub depcomp install-sh ltmain.sh missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_distdir = \
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
+am__post_remove_distdir = $(am__remove_distdir)
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -194,11 +200,19 @@
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
+DIST_ARCHIVES = $(distdir).tar.gz
+GZIP_ENV = --best
+DIST_TARGETS = dist-gzip
+distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
+distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
-AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -206,7 +220,12 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CODE_COVERAGE_RULES = @CODE_COVERAGE_RULES@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
+CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -213,14 +232,13 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
+DATE = @DATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
-DVISVGM_TREE = @DVISVGM_TREE@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -227,10 +245,10 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
-FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
-FREETYPE2_LIBS = @FREETYPE2_LIBS@
-FT2_CONFIG = @FT2_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GCOV = @GCOV@
+GENHTML = @GENHTML@
 GREP = @GREP@
 HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
@@ -238,13 +256,9 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBGS_INCLUDES = @LIBGS_INCLUDES@
-LIBGS_LIBS = @LIBGS_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -252,7 +266,6 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -271,9 +284,8 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-POTRACE_DEPEND = @POTRACE_DEPEND@
-POTRACE_INCLUDES = @POTRACE_INCLUDES@
-POTRACE_LIBS = @POTRACE_LIBS@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -280,10 +292,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-ZLIB_DEPEND = @ZLIB_DEPEND@
-ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -330,52 +339,78 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = COPYING
-SUBDIRS = libs src #TL: tests doc
+SUBDIRS = libs src tests doc
+ACLOCAL_AMFLAGS = -I m4
 @CODE_COVERAGE_ENABLED_TRUE at lcov_dir = $(top_builddir)/lcov
 @CODE_COVERAGE_ENABLED_TRUE at lcov_file = $(lcov_dir)/lcov.info
-all: all-recursive
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+am--refresh: Makefile
+	@:
+$(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; }; \
+	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
+	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
+		&& exit 0; \
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dvisvgm-src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign dvisvgm-src/Makefile
+	  $(AUTOMAKE) --foreign Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	    echo ' $(SHELL) ./config.status'; \
+	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    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)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+	$(SHELL) ./config.status --recheck
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(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):
 
+config.h: stamp-h1
+	@test -f $@ || rm -f stamp-h1
+	@test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
+
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
+$(srcdir)/config.h.in:  $(am__configure_deps) 
+	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
+	rm -f stamp-h1
+	touch $@
+
+distclean-hdr:
+	-rm -f config.h stamp-h1
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -382,6 +417,9 @@
 clean-libtool:
 	-rm -rf .libs _libs
 
+distclean-libtool:
+	-rm -f libtool config.lt
+
 # 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,
@@ -462,6 +500,12 @@
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && $(am__cd) $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscope: cscope.files
+	test ! -s cscope.files \
+	  || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
+clean-cscope:
+	-rm -f cscope.files
+cscope.files: clean-cscope cscopelist
 cscopelist: cscopelist-recursive
 
 cscopelist-am: $(am__tagged_files)
@@ -480,8 +524,11 @@
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
 
 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)'; \
@@ -536,9 +583,140 @@
 	      || 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__post_remove_distdir)
+
+dist-bzip2: distdir
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__post_remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
+	$(am__post_remove_distdir)
+
+dist-xz: distdir
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
+	$(am__post_remove_distdir)
+
+dist-tarZ: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
+	$(am__post_remove_distdir)
+
+dist-shar: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
+	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+	$(am__post_remove_distdir)
+
+dist-zip: distdir
+	-rm -f $(distdir).zip
+	zip -rq $(distdir).zip $(distdir)
+	$(am__post_remove_distdir)
+
+dist dist-all:
+	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
+	$(am__post_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.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(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 u+w $(distdir)
+	mkdir $(distdir)/_build $(distdir)/_build/sub $(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/sub \
+	  && ../../configure \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=../.. --prefix="$$dc_install_base" \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) 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__post_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:
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
+	   || { 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
+all-am: Makefile config.h
 installdirs: installdirs-recursive
 installdirs-am:
 install: install-recursive
@@ -576,8 +754,10 @@
 clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
+	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
 	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-tags
+distclean-am: clean-am distclean-generic distclean-hdr \
+	distclean-libtool distclean-tags
 
 dvi: dvi-recursive
 
@@ -620,6 +800,8 @@
 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
 
@@ -637,20 +819,24 @@
 
 uninstall-am:
 
-.MAKE: $(am__recursive_targets) install-am install-strip
+.MAKE: $(am__recursive_targets) all install-am install-strip
 
-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libtool cscopelist-am ctags \
-	ctags-am distclean distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
-	ps ps-am tags tags-am uninstall uninstall-am
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--refresh check check-am clean clean-cscope clean-generic \
+	clean-libtool cscope cscopelist-am ctags ctags-am dist \
+	dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
+	distclean-hdr distclean-libtool 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 \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am
 
 .PRECIOUS: Makefile
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/NEWS
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/NEWS	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/NEWS	2017-02-13 17:57:19 UTC (rev 43208)
@@ -1,3 +1,16 @@
+dvisvgm-2.1.2 (2017-02-12)
+- bundled the googletest sources to simplify building and executing the tests
+- fixed a couple of issues related to LLVM's libc++
+  (thanks to Mojca Miklavec and Rasmus Larsen for their help to isolate the problems)
+- fixed some potential memory leaks
+- removed 'restrict' keyword from xxHash sources to avoid C++ compilation errors
+  (https://github.com/Cyan4973/xxHash/issues/88)
+
+dvisvgm-2.1.1 (2017-02-07)
+- don't rerun Metafont for missing fonts
+- fixed build failure on OS X (GH bug #65)
+- several minor code improvements and test enhancements
+
 dvisvgm-2.1 (2017-01-19)
 - added option --tmpdir to explicitly set temp folder
 - temporary files are no longer created in the current working directory by

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/README
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/README	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/README	2017-02-13 17:57:19 UTC (rev 43208)
@@ -14,7 +14,7 @@
    to polygons, intersects them using Clipper, and reconstructs the curves
    afterwards.
 
- * FontForge library (http://www.fontforge.org)
+ * FontForge library (https://www.fontforge.org)
    dvisvgm can be built with optional WOFF support that allows to embed the
    font data in WOFF or TrueType format rather than as SVG. The FontForge
    library provides the required functions to create font files in these
@@ -25,7 +25,7 @@
    This library is used to extract the glyph outlines from vector fonts
    (PFB, OTF, TTF).
 
- * Ghostscript (http://www.ghostscript.com)
+ * Ghostscript (https://www.ghostscript.com)
    The PostScript special handler requires the Ghostscript library
    libgs.so (Linux) or gsdll32.dll/gsdll64.dll (Windows) to be installed.
    If the configure script finds the corresponding Ghostscript development

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/config.h.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/config.h.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/config.h.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -19,6 +19,9 @@
    */
 #undef HAVE_DIRENT_H
 
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
 /* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
 #undef HAVE_DOPRNT
 
@@ -116,6 +119,9 @@
 /* Define to 1 if you have the `vprintf' function. */
 #undef HAVE_VPRINTF
 
+/* Define to 1 if you have the <xlocale.h> header file. */
+#undef HAVE_XLOCALE_H
+
 /* Define to 1 if the system has the type `_Bool'. */
 #undef HAVE__BOOL
 
@@ -126,6 +132,9 @@
    slash. */
 #undef LSTAT_FOLLOWS_SLASHED_SYMLINK
 
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
 /* Name of package */
 #undef PACKAGE
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/configure.ac	2017-02-13 17:57:19 UTC (rev 43208)
@@ -4,10 +4,10 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT([dvisvgm],[2.1],[martin.gieseking at uos.de])
-DATE="January 2017"
+AC_INIT([dvisvgm],[2.1.2],[martin.gieseking at uos.de])
+DATE="February 2017"
 AC_CONFIG_SRCDIR(src)
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -20,13 +20,15 @@
 AC_PROG_CC
 AC_PROG_CC_C99
 AC_PROG_CXX
-AX_CXX_COMPILE_STDCXX([11], [noext])
+AX_CXX_COMPILE_STDCXX([11])
+AM_PROG_AR
+LT_INIT
 
 AC_PROG_RANLIB
 AC_LANG(C)
 
 AC_CHECK_FUNCS([ftime gettimeofday])
-AC_CHECK_HEADERS([sys/time.h sys/timeb.h])
+AC_CHECK_HEADERS([sys/time.h sys/timeb.h xlocale.h])
 AC_HEADER_TIOCGWINSZ
 
 AC_CHECK_HEADER([kpathsea/kpathsea.h], ,

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/doc/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/doc/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/doc/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -90,7 +90,11 @@
 target_triplet = @target@
 subdir = doc
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -156,6 +160,7 @@
 AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -165,11 +170,14 @@
 CFLAGS = @CFLAGS@
 CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
 CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
+CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
 CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
 CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -176,11 +184,15 @@
 DATE = @DATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GCOV = @GCOV@
@@ -193,13 +205,24 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LCOV = @LCOV@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -223,8 +246,10 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -262,6 +287,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -293,9 +319,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign doc/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu doc/Makefile
+	  $(AUTOMAKE) --foreign doc/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -315,6 +341,12 @@
 $(am__aclocal_m4_deps):
 dvisvgm.txt: $(top_builddir)/config.status $(srcdir)/dvisvgm.txt.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
 install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	@list1=''; \
@@ -432,7 +464,7 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
@@ -482,7 +514,7 @@
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf-am:
 
@@ -496,16 +528,17 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
-	ctags-am distclean distclean-generic distclean-local 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 tags-am uninstall \
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool distclean-local 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 \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
 	uninstall-am uninstall-man uninstall-man1
 
 .PRECIOUS: Makefile

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.1
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.1	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/doc/dvisvgm.1	2017-02-13 17:57:19 UTC (rev 43208)
@@ -1,13 +1,13 @@
 '\" t
-.\"     Title: dvisvgm
+.\"     Title: dvisvgm Manual
 .\"    Author: Martin Gieseking <martin.gieseking at uos.de>
 .\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\"      Date: 01/19/2017
+.\"      Date: 02/12/2017
 .\"    Manual: dvisvgm Manual
-.\"    Source: dvisvgm 2.1
+.\"    Source: dvisvgm 2.1.2
 .\"  Language: English
 .\"
-.TH "DVISVGM" "1" "01/19/2017" "dvisvgm 2\&.1" "dvisvgm Manual"
+.TH "DVISVGM MANUAL" "1" "02/12/2017" "dvisvgm 2\&.1\&.2" "dvisvgm Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -87,24 +87,15 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+target_triplet = @target@
 @ENABLE_WOFF_TRUE at am__append_1 = ff-woff woff2
-subdir = dvisvgm-src/libs
+subdir = libs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
-	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 \
-	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -196,9 +187,10 @@
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
-AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -206,7 +198,12 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CODE_COVERAGE_RULES = @CODE_COVERAGE_RULES@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
+CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -213,14 +210,13 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
+DATE = @DATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
-DVISVGM_TREE = @DVISVGM_TREE@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -227,10 +223,10 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
-FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
-FREETYPE2_LIBS = @FREETYPE2_LIBS@
-FT2_CONFIG = @FT2_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GCOV = @GCOV@
+GENHTML = @GENHTML@
 GREP = @GREP@
 HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
@@ -238,13 +234,9 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBGS_INCLUDES = @LIBGS_INCLUDES@
-LIBGS_LIBS = @LIBGS_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -252,7 +244,6 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -271,9 +262,8 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-POTRACE_DEPEND = @POTRACE_DEPEND@
-POTRACE_INCLUDES = @POTRACE_INCLUDES@
-POTRACE_LIBS = @POTRACE_LIBS@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -280,10 +270,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-ZLIB_DEPEND = @ZLIB_DEPEND@
-ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -330,11 +317,16 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -342,7 +334,7 @@
 all: all-recursive
 
 .SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -351,9 +343,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dvisvgm-src/libs/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libs/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign dvisvgm-src/libs/Makefile
+	  $(AUTOMAKE) --foreign libs/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -366,9 +358,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/clipper/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/clipper/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/clipper/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -88,23 +88,14 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = dvisvgm-src/libs/clipper
+target_triplet = @target@
+subdir = libs/clipper
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
-	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 \
-	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -135,7 +126,7 @@
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -152,6 +143,7 @@
 am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
 am__v_CXX_0 = @echo "  CXX     " $@;
 am__v_CXX_1 = 
+CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -203,14 +195,14 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
-AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -218,7 +210,12 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CODE_COVERAGE_RULES = @CODE_COVERAGE_RULES@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
+CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -225,14 +222,13 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
+DATE = @DATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
-DVISVGM_TREE = @DVISVGM_TREE@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -239,10 +235,10 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
-FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
-FREETYPE2_LIBS = @FREETYPE2_LIBS@
-FT2_CONFIG = @FT2_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GCOV = @GCOV@
+GENHTML = @GENHTML@
 GREP = @GREP@
 HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
@@ -250,13 +246,9 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBGS_INCLUDES = @LIBGS_INCLUDES@
-LIBGS_LIBS = @LIBGS_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -264,7 +256,6 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -283,9 +274,8 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-POTRACE_DEPEND = @POTRACE_DEPEND@
-POTRACE_INCLUDES = @POTRACE_INCLUDES@
-POTRACE_LIBS = @POTRACE_LIBS@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -292,10 +282,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-ZLIB_DEPEND = @ZLIB_DEPEND@
-ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -342,11 +329,16 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -359,7 +351,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -368,9 +360,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dvisvgm-src/libs/clipper/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libs/clipper/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign dvisvgm-src/libs/clipper/Makefile
+	  $(AUTOMAKE) --foreign libs/clipper/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -383,9 +375,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.am	2017-02-13 17:57:19 UTC (rev 43208)
@@ -54,6 +54,7 @@
 	fontforge/stemdb.c \
 	fontforge/stemdb.h \
 	fontforge/tables.h \
+	fontforge/tmpfile2.cpp \
 	fontforge/tottf.c \
 	fontforge/tottfaat.c \
 	fontforge/tottfgpos.c \
@@ -65,7 +66,6 @@
 	fontforge/uiinterface.h \
 	fontforge/unialt.c \
 	fontforge/ustring.c \
-	fontforge/utils.c \
 	fontforge/utype.c \
 	fontforge/woff.c \
 	inc/basics.h \
@@ -72,10 +72,10 @@
 	inc/chardata.h \
 	inc/charset.h \
 	inc/dlist.h \
+	inc/ffintl.h \
 	inc/gimage.h \
 	inc/gnetwork.h \
 	inc/gwwiconv.h \
-	inc/intl.h \
 	inc/ustring.h \
 	inc/utype.h
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -88,23 +88,14 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = dvisvgm-src/libs/ff-woff
+target_triplet = @target@
+subdir = libs/ff-woff
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
-	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 \
-	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -144,11 +135,11 @@
 	fontforge/splinesaveafm.$(OBJEXT) \
 	fontforge/splineutil.$(OBJEXT) fontforge/splineutil2.$(OBJEXT) \
 	fontforge/start.$(OBJEXT) fontforge/stemdb.$(OBJEXT) \
-	fontforge/tottf.$(OBJEXT) fontforge/tottfaat.$(OBJEXT) \
-	fontforge/tottfgpos.$(OBJEXT) fontforge/tottfvar.$(OBJEXT) \
-	fontforge/ttfinstrs.$(OBJEXT) fontforge/ttfspecial.$(OBJEXT) \
-	fontforge/unialt.$(OBJEXT) fontforge/ustring.$(OBJEXT) \
-	fontforge/utils.$(OBJEXT) fontforge/utype.$(OBJEXT) \
+	fontforge/tmpfile2.$(OBJEXT) fontforge/tottf.$(OBJEXT) \
+	fontforge/tottfaat.$(OBJEXT) fontforge/tottfgpos.$(OBJEXT) \
+	fontforge/tottfvar.$(OBJEXT) fontforge/ttfinstrs.$(OBJEXT) \
+	fontforge/ttfspecial.$(OBJEXT) fontforge/unialt.$(OBJEXT) \
+	fontforge/ustring.$(OBJEXT) fontforge/utype.$(OBJEXT) \
 	fontforge/woff.$(OBJEXT)
 libfontforge_a_OBJECTS = $(am_libfontforge_a_OBJECTS)
 AM_V_P = $(am__v_P_ at AM_V@)
@@ -164,7 +155,7 @@
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -189,6 +180,24 @@
 am__v_CCLD_ = $(am__v_CCLD_ at AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_ at AM_V@)
+am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
 SOURCES = $(libfontforge_a_SOURCES)
 DIST_SOURCES = $(libfontforge_a_SOURCES)
 am__can_run_installinfo = \
@@ -215,14 +224,14 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
-AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -230,7 +239,12 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CODE_COVERAGE_RULES = @CODE_COVERAGE_RULES@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
+CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -237,14 +251,13 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
+DATE = @DATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
-DVISVGM_TREE = @DVISVGM_TREE@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -251,10 +264,10 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
-FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
-FREETYPE2_LIBS = @FREETYPE2_LIBS@
-FT2_CONFIG = @FT2_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GCOV = @GCOV@
+GENHTML = @GENHTML@
 GREP = @GREP@
 HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
@@ -262,13 +275,9 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBGS_INCLUDES = @LIBGS_INCLUDES@
-LIBGS_LIBS = @LIBGS_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -276,7 +285,6 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -295,9 +303,8 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-POTRACE_DEPEND = @POTRACE_DEPEND@
-POTRACE_INCLUDES = @POTRACE_INCLUDES@
-POTRACE_LIBS = @POTRACE_LIBS@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -304,10 +311,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-ZLIB_DEPEND = @ZLIB_DEPEND@
-ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -354,11 +358,16 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -417,6 +426,7 @@
 	fontforge/stemdb.c \
 	fontforge/stemdb.h \
 	fontforge/tables.h \
+	fontforge/tmpfile2.cpp \
 	fontforge/tottf.c \
 	fontforge/tottfaat.c \
 	fontforge/tottfgpos.c \
@@ -428,7 +438,6 @@
 	fontforge/uiinterface.h \
 	fontforge/unialt.c \
 	fontforge/ustring.c \
-	fontforge/utils.c \
 	fontforge/utype.c \
 	fontforge/woff.c \
 	inc/basics.h \
@@ -435,10 +444,10 @@
 	inc/chardata.h \
 	inc/charset.h \
 	inc/dlist.h \
+	inc/ffintl.h \
 	inc/gimage.h \
 	inc/gnetwork.h \
 	inc/gwwiconv.h \
-	inc/intl.h \
 	inc/ustring.h \
 	inc/utype.h
 
@@ -448,8 +457,8 @@
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+.SUFFIXES: .c .cpp .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -458,9 +467,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dvisvgm-src/libs/ff-woff/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libs/ff-woff/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign dvisvgm-src/libs/ff-woff/Makefile
+	  $(AUTOMAKE) --foreign libs/ff-woff/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -473,9 +482,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
@@ -561,6 +570,8 @@
 	fontforge/$(DEPDIR)/$(am__dirstamp)
 fontforge/stemdb.$(OBJEXT): fontforge/$(am__dirstamp) \
 	fontforge/$(DEPDIR)/$(am__dirstamp)
+fontforge/tmpfile2.$(OBJEXT): fontforge/$(am__dirstamp) \
+	fontforge/$(DEPDIR)/$(am__dirstamp)
 fontforge/tottf.$(OBJEXT): fontforge/$(am__dirstamp) \
 	fontforge/$(DEPDIR)/$(am__dirstamp)
 fontforge/tottfaat.$(OBJEXT): fontforge/$(am__dirstamp) \
@@ -577,8 +588,6 @@
 	fontforge/$(DEPDIR)/$(am__dirstamp)
 fontforge/ustring.$(OBJEXT): fontforge/$(am__dirstamp) \
 	fontforge/$(DEPDIR)/$(am__dirstamp)
-fontforge/utils.$(OBJEXT): fontforge/$(am__dirstamp) \
-	fontforge/$(DEPDIR)/$(am__dirstamp)
 fontforge/utype.$(OBJEXT): fontforge/$(am__dirstamp) \
 	fontforge/$(DEPDIR)/$(am__dirstamp)
 fontforge/woff.$(OBJEXT): fontforge/$(am__dirstamp) \
@@ -633,6 +642,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/splineutil2.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/start.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/stemdb.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/tmpfile2.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/tottf.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/tottfaat.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/tottfgpos.Po at am__quote@
@@ -641,7 +651,6 @@
 @AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/ttfspecial.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/unialt.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/ustring.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/utils.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/utype.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at fontforge/$(DEPDIR)/woff.Po at am__quote@
 
@@ -669,6 +678,30 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC at am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+.cpp.o:
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/fontforge.h
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/fontforge.h	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/fontforge.h	2017-02-13 17:57:19 UTC (rev 43208)
@@ -33,7 +33,7 @@
 #include "libffstamp.h"
 #include <stdio.h>
 #include <string.h>
-#include <intl.h>
+#include <ffintl.h>
 #include "splinefont.h"
 #include "uiinterface.h"
 
@@ -40,11 +40,7 @@
 static const unsigned unicode4_size = 17*65536;
     /* Unicode goes up to 0x10ffff */
 
-#ifdef _WIN32
 extern FILE* tmpfile2 ();
-#else
-#define tmpfile2 tmpfile
-#endif
 
 extern int32 unicode_from_adobestd[256];
 

Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/tmpfile2.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/tmpfile2.cpp	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/tmpfile2.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,75 @@
+/* This file is part of ff-woff, a reduced version of the FontForge library.
+* It provides the function tmpfile2() with the functionality of tmpfile() but
+* works on POSIX and Windows systems.
+* License: Revised BSD license used by FontForge
+* https://github.com/fontforge/fontforge/blob/master/LICENSE
+* (C) 2017 Martin Gieseking <martin.gieseking at uos.de> */
+
+#include <cstdio>
+#include <cstdlib>
+#include <exception>
+#include <iostream>
+#include <string>
+
+#if _WIN32
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <windows.h>
+#ifdef _MSC_VER
+#include <io.h>
+#endif
+#endif
+
+using namespace std;
+
+class TmpFileException : public exception {
+	public:
+		TmpFileException (const char *msg) : _message(msg) {}
+		const char* what () const noexcept override {return _message.c_str();}
+
+	private:
+		string _message;
+};
+
+
+static inline void tmpfile_error (const char *msg) {
+#if defined(_MSC_VER) || defined(__MINGW32__)
+	// Visual C++ and MinGW support exception handling
+	// between extern "C" and C++ functions.
+	throw TmpFileException(msg);
+#else
+	cerr << msg << endl;
+	exit(EXIT_FAILURE);
+#endif
+}
+
+
+/* Creates a temporary binary file in the system's temp folder and returns
+* its file pointer. The file is automatically removed when closing it.
+* If the temp file can't be created for some reason, the function calls
+* exit() or throws a TmpFileException (depending on OS and compiler). */
+extern "C" FILE* tmpfile2 () {
+#ifndef _WIN32
+	if (FILE *fp = std::tmpfile())
+		return fp;
+#else
+	char tmpdir[MAX_PATH+1];
+	DWORD len = GetTempPath(MAX_PATH+1, tmpdir);
+	if (len > 0) {
+		if (len >= MAX_PATH-14)
+			tmpfile_error("path to temp folder too long");
+		char fname[MAX_PATH];
+		if (GetTempFileName(tmpdir, "tmp", 0, fname)) {
+			int fd = _open(fname, _O_CREAT | _O_TEMPORARY | _O_RDWR | _O_BINARY, _S_IREAD | _S_IWRITE);
+			if (fd >= 0) {
+				if (FILE *fp = _fdopen(fd, "w+b"))
+					return fp;
+				int saved_errno = errno;
+				_close(fd);
+				errno = saved_errno;
+			}
+		}
+	}
+#endif
+	tmpfile_error("failed to create temporary file");
+}


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/tmpfile2.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/utils.c
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/utils.c	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/fontforge/utils.c	2017-02-13 17:57:19 UTC (rev 43208)
@@ -1,85 +0,0 @@
-/* Copyright (C) 2000-2012 by George Williams */
-/*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
-
- * The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
-
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifdef _WIN32
-
-#include <fcntl.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#include <windows.h>
-#ifdef _MSC_VER
-#include <io.h>
-#endif
-
-FILE* tmpfile2() {
-	FILE *fp = 0;
-	char tmpdir[MAX_PATH];
-	char fname[MAX_PATH-14];
-	if (!GetTempPath(MAX_PATH, tmpdir))
-		strcpy(tmpdir, ".");
-	if (GetTempFileName(tmpdir, "tmp", 0, fname)) {
-		int fd = _open(fname, _O_CREAT | _O_TEMPORARY | _O_RDWR | _O_BINARY, _S_IREAD | _S_IWRITE);
-		if (fd >= 0) {
-			fp = _fdopen(fd, "w+b");
-			if (fp == NULL) {
-				int saved_errno = errno;
-				_close(fd);
-				errno = saved_errno;
-			}
-		}
-	}
-	return fp;
-}
-
-#endif
-
-#if 0
-
-struct library_version_configuration exe_library_version_configuration = {
-    FONTFORGE_LIBFFE_VERSION_MAJOR,
-    FONTFORGE_LIBFFE_VERSION_MINOR,
-    LibFF_ModTime,			/* Seconds since 1970 (standard unix time) */
-    LibFF_ModTime_Str,			/* Version date (in char string format)    */
-    LibFF_VersionDate,			/* Version as long value, Year, month, day */
-    sizeof(struct library_version_configuration),
-    sizeof(struct splinefont),
-    sizeof(struct splinechar),
-    sizeof(struct fontviewbase),
-    sizeof(struct charviewbase),
-    sizeof(struct cvcontainer),
-    1,
-    1,
-
-#ifdef _NO_PYTHON
-    0,
-#else
-    1,
-#endif
-    0xff		/* Not currently defined */
-};
-#endif // 0
-

Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/ffintl.h
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/ffintl.h	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/ffintl.h	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,74 @@
+/* Copyright (C) 2005-2012 by George Williams */
+/*
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+
+ * The name of the author may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+ * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _INTL_H
+#define _INTL_H
+
+#if 1  /* don't include libintl.h, it's not required by dvisvgm */
+
+# define _(str)			(str)
+# define P_(str1,str_non1,n)	((n)==1?str1:str_non1)
+# define U_(str)		(str)
+
+# ifdef bindtextdomain
+#  undef bindtextdomain
+# endif
+# ifdef bind_textdomain_codeset
+#  undef bind_textdomain_codeset
+# endif
+# ifdef textdomain
+#  undef textdomain
+# endif
+
+# define bindtextdomain(domain,dir)
+# define bind_textdomain_codeset(domain,enc)
+# define textdomain(domain)
+
+# define dgettext(domain,str)	(str)
+
+#else /* HAVE_LIBINTL_H */
+
+# include <libintl.h>
+# define _(str)			gettext(str)
+# define P_(str1,str_non1,n)	ngettext(str1,str_non1,n)
+/* For messages including utf8 characters. old xgettexts won't handle them */
+/*  so we must do something special. */
+# define U_(str)		gettext(str)
+
+#endif /* HAVE_LIBINTL_H */
+
+/* For messages including utf8 sequences that need gettext_noop treatment */
+#define NU_(str)	(str)
+#define N_(str)		(str)
+#define S_(str)		(str)
+/* For messages in the shortcuts domain */
+#define H_(str)		(str)
+
+extern void GResourceUseGetText(void);
+char *sgettext(const char *msgid);
+
+#endif	/* _INTL_H */


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/ffintl.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/intl.h
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/intl.h	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/ff-woff/inc/intl.h	2017-02-13 17:57:19 UTC (rev 43208)
@@ -1,74 +0,0 @@
-/* Copyright (C) 2005-2012 by George Williams */
-/*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
-
- * The name of the author may not be used to endorse or promote products
- * derived from this software without specific prior written permission.
-
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _INTL_H
-#define _INTL_H
-
-#if !defined( HAVE_LIBINTL_H )
-
-# define _(str)			(str)
-# define P_(str1,str_non1,n)	((n)==1?str1:str_non1)
-# define U_(str)		(str)
-
-# ifdef bindtextdomain
-#  undef bindtextdomain
-# endif
-# ifdef bind_textdomain_codeset
-#  undef bind_textdomain_codeset
-# endif
-# ifdef textdomain
-#  undef textdomain
-# endif
-
-# define bindtextdomain(domain,dir)
-# define bind_textdomain_codeset(domain,enc)
-# define textdomain(domain)
-
-# define dgettext(domain,str)	(str)
-
-#else /* HAVE_LIBINTL_H */
-
-# include <libintl.h>
-# define _(str)			gettext(str)
-# define P_(str1,str_non1,n)	ngettext(str1,str_non1,n)
-/* For messages including utf8 characters. old xgettexts won't handle them */
-/*  so we must do something special. */
-# define U_(str)		gettext(str)
-
-#endif /* HAVE_LIBINTL_H */
-
-/* For messages including utf8 sequences that need gettext_noop treatment */
-#define NU_(str)	(str)
-#define N_(str)		(str)
-#define S_(str)		(str)
-/* For messages in the shortcuts domain */
-#define H_(str)		(str)
-
-extern void GResourceUseGetText(void);
-char *sgettext(const char *msgid);
-
-#endif	/* _INTL_H */

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/woff2/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/woff2/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/woff2/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -88,23 +88,14 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = dvisvgm-src/libs/woff2
+target_triplet = @target@
+subdir = libs/woff2
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
-	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 \
-	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -140,7 +131,7 @@
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -157,6 +148,7 @@
 am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
 am__v_CXX_0 = @echo "  CXX     " $@;
 am__v_CXX_1 = 
+CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -225,8 +217,7 @@
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 am__relativize = \
   dir0=`pwd`; \
@@ -255,9 +246,10 @@
   reldir="$$dir2"
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
-AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -265,7 +257,12 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CODE_COVERAGE_RULES = @CODE_COVERAGE_RULES@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
+CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -272,14 +269,13 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
+DATE = @DATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
-DVISVGM_TREE = @DVISVGM_TREE@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -286,10 +282,10 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
-FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
-FREETYPE2_LIBS = @FREETYPE2_LIBS@
-FT2_CONFIG = @FT2_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GCOV = @GCOV@
+GENHTML = @GENHTML@
 GREP = @GREP@
 HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
@@ -297,13 +293,9 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBGS_INCLUDES = @LIBGS_INCLUDES@
-LIBGS_LIBS = @LIBGS_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -311,7 +303,6 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -330,9 +321,8 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-POTRACE_DEPEND = @POTRACE_DEPEND@
-POTRACE_INCLUDES = @POTRACE_INCLUDES@
-POTRACE_LIBS = @POTRACE_LIBS@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -339,10 +329,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-ZLIB_DEPEND = @ZLIB_DEPEND@
-ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -389,11 +376,16 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -432,7 +424,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -441,9 +433,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dvisvgm-src/libs/woff2/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libs/woff2/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign dvisvgm-src/libs/woff2/Makefile
+	  $(AUTOMAKE) --foreign libs/woff2/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -456,9 +448,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/woff2/brotli/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/woff2/brotli/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/woff2/brotli/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -88,23 +88,14 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = dvisvgm-src/libs/woff2/brotli
+target_triplet = @target@
+subdir = libs/woff2/brotli
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
-	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 \
-	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -144,7 +135,7 @@
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -161,6 +152,7 @@
 am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
 am__v_CXX_0 = @echo "  CXX     " $@;
 am__v_CXX_1 = 
+CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -212,14 +204,14 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
-AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -227,7 +219,12 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CODE_COVERAGE_RULES = @CODE_COVERAGE_RULES@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
+CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -234,14 +231,13 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
+DATE = @DATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
-DVISVGM_TREE = @DVISVGM_TREE@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -248,10 +244,10 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
-FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
-FREETYPE2_LIBS = @FREETYPE2_LIBS@
-FT2_CONFIG = @FT2_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GCOV = @GCOV@
+GENHTML = @GENHTML@
 GREP = @GREP@
 HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
@@ -259,13 +255,9 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBGS_INCLUDES = @LIBGS_INCLUDES@
-LIBGS_LIBS = @LIBGS_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -273,7 +265,6 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -292,9 +283,8 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-POTRACE_DEPEND = @POTRACE_DEPEND@
-POTRACE_INCLUDES = @POTRACE_INCLUDES@
-POTRACE_LIBS = @POTRACE_LIBS@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -301,10 +291,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-ZLIB_DEPEND = @ZLIB_DEPEND@
-ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -351,11 +338,16 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -416,7 +408,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .cc .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -425,9 +417,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dvisvgm-src/libs/woff2/brotli/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libs/woff2/brotli/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign dvisvgm-src/libs/woff2/brotli/Makefile
+	  $(AUTOMAKE) --foreign libs/woff2/brotli/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -440,9 +432,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -88,23 +88,14 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-subdir = dvisvgm-src/libs/xxHash
+target_triplet = @target@
+subdir = libs/xxHash
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
-	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 \
-	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -135,7 +126,7 @@
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -186,14 +177,14 @@
   done | $(am__uniquify_input)`
 ETAGS = etags
 CTAGS = ctags
-am__DIST_COMMON = $(srcdir)/Makefile.in \
-	$(top_srcdir)/../../build-aux/depcomp
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = @AM_LDFLAGS@
 AR = @AR@
-AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -201,7 +192,12 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CODE_COVERAGE_RULES = @CODE_COVERAGE_RULES@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
+CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -208,14 +204,13 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
+DATE = @DATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
-DVISVGM_TREE = @DVISVGM_TREE@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -222,10 +217,10 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
-FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
-FREETYPE2_LIBS = @FREETYPE2_LIBS@
-FT2_CONFIG = @FT2_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GCOV = @GCOV@
+GENHTML = @GENHTML@
 GREP = @GREP@
 HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
@@ -233,13 +228,9 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBGS_INCLUDES = @LIBGS_INCLUDES@
-LIBGS_LIBS = @LIBGS_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -247,7 +238,6 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -266,9 +256,8 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-POTRACE_DEPEND = @POTRACE_DEPEND@
-POTRACE_INCLUDES = @POTRACE_INCLUDES@
-POTRACE_LIBS = @POTRACE_LIBS@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -275,10 +264,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-ZLIB_DEPEND = @ZLIB_DEPEND@
-ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -325,11 +311,16 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -341,7 +332,7 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -350,9 +341,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dvisvgm-src/libs/xxHash/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign libs/xxHash/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign dvisvgm-src/libs/xxHash/Makefile
+	  $(AUTOMAKE) --foreign libs/xxHash/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -365,9 +356,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.c
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.c	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.c	2017-02-13 17:57:19 UTC (rev 43208)
@@ -358,7 +358,7 @@
     return XXH_OK;
 }
 
-XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* restrict dstState, const XXH32_state_t* restrict srcState)
+XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dstState, const XXH32_state_t* srcState)
 {
     memcpy(dstState, srcState, sizeof(*dstState));
 }
@@ -729,7 +729,7 @@
     return XXH_OK;
 }
 
-XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* restrict dstState, const XXH64_state_t* restrict srcState)
+XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* dstState, const XXH64_state_t* srcState)
 {
     memcpy(dstState, srcState, sizeof(*dstState));
 }

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/libs/xxHash/xxhash.h	2017-02-13 17:57:19 UTC (rev 43208)
@@ -73,14 +73,6 @@
 
 
 /* ****************************
-*  Compiler specifics
-******************************/
-#if !(defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L))   /* ! C99 */
-#  define restrict   /* disable restrict */
-#endif
-
-
-/* ****************************
 *  Definitions
 ******************************/
 #include <stddef.h>   /* size_t */
@@ -178,7 +170,7 @@
 typedef struct XXH32_state_s XXH32_state_t;   /* incomplete type */
 XXH_PUBLIC_API XXH32_state_t* XXH32_createState(void);
 XXH_PUBLIC_API XXH_errorcode  XXH32_freeState(XXH32_state_t* statePtr);
-XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* restrict dst_state, const XXH32_state_t* restrict src_state);
+XXH_PUBLIC_API void XXH32_copyState(XXH32_state_t* dst_state, const XXH32_state_t* src_state);
 
 XXH_PUBLIC_API XXH_errorcode XXH32_reset  (XXH32_state_t* statePtr, unsigned int seed);
 XXH_PUBLIC_API XXH_errorcode XXH32_update (XXH32_state_t* statePtr, const void* input, size_t length);
@@ -236,7 +228,7 @@
 typedef struct XXH64_state_s XXH64_state_t;   /* incomplete type */
 XXH_PUBLIC_API XXH64_state_t* XXH64_createState(void);
 XXH_PUBLIC_API XXH_errorcode  XXH64_freeState(XXH64_state_t* statePtr);
-XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* restrict dst_state, const XXH64_state_t* restrict src_state);
+XXH_PUBLIC_API void XXH64_copyState(XXH64_state_t* dst_state, const XXH64_state_t* src_state);
 
 XXH_PUBLIC_API XXH_errorcode XXH64_reset  (XXH64_state_t* statePtr, unsigned long long seed);
 XXH_PUBLIC_API XXH_errorcode XXH64_update (XXH64_state_t* statePtr, const void* input, size_t length);

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ax_code_coverage.m4
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ax_code_coverage.m4	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ax_code_coverage.m4	2017-02-13 17:57:19 UTC (rev 43208)
@@ -8,15 +8,15 @@
 #
 # DESCRIPTION
 #
-#   Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS and
-#   CODE_COVERAGE_LDFLAGS which should be included in the CPPFLAGS, CFLAGS
-#   and LIBS/LDFLAGS variables of every build target (program or library)
-#   which should be built with code coverage support. Also defines
-#   CODE_COVERAGE_RULES which should be substituted in your Makefile; and
-#   $enable_code_coverage which can be used in subsequent configure output.
-#   CODE_COVERAGE_ENABLED is defined and substituted, and corresponds to the
-#   value of the --enable-code-coverage option, which defaults to being
-#   disabled.
+#   Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS,
+#   CODE_COVERAGE_CXXFLAGS and CODE_COVERAGE_LIBS which should be included
+#   in the CPPFLAGS, CFLAGS CXXFLAGS and LIBS/LIBADD variables of every
+#   build target (program or library) which should be built with code
+#   coverage support. Also defines CODE_COVERAGE_RULES which should be
+#   substituted in your Makefile; and $enable_code_coverage which can be
+#   used in subsequent configure output. CODE_COVERAGE_ENABLED is defined
+#   and substituted, and corresponds to the value of the
+#   --enable-code-coverage option, which defaults to being disabled.
 #
 #   Test also for gcov program and create GCOV variable that could be
 #   substituted.
@@ -33,9 +33,10 @@
 #   Makefile.am:
 #
 #     @CODE_COVERAGE_RULES@
-#     my_program_LIBS = ... $(CODE_COVERAGE_LDFLAGS) ...
+#     my_program_LIBS = ... $(CODE_COVERAGE_LIBS) ...
 #     my_program_CPPFLAGS = ... $(CODE_COVERAGE_CPPFLAGS) ...
 #     my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ...
+#     my_program_CXXFLAGS = ... $(CODE_COVERAGE_CXXFLAGS) ...
 #
 #   This results in a "check-code-coverage" rule being added to any
 #   Makefile.am which includes "@CODE_COVERAGE_RULES@" (assuming the module
@@ -44,12 +45,17 @@
 #   (`make check`) and build a code coverage report detailing the code which
 #   was touched, then print the URI for the report.
 #
+#   In earlier versions of this macro, CODE_COVERAGE_LDFLAGS was defined
+#   instead of CODE_COVERAGE_LIBS. They are both still defined, but use of
+#   CODE_COVERAGE_LIBS is preferred for clarity; CODE_COVERAGE_LDFLAGS is
+#   deprecated. They have the same value.
+#
 #   This code was derived from Makefile.decl in GLib, originally licenced
 #   under LGPLv2.1+.
 #
 # LICENSE
 #
-#   Copyright (c) 2012 Philip Withnall
+#   Copyright (c) 2012, 2016 Philip Withnall
 #   Copyright (c) 2012 Xan Lopez
 #   Copyright (c) 2012 Christian Persch
 #   Copyright (c) 2012 Paolo Borelli
@@ -69,7 +75,7 @@
 #   You should have received a copy of the GNU Lesser General Public License
 #   along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-#serial 9
+#serial 20
 
 AC_DEFUN([AX_CODE_COVERAGE],[
 	dnl Check for --enable-code-coverage
@@ -105,54 +111,64 @@
 			AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage])
 		])
 
-		# List of supported lcov versions.
-		lcov_version_list="1.6 1.7 1.8 1.9 1.10 1.11 1.12"
-
 		AC_CHECK_PROG([LCOV], [lcov], [lcov])
 		AC_CHECK_PROG([GENHTML], [genhtml], [genhtml])
 
-		AS_IF([ test "$LCOV" ], [
-			AC_CACHE_CHECK([for lcov version], ax_cv_lcov_version, [
-				ax_cv_lcov_version=invalid
-				lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
-				for lcov_check_version in $lcov_version_list; do
-					if test "$lcov_version" = "$lcov_check_version"; then
-						ax_cv_lcov_version="$lcov_check_version (ok)"
-					fi
-				done
-			])
-		], [
-			lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
-			AC_MSG_ERROR([$lcov_msg])
+		AS_IF([ test -z "$LCOV" ], [
+			AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed])
 		])
 
-		case $ax_cv_lcov_version in
-			""|invalid[)]
-				lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
-				AC_MSG_ERROR([$lcov_msg])
-				LCOV="exit 0;"
-			;;
-		esac
-
 		AS_IF([ test -z "$GENHTML" ], [
 			AC_MSG_ERROR([Could not find genhtml from the lcov package])
 		])
 
 		dnl Build the code coverage flags
+		dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility
 		CODE_COVERAGE_CPPFLAGS="-DNDEBUG"
 		CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
-		CODE_COVERAGE_LDFLAGS="-lgcov"
+		CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage"
+		CODE_COVERAGE_LIBS="-lgcov"
+		CODE_COVERAGE_LDFLAGS="$CODE_COVERAGE_LIBS"
 
 		AC_SUBST([CODE_COVERAGE_CPPFLAGS])
 		AC_SUBST([CODE_COVERAGE_CFLAGS])
+		AC_SUBST([CODE_COVERAGE_CXXFLAGS])
+		AC_SUBST([CODE_COVERAGE_LIBS])
 		AC_SUBST([CODE_COVERAGE_LDFLAGS])
+
+		[CODE_COVERAGE_RULES_CHECK='
+	-$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check
+	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
+']
+		[CODE_COVERAGE_RULES_CAPTURE='
+	$(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(call code_coverage_sanitize,$(PACKAGE_NAME)-$(PACKAGE_VERSION))" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_OPTIONS)
+	$(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) $(addprefix --directory ,$(CODE_COVERAGE_DIRECTORY)) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_LCOV_SHOPTS) $(CODE_COVERAGE_LCOV_RMOPTS)
+	- at rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
+	$(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) $(addprefix --prefix ,$(CODE_COVERAGE_DIRECTORY)) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
+	@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
+']
+		[CODE_COVERAGE_RULES_CLEAN='
+clean: code-coverage-clean
+distclean: code-coverage-clean
+code-coverage-clean:
+	-$(LCOV) --directory $(top_builddir) -z
+	-rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
+	-find . \( -name "*.gcda" -o -name "*.gcno" -o -name "*.gcov" \) -delete
+']
+	], [
+		[CODE_COVERAGE_RULES_CHECK='
+	@echo "Need to reconfigure with --enable-code-coverage"
+']
+		CODE_COVERAGE_RULES_CAPTURE="$CODE_COVERAGE_RULES_CHECK"
+		CODE_COVERAGE_RULES_CLEAN=''
 	])
 
-CODE_COVERAGE_RULES='
+[CODE_COVERAGE_RULES='
 # Code coverage
 #
 # Optional:
 #  - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting.
+#    Multiple directories may be specified, separated by whitespace.
 #    (Default: $(top_builddir))
 #  - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated
 #    by lcov for code coverage. (Default:
@@ -160,13 +176,26 @@
 #  - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage
 #    reports to be created. (Default:
 #    $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage)
+#  - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage,
+#    set to 0 to disable it and leave empty to stay with the default.
+#    (Default: empty)
+#  - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov
+#    instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
+#  - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov
+#    instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
 #  - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov
-#  - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the lcov instance.
-#    (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
-#  - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the lcov instance.
-#    (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
+#  - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the
+#    collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
+#  - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov
+#    instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
+#  - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering
+#    lcov instance. (Default: empty)
+#  - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov
+#    instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
+#  - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the
+#    genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE)
 #  - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml
-#    instance. (Default: empty)
+#    instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT)
 #  - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore
 #
 # The generated report will be titled using the $(PACKAGE_NAME) and
@@ -177,10 +206,19 @@
 CODE_COVERAGE_DIRECTORY ?= $(top_builddir)
 CODE_COVERAGE_OUTPUT_FILE ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage.info
 CODE_COVERAGE_OUTPUT_DIRECTORY ?= $(PACKAGE_NAME)-$(PACKAGE_VERSION)-coverage
+CODE_COVERAGE_BRANCH_COVERAGE ?=
+CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= $(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
+--rc lcov_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
+CODE_COVERAGE_LCOV_SHOPTS ?= $(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT)
 CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool "$(GCOV)"
 CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= $(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH)
 CODE_COVERAGE_LCOV_OPTIONS ?= $(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT)
-CODE_COVERAGE_GENHTML_OPTIONS ?=
+CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?=
+CODE_COVERAGE_LCOV_RMOPTS ?= $(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT)
+CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\
+$(if $(CODE_COVERAGE_BRANCH_COVERAGE),\
+--rc genhtml_branch_coverage=$(CODE_COVERAGE_BRANCH_COVERAGE))
+CODE_COVERAGE_GENHTML_OPTIONS ?= $(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULTS)
 CODE_COVERAGE_IGNORE_PATTERN ?=
 
 code_coverage_v_lcov_cap = $(code_coverage_v_lcov_cap_$(V))
@@ -198,46 +236,28 @@
 code_coverage_quiet_ = $(code_coverage_quiet_$(AM_DEFAULT_VERBOSITY))
 code_coverage_quiet_0 = --quiet
 
+# sanitizes the test-name: replaces with underscores: dashes and dots
+code_coverage_sanitize = $(subst -,_,$(subst .,_,$(1)))
+
 # Use recursive makes in order to ignore errors during check
-check-code-coverage:
-ifeq ($(CODE_COVERAGE_ENABLED),yes)
-	-$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k check
-	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) code-coverage-capture
-else
-	@echo "Need to reconfigure with --enable-code-coverage"
-endif
+check-code-coverage:'"$CODE_COVERAGE_RULES_CHECK"'
 
 # Capture code coverage data
-code-coverage-capture: code-coverage-capture-hook
-ifeq ($(CODE_COVERAGE_ENABLED),yes)
-	$(code_coverage_v_lcov_cap)$(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --capture --output-file "$(CODE_COVERAGE_OUTPUT_FILE).tmp" --test-name "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" --no-checksum --compat-libtool $(CODE_COVERAGE_LCOV_OPTIONS)
-	$(code_coverage_v_lcov_ign)$(LCOV) $(code_coverage_quiet) --directory $(CODE_COVERAGE_DIRECTORY) --remove "$(CODE_COVERAGE_OUTPUT_FILE).tmp" "/tmp/*" $(CODE_COVERAGE_IGNORE_PATTERN) --output-file "$(CODE_COVERAGE_OUTPUT_FILE)"
-	- at rm -f $(CODE_COVERAGE_OUTPUT_FILE).tmp
-	$(code_coverage_v_genhtml)LANG=C $(GENHTML) $(code_coverage_quiet) --prefix $(CODE_COVERAGE_DIRECTORY) --output-directory "$(CODE_COVERAGE_OUTPUT_DIRECTORY)" --title "$(PACKAGE_NAME)-$(PACKAGE_VERSION) Code Coverage" --legend --show-details "$(CODE_COVERAGE_OUTPUT_FILE)" $(CODE_COVERAGE_GENHTML_OPTIONS)
-	@echo "file://$(abs_builddir)/$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html"
-else
-	@echo "Need to reconfigure with --enable-code-coverage"
-endif
+code-coverage-capture: code-coverage-capture-hook'"$CODE_COVERAGE_RULES_CAPTURE"'
 
 # Hook rule executed before code-coverage-capture, overridable by the user
 code-coverage-capture-hook:
 
-ifeq ($(CODE_COVERAGE_ENABLED),yes)
-clean: code-coverage-clean
-code-coverage-clean:
-	-$(LCOV) --directory $(top_builddir) -z
-	-rm -rf $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_FILE).tmp $(CODE_COVERAGE_OUTPUT_DIRECTORY)
-	-find . -name "*.gcda" -o -name "*.gcov" -delete
-endif
+'"$CODE_COVERAGE_RULES_CLEAN"'
 
 GITIGNOREFILES ?=
 GITIGNOREFILES += $(CODE_COVERAGE_OUTPUT_FILE) $(CODE_COVERAGE_OUTPUT_DIRECTORY)
 
-DISTCHECK_CONFIGURE_FLAGS ?=
-DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
+A''M_DISTCHECK_CONFIGURE_FLAGS ?=
+A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-code-coverage
 
 .PHONY: check-code-coverage code-coverage-capture code-coverage-capture-hook code-coverage-clean
-'
+']
 
 	AC_SUBST([CODE_COVERAGE_RULES])
 	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([CODE_COVERAGE_RULES])])

Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ax_cxx_compile_stdcxx.m4
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ax_cxx_compile_stdcxx.m4	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ax_cxx_compile_stdcxx.m4	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,982 @@
+# ===========================================================================
+#   http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html
+# ===========================================================================
+#
+# SYNOPSIS
+#
+#   AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional])
+#
+# DESCRIPTION
+#
+#   Check for baseline language coverage in the compiler for the specified
+#   version of the C++ standard.  If necessary, add switches to CXX and
+#   CXXCPP to enable support.  VERSION may be '11' (for the C++11 standard)
+#   or '14' (for the C++14 standard).
+#
+#   The second argument, if specified, indicates whether you insist on an
+#   extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g.
+#   -std=c++11).  If neither is specified, you get whatever works, with
+#   preference for an extended mode.
+#
+#   The third argument, if specified 'mandatory' or if left unspecified,
+#   indicates that baseline support for the specified C++ standard is
+#   required and that the macro should error out if no mode with that
+#   support is found.  If specified 'optional', then configuration proceeds
+#   regardless, after defining HAVE_CXX${VERSION} if and only if a
+#   supporting mode is found.
+#
+# LICENSE
+#
+#   Copyright (c) 2008 Benjamin Kosnik <bkoz at redhat.com>
+#   Copyright (c) 2012 Zack Weinberg <zackw at panix.com>
+#   Copyright (c) 2013 Roy Stogner <roystgnr at ices.utexas.edu>
+#   Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov at google.com>
+#   Copyright (c) 2015 Paul Norman <penorman at mac.com>
+#   Copyright (c) 2015 Moritz Klammler <moritz at klammler.eu>
+#   Copyright (c) 2016 Krzesimir Nowak <qdlacz at gmail.com>
+#
+#   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 any
+#   warranty.
+
+#serial 6
+
+dnl  This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro
+dnl  (serial version number 13).
+
+AX_REQUIRE_DEFINED([AC_MSG_WARN])
+AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl
+  m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"],
+        [$1], [14], [ax_cxx_compile_alternatives="14 1y"],
+        [$1], [17], [ax_cxx_compile_alternatives="17 1z"],
+        [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$2], [], [],
+        [$2], [ext], [],
+        [$2], [noext], [],
+        [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl
+  m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true],
+        [$3], [optional], [ax_cxx_compile_cxx$1_required=false],
+        [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])])
+  AC_LANG_PUSH([C++])dnl
+  ac_success=no
+  AC_CACHE_CHECK(whether $CXX supports C++$1 features by default,
+  ax_cv_cxx_compile_cxx$1,
+  [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+    [ax_cv_cxx_compile_cxx$1=yes],
+    [ax_cv_cxx_compile_cxx$1=no])])
+  if test x$ax_cv_cxx_compile_cxx$1 = xyes; then
+    ac_success=yes
+  fi
+
+  m4_if([$2], [noext], [], [dnl
+  if test x$ac_success = xno; then
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      switch="-std=gnu++${alternative}"
+      cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+      AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                     $cachevar,
+        [ac_save_CXX="$CXX"
+         CXX="$CXX $switch"
+         AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+          [eval $cachevar=yes],
+          [eval $cachevar=no])
+         CXX="$ac_save_CXX"])
+      if eval test x\$$cachevar = xyes; then
+        CXX="$CXX $switch"
+        if test -n "$CXXCPP" ; then
+          CXXCPP="$CXXCPP $switch"
+        fi
+        ac_success=yes
+        break
+      fi
+    done
+  fi])
+
+  m4_if([$2], [ext], [], [dnl
+  if test x$ac_success = xno; then
+    dnl HP's aCC needs +std=c++11 according to:
+    dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf
+    dnl Cray's crayCC needs "-h std=c++11"
+    for alternative in ${ax_cxx_compile_alternatives}; do
+      for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do
+        cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch])
+        AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch,
+                       $cachevar,
+          [ac_save_CXX="$CXX"
+           CXX="$CXX $switch"
+           AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])],
+            [eval $cachevar=yes],
+            [eval $cachevar=no])
+           CXX="$ac_save_CXX"])
+        if eval test x\$$cachevar = xyes; then
+          CXX="$CXX $switch"
+          if test -n "$CXXCPP" ; then
+            CXXCPP="$CXXCPP $switch"
+          fi
+          ac_success=yes
+          break
+        fi
+      done
+      if test x$ac_success = xyes; then
+        break
+      fi
+    done
+  fi])
+  AC_LANG_POP([C++])
+  if test x$ax_cxx_compile_cxx$1_required = xtrue; then
+    if test x$ac_success = xno; then
+      AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.])
+    fi
+  fi
+  if test x$ac_success = xno; then
+    HAVE_CXX$1=0
+    AC_MSG_NOTICE([No compiler with C++$1 support was found])
+  else
+    HAVE_CXX$1=1
+    AC_DEFINE(HAVE_CXX$1,1,
+              [define if the compiler supports basic C++$1 syntax])
+  fi
+  AC_SUBST(HAVE_CXX$1)
+  m4_if([$1], [17], [AC_MSG_WARN([C++17 is not yet standardized, so the checks may change in incompatible ways anytime])])
+])
+
+
+dnl  Test body for checking C++11 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+)
+
+
+dnl  Test body for checking C++14 support
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+)
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17],
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_11
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_14
+  _AX_CXX_COMPILE_STDCXX_testbody_new_in_17
+)
+
+dnl  Tests for new features in C++11
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[
+
+// If the compiler admits that it is not ready for C++11, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201103L
+
+#error "This is not a C++11 compiler"
+
+#else
+
+namespace cxx11
+{
+
+  namespace test_static_assert
+  {
+
+    template <typename T>
+    struct check
+    {
+      static_assert(sizeof(int) <= sizeof(T), "not big enough");
+    };
+
+  }
+
+  namespace test_final_override
+  {
+
+    struct Base
+    {
+      virtual void f() {}
+    };
+
+    struct Derived : public Base
+    {
+      virtual void f() override {}
+    };
+
+  }
+
+  namespace test_double_right_angle_brackets
+  {
+
+    template < typename T >
+    struct check {};
+
+    typedef check<void> single_type;
+    typedef check<check<void>> double_type;
+    typedef check<check<check<void>>> triple_type;
+    typedef check<check<check<check<void>>>> quadruple_type;
+
+  }
+
+  namespace test_decltype
+  {
+
+    int
+    f()
+    {
+      int a = 1;
+      decltype(a) b = 2;
+      return a + b;
+    }
+
+  }
+
+  namespace test_type_deduction
+  {
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static const bool value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static const bool value = true;
+    };
+
+    template < typename T1, typename T2 >
+    auto
+    add(T1 a1, T2 a2) -> decltype(a1 + a2)
+    {
+      return a1 + a2;
+    }
+
+    int
+    test(const int c, volatile int v)
+    {
+      static_assert(is_same<int, decltype(0)>::value == true, "");
+      static_assert(is_same<int, decltype(c)>::value == false, "");
+      static_assert(is_same<int, decltype(v)>::value == false, "");
+      auto ac = c;
+      auto av = v;
+      auto sumi = ac + av + 'x';
+      auto sumf = ac + av + 1.0;
+      static_assert(is_same<int, decltype(ac)>::value == true, "");
+      static_assert(is_same<int, decltype(av)>::value == true, "");
+      static_assert(is_same<int, decltype(sumi)>::value == true, "");
+      static_assert(is_same<int, decltype(sumf)>::value == false, "");
+      static_assert(is_same<int, decltype(add(c, v))>::value == true, "");
+      return (sumf > 0.0) ? sumi : add(c, v);
+    }
+
+  }
+
+  namespace test_noexcept
+  {
+
+    int f() { return 0; }
+    int g() noexcept { return 0; }
+
+    static_assert(noexcept(f()) == false, "");
+    static_assert(noexcept(g()) == true, "");
+
+  }
+
+  namespace test_constexpr
+  {
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c_r(const CharT *const s, const unsigned long acc) noexcept
+    {
+      return *s ? strlen_c_r(s + 1, acc + 1) : acc;
+    }
+
+    template < typename CharT >
+    unsigned long constexpr
+    strlen_c(const CharT *const s) noexcept
+    {
+      return strlen_c_r(s, 0UL);
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("1") == 1UL, "");
+    static_assert(strlen_c("example") == 7UL, "");
+    static_assert(strlen_c("another\0example") == 7UL, "");
+
+  }
+
+  namespace test_rvalue_references
+  {
+
+    template < int N >
+    struct answer
+    {
+      static constexpr int value = N;
+    };
+
+    answer<1> f(int&)       { return answer<1>(); }
+    answer<2> f(const int&) { return answer<2>(); }
+    answer<3> f(int&&)      { return answer<3>(); }
+
+    void
+    test()
+    {
+      int i = 0;
+      const int c = 0;
+      static_assert(decltype(f(i))::value == 1, "");
+      static_assert(decltype(f(c))::value == 2, "");
+      static_assert(decltype(f(0))::value == 3, "");
+    }
+
+  }
+
+  namespace test_uniform_initialization
+  {
+
+    struct test
+    {
+      static const int zero {};
+      static const int one {1};
+    };
+
+    static_assert(test::zero == 0, "");
+    static_assert(test::one == 1, "");
+
+  }
+
+  namespace test_lambdas
+  {
+
+    void
+    test1()
+    {
+      auto lambda1 = [](){};
+      auto lambda2 = lambda1;
+      lambda1();
+      lambda2();
+    }
+
+    int
+    test2()
+    {
+      auto a = [](int i, int j){ return i + j; }(1, 2);
+      auto b = []() -> int { return '0'; }();
+      auto c = [=](){ return a + b; }();
+      auto d = [&](){ return c; }();
+      auto e = [a, &b](int x) mutable {
+        const auto identity = [](int y){ return y; };
+        for (auto i = 0; i < a; ++i)
+          a += b--;
+        return x + identity(a + b);
+      }(0);
+      return a + b + c + d + e;
+    }
+
+    int
+    test3()
+    {
+      const auto nullary = [](){ return 0; };
+      const auto unary = [](int x){ return x; };
+      using nullary_t = decltype(nullary);
+      using unary_t = decltype(unary);
+      const auto higher1st = [](nullary_t f){ return f(); };
+      const auto higher2nd = [unary](nullary_t f1){
+        return [unary, f1](unary_t f2){ return f2(unary(f1())); };
+      };
+      return higher1st(nullary) + higher2nd(nullary)(unary);
+    }
+
+  }
+
+  namespace test_variadic_templates
+  {
+
+    template <int...>
+    struct sum;
+
+    template <int N0, int... N1toN>
+    struct sum<N0, N1toN...>
+    {
+      static constexpr auto value = N0 + sum<N1toN...>::value;
+    };
+
+    template <>
+    struct sum<>
+    {
+      static constexpr auto value = 0;
+    };
+
+    static_assert(sum<>::value == 0, "");
+    static_assert(sum<1>::value == 1, "");
+    static_assert(sum<23>::value == 23, "");
+    static_assert(sum<1, 2>::value == 3, "");
+    static_assert(sum<5, 5, 11>::value == 21, "");
+    static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, "");
+
+  }
+
+  // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae
+  // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function
+  // because of this.
+  namespace test_template_alias_sfinae
+  {
+
+    struct foo {};
+
+    template<typename T>
+    using member = typename T::member_type;
+
+    template<typename T>
+    void func(...) {}
+
+    template<typename T>
+    void func(member<T>*) {}
+
+    void test();
+
+    void test() { func<foo>(0); }
+
+  }
+
+}  // namespace cxx11
+
+#endif  // __cplusplus >= 201103L
+
+]])
+
+
+dnl  Tests for new features in C++14
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[
+
+// If the compiler admits that it is not ready for C++14, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus < 201402L
+
+#error "This is not a C++14 compiler"
+
+#else
+
+namespace cxx14
+{
+
+  namespace test_polymorphic_lambdas
+  {
+
+    int
+    test()
+    {
+      const auto lambda = [](auto&&... args){
+        const auto istiny = [](auto x){
+          return (sizeof(x) == 1UL) ? 1 : 0;
+        };
+        const int aretiny[] = { istiny(args)... };
+        return aretiny[0];
+      };
+      return lambda(1, 1L, 1.0f, '1');
+    }
+
+  }
+
+  namespace test_binary_literals
+  {
+
+    constexpr auto ivii = 0b0000000000101010;
+    static_assert(ivii == 42, "wrong value");
+
+  }
+
+  namespace test_generalized_constexpr
+  {
+
+    template < typename CharT >
+    constexpr unsigned long
+    strlen_c(const CharT *const s) noexcept
+    {
+      auto length = 0UL;
+      for (auto p = s; *p; ++p)
+        ++length;
+      return length;
+    }
+
+    static_assert(strlen_c("") == 0UL, "");
+    static_assert(strlen_c("x") == 1UL, "");
+    static_assert(strlen_c("test") == 4UL, "");
+    static_assert(strlen_c("another\0test") == 7UL, "");
+
+  }
+
+  namespace test_lambda_init_capture
+  {
+
+    int
+    test()
+    {
+      auto x = 0;
+      const auto lambda1 = [a = x](int b){ return a + b; };
+      const auto lambda2 = [a = lambda1(x)](){ return a; };
+      return lambda2();
+    }
+
+  }
+
+  namespace test_digit_separators
+  {
+
+    constexpr auto ten_million = 100'000'000;
+    static_assert(ten_million == 100000000, "");
+
+  }
+
+  namespace test_return_type_deduction
+  {
+
+    auto f(int& x) { return x; }
+    decltype(auto) g(int& x) { return x; }
+
+    template < typename T1, typename T2 >
+    struct is_same
+    {
+      static constexpr auto value = false;
+    };
+
+    template < typename T >
+    struct is_same<T, T>
+    {
+      static constexpr auto value = true;
+    };
+
+    int
+    test()
+    {
+      auto x = 0;
+      static_assert(is_same<int, decltype(f(x))>::value, "");
+      static_assert(is_same<int&, decltype(g(x))>::value, "");
+      return x;
+    }
+
+  }
+
+}  // namespace cxx14
+
+#endif  // __cplusplus >= 201402L
+
+]])
+
+
+dnl  Tests for new features in C++17
+
+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[
+
+// If the compiler admits that it is not ready for C++17, why torture it?
+// Hopefully, this will speed up the test.
+
+#ifndef __cplusplus
+
+#error "This is not a C++ compiler"
+
+#elif __cplusplus <= 201402L
+
+#error "This is not a C++17 compiler"
+
+#else
+
+#if defined(__clang__)
+  #define REALLY_CLANG
+#else
+  #if defined(__GNUC__)
+    #define REALLY_GCC
+  #endif
+#endif
+
+#include <initializer_list>
+#include <utility>
+#include <type_traits>
+
+namespace cxx17
+{
+
+#if !defined(REALLY_CLANG)
+  namespace test_constexpr_lambdas
+  {
+
+    // TODO: test it with clang++ from git
+
+    constexpr int foo = [](){return 42;}();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test::nested_namespace::definitions
+  {
+
+  }
+
+  namespace test_fold_expression
+  {
+
+    template<typename... Args>
+    int multiply(Args... args)
+    {
+      return (args * ... * 1);
+    }
+
+    template<typename... Args>
+    bool all(Args... args)
+    {
+      return (args && ...);
+    }
+
+  }
+
+  namespace test_extended_static_assert
+  {
+
+    static_assert (true);
+
+  }
+
+  namespace test_auto_brace_init_list
+  {
+
+    auto foo = {5};
+    auto bar {5};
+
+    static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value);
+    static_assert(std::is_same<int, decltype(bar)>::value);
+  }
+
+  namespace test_typename_in_template_template_parameter
+  {
+
+    template<template<typename> typename X> struct D;
+
+  }
+
+  namespace test_fallthrough_nodiscard_maybe_unused_attributes
+  {
+
+    int f1()
+    {
+      return 42;
+    }
+
+    [[nodiscard]] int f2()
+    {
+      [[maybe_unused]] auto unused = f1();
+
+      switch (f1())
+      {
+      case 17:
+        f1();
+        [[fallthrough]];
+      case 42:
+        f1();
+      }
+      return f1();
+    }
+
+  }
+
+  namespace test_extended_aggregate_initialization
+  {
+
+    struct base1
+    {
+      int b1, b2 = 42;
+    };
+
+    struct base2
+    {
+      base2() {
+        b3 = 42;
+      }
+      int b3;
+    };
+
+    struct derived : base1, base2
+    {
+        int d;
+    };
+
+    derived d1 {{1, 2}, {}, 4};  // full initialization
+    derived d2 {{}, {}, 4};      // value-initialized bases
+
+  }
+
+  namespace test_general_range_based_for_loop
+  {
+
+    struct iter
+    {
+      int i;
+
+      int& operator* ()
+      {
+        return i;
+      }
+
+      const int& operator* () const
+      {
+        return i;
+      }
+
+      iter& operator++()
+      {
+        ++i;
+        return *this;
+      }
+    };
+
+    struct sentinel
+    {
+      int i;
+    };
+
+    bool operator== (const iter& i, const sentinel& s)
+    {
+      return i.i == s.i;
+    }
+
+    bool operator!= (const iter& i, const sentinel& s)
+    {
+      return !(i == s);
+    }
+
+    struct range
+    {
+      iter begin() const
+      {
+        return {0};
+      }
+
+      sentinel end() const
+      {
+        return {5};
+      }
+    };
+
+    void f()
+    {
+      range r {};
+
+      for (auto i : r)
+      {
+        [[maybe_unused]] auto v = i;
+      }
+    }
+
+  }
+
+  namespace test_lambda_capture_asterisk_this_by_value
+  {
+
+    struct t
+    {
+      int i;
+      int foo()
+      {
+        return [*this]()
+        {
+          return i;
+        }();
+      }
+    };
+
+  }
+
+  namespace test_enum_class_construction
+  {
+
+    enum class byte : unsigned char
+    {};
+
+    byte foo {42};
+
+  }
+
+  namespace test_constexpr_if
+  {
+
+    template <bool cond>
+    int f ()
+    {
+      if constexpr(cond)
+      {
+        return 13;
+      }
+      else
+      {
+        return 42;
+      }
+    }
+
+  }
+
+  namespace test_selection_statement_with_initializer
+  {
+
+    int f()
+    {
+      return 13;
+    }
+
+    int f2()
+    {
+      if (auto i = f(); i > 0)
+      {
+        return 3;
+      }
+
+      switch (auto i = f(); i + 4)
+      {
+      case 17:
+        return 2;
+
+      default:
+        return 1;
+      }
+    }
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_template_argument_deduction_for_class_templates
+  {
+
+    // TODO: test it with clang++ from git
+
+    template <typename T1, typename T2>
+    struct pair
+    {
+      pair (T1 p1, T2 p2)
+        : m1 {p1},
+          m2 {p2}
+      {}
+
+      T1 m1;
+      T2 m2;
+    };
+
+    void f()
+    {
+      [[maybe_unused]] auto p = pair{13, 42u};
+    }
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_non_type_auto_template_parameters
+  {
+
+    template <auto n>
+    struct B
+    {};
+
+    B<5> b1;
+    B<'a'> b2;
+
+  }
+
+#if !defined(REALLY_CLANG)
+  namespace test_structured_bindings
+  {
+
+    // TODO: test it with clang++ from git
+
+    int arr[2] = { 1, 2 };
+    std::pair<int, int> pr = { 1, 2 };
+
+    auto f1() -> int(&)[2]
+    {
+      return arr;
+    }
+
+    auto f2() -> std::pair<int, int>&
+    {
+      return pr;
+    }
+
+    struct S
+    {
+      int x1 : 2;
+      volatile double y1;
+    };
+
+    S f3()
+    {
+      return {};
+    }
+
+    auto [ x1, y1 ] = f1();
+    auto& [ xr1, yr1 ] = f1();
+    auto [ x2, y2 ] = f2();
+    auto& [ xr2, yr2 ] = f2();
+    const auto [ x3, y3 ] = f3();
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+#if !defined(REALLY_CLANG)
+  namespace test_exception_spec_type_system
+  {
+
+    // TODO: test it with clang++ from git
+
+    struct Good {};
+    struct Bad {};
+
+    void g1() noexcept;
+    void g2();
+
+    template<typename T>
+    Bad
+    f(T*, T*);
+
+    template<typename T1, typename T2>
+    Good
+    f(T1*, T2*);
+
+    static_assert (std::is_same_v<Good, decltype(f(g1, g2))>);
+
+  }
+#endif // !defined(REALLY_CLANG)
+
+  namespace test_inline_variables
+  {
+
+    template<class T> void f(T)
+    {}
+
+    template<class T> inline T g(T)
+    {
+      return T{};
+    }
+
+    template<> inline void f<>(int)
+    {}
+
+    template<> int g<>(int)
+    {
+      return 5;
+    }
+
+  }
+
+}  // namespace cxx17
+
+#endif  // __cplusplus <= 201402L
+
+]])


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ax_cxx_compile_stdcxx.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/libtool.m4
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/libtool.m4	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/libtool.m4	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,8387 @@
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+#
+#   Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+#   Written by Gordon Matzigkeit, 1996
+#
+# 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.
+
+m4_define([_LT_COPYING], [dnl
+# Copyright (C) 2014 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.
+
+# GNU Libtool 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 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the  same
+# distribution terms that you use for the rest of that program.
+#
+# GNU Libtool 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/>.
+])
+
+# serial 58 LT_INIT
+
+
+# LT_PREREQ(VERSION)
+# ------------------
+# Complain and exit if this libtool version is less that VERSION.
+m4_defun([LT_PREREQ],
+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1,
+       [m4_default([$3],
+		   [m4_fatal([Libtool version $1 or higher is required],
+		             63)])],
+       [$2])])
+
+
+# _LT_CHECK_BUILDDIR
+# ------------------
+# Complain if the absolute build directory name contains unusual characters
+m4_defun([_LT_CHECK_BUILDDIR],
+[case `pwd` in
+  *\ * | *\	*)
+    AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;;
+esac
+])
+
+
+# LT_INIT([OPTIONS])
+# ------------------
+AC_DEFUN([LT_INIT],
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
+AC_BEFORE([$0], [LT_LANG])dnl
+AC_BEFORE([$0], [LT_OUTPUT])dnl
+AC_BEFORE([$0], [LTDL_INIT])dnl
+m4_require([_LT_CHECK_BUILDDIR])dnl
+
+dnl Autoconf doesn't catch unexpanded LT_ macros by default:
+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl
+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl
+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4
+dnl unless we require an AC_DEFUNed macro:
+AC_REQUIRE([LTOPTIONS_VERSION])dnl
+AC_REQUIRE([LTSUGAR_VERSION])dnl
+AC_REQUIRE([LTVERSION_VERSION])dnl
+AC_REQUIRE([LTOBSOLETE_VERSION])dnl
+m4_require([_LT_PROG_LTMAIN])dnl
+
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
+dnl Parse OPTIONS
+_LT_SET_OPTIONS([$0], [$1])
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS=$ltmain
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+_LT_SETUP
+
+# Only expand once:
+m4_define([LT_INIT])
+])# LT_INIT
+
+# Old names:
+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT])
+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
+dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+
+
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+    for cc_temp in @S|@*""; do
+      case $cc_temp in
+        compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+        distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+        \-*) ;;
+        *) break;;
+      esac
+    done
+    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
+# _LT_CC_BASENAME(CC)
+# -------------------
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
+m4_defun([_LT_CC_BASENAME],
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
+])
+
+
+# _LT_FILEUTILS_DEFAULTS
+# ----------------------
+# It is okay to use these file commands and assume they have been set
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
+m4_defun([_LT_FILEUTILS_DEFAULTS],
+[: ${CP="cp -f"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+])# _LT_FILEUTILS_DEFAULTS
+
+
+# _LT_SETUP
+# ---------
+m4_defun([_LT_SETUP],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
+_LT_DECL([], [host_alias], [0], [The host system])dnl
+_LT_DECL([], [host], [0])dnl
+_LT_DECL([], [host_os], [0])dnl
+dnl
+_LT_DECL([], [build_alias], [0], [The build system])dnl
+_LT_DECL([], [build], [0])dnl
+_LT_DECL([], [build_os], [0])dnl
+dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+dnl
+AC_REQUIRE([AC_PROG_LN_S])dnl
+test -z "$LN_S" && LN_S="ln -s"
+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl
+dnl
+AC_REQUIRE([LT_CMD_MAX_LEN])dnl
+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl
+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
+dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
+m4_require([_LT_CMD_RELOAD])dnl
+m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
+m4_require([_LT_CMD_OLD_ARCHIVE])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
+
+_LT_CONFIG_LIBTOOL_INIT([
+# See if we are running on zsh, and set the options that allow our
+# commands through without removal of \ escapes INIT.
+if test -n "\${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+])
+if test -n "${ZSH_VERSION+set}"; then
+   setopt NO_GLOB_SUBST
+fi
+
+_LT_CHECK_OBJDIR
+
+m4_require([_LT_TAG_COMPILER])dnl
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test set != "${COLLECT_NAMES+set}"; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Global variables:
+ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a '.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+
+with_gnu_ld=$lt_cv_prog_gnu_ld
+
+old_CC=$CC
+old_CFLAGS=$CFLAGS
+
+# Set sane defaults for various variables
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+test -z "$LD" && LD=ld
+test -z "$ac_objext" && ac_objext=o
+
+_LT_CC_BASENAME([$compiler])
+
+# Only perform the check for file, if the check method requires it
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+case $deplibs_check_method in
+file_magic*)
+  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
+    _LT_PATH_MAGIC
+  fi
+  ;;
+esac
+
+# Use C for the default configuration in the libtool script
+LT_SUPPORTED_TAG([CC])
+_LT_LANG_C_CONFIG
+_LT_LANG_DEFAULT_CONFIG
+_LT_CONFIG_COMMANDS
+])# _LT_SETUP
+
+
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
+# _LT_PROG_LTMAIN
+# ---------------
+# Note that this code is called both from 'configure', and 'config.status'
+# now that we use AC_CONFIG_COMMANDS to generate libtool.  Notably,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
+# so we pass a copy along to make sure it has a sensible value anyway.
+m4_defun([_LT_PROG_LTMAIN],
+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
+ltmain=$ac_aux_dir/ltmain.sh
+])# _LT_PROG_LTMAIN
+
+
+## ------------------------------------- ##
+## Accumulate code for creating libtool. ##
+## ------------------------------------- ##
+
+# So that we can recreate a full libtool script including additional
+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
+# in macros and then make a single call at the end using the 'libtool'
+# label.
+
+
+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS])
+# ----------------------------------------
+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL_INIT],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_INIT],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_INIT])
+
+
+# _LT_CONFIG_LIBTOOL([COMMANDS])
+# ------------------------------
+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later.
+m4_define([_LT_CONFIG_LIBTOOL],
+[m4_ifval([$1],
+          [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS],
+                     [$1
+])])])
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS])
+
+
+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS])
+# -----------------------------------------------------
+m4_defun([_LT_CONFIG_SAVE_COMMANDS],
+[_LT_CONFIG_LIBTOOL([$1])
+_LT_CONFIG_LIBTOOL_INIT([$2])
+])
+
+
+# _LT_FORMAT_COMMENT([COMMENT])
+# -----------------------------
+# Add leading comment marks to the start of each line, and a trailing
+# full-stop to the whole comment if one is not present already.
+m4_define([_LT_FORMAT_COMMENT],
+[m4_ifval([$1], [
+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])],
+              [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.])
+)])
+
+
+
+## ------------------------ ##
+## FIXME: Eliminate VARNAME ##
+## ------------------------ ##
+
+
+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?])
+# -------------------------------------------------------------------
+# CONFIGNAME is the name given to the value in the libtool script.
+# VARNAME is the (base) name used in the configure script.
+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on
+# VARNAME.  Any other value will be used directly.
+m4_define([_LT_DECL],
+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ],
+    [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name],
+	[m4_ifval([$1], [$1], [$2])])
+    lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3])
+    m4_ifval([$4],
+	[lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])])
+    lt_dict_add_subkey([lt_decl_dict], [$2],
+	[tagged?], [m4_ifval([$5], [yes], [no])])])
+])
+
+
+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION])
+# --------------------------------------------------------
+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])])
+
+
+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_tag_varnames],
+[_lt_decl_filter([tagged?], [yes], $@)])
+
+
+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..])
+# ---------------------------------------------------------
+m4_define([_lt_decl_filter],
+[m4_case([$#],
+  [0], [m4_fatal([$0: too few arguments: $#])],
+  [1], [m4_fatal([$0: too few arguments: $#: $1])],
+  [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)],
+  [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)],
+  [lt_dict_filter([lt_decl_dict], $@)])[]dnl
+])
+
+
+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...])
+# --------------------------------------------------
+m4_define([lt_decl_quote_varnames],
+[_lt_decl_filter([value], [1], $@)])
+
+
+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_dquote_varnames],
+[_lt_decl_filter([value], [2], $@)])
+
+
+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...])
+# ---------------------------------------------------
+m4_define([lt_decl_varnames_tagged],
+[m4_assert([$# <= 2])dnl
+_$0(m4_quote(m4_default([$1], [[, ]])),
+    m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]),
+    m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))])
+m4_define([_lt_decl_varnames_tagged],
+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])])
+
+
+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...])
+# ------------------------------------------------
+m4_define([lt_decl_all_varnames],
+[_$0(m4_quote(m4_default([$1], [[, ]])),
+     m4_if([$2], [],
+	   m4_quote(lt_decl_varnames),
+	m4_quote(m4_shift($@))))[]dnl
+])
+m4_define([_lt_decl_all_varnames],
+[lt_join($@, lt_decl_varnames_tagged([$1],
+			lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl
+])
+
+
+# _LT_CONFIG_STATUS_DECLARE([VARNAME])
+# ------------------------------------
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'.  VARNAME
+# must have a single quote delimited value for this to work.
+m4_define([_LT_CONFIG_STATUS_DECLARE],
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
+
+
+# _LT_CONFIG_STATUS_DECLARATIONS
+# ------------------------------
+# We delimit libtool config variables with single quotes, so when
+# we write them to config.status, we have to be sure to quote all
+# embedded single quotes properly.  In configure, this macro expands
+# each variable declared with _LT_DECL (and _LT_TAGDECL) into:
+#
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
+    [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAGS
+# ----------------
+# Output comment and list of tags supported by the script
+m4_defun([_LT_LIBTOOL_TAGS],
+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
+available_tags='_LT_TAGS'dnl
+])
+
+
+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG])
+# -----------------------------------
+# Extract the dictionary values for VARNAME (optionally with TAG) and
+# expand to a commented shell variable setting:
+#
+#    # Some comment about what VAR is for.
+#    visible_name=$lt_internal_name
+m4_define([_LT_LIBTOOL_DECLARE],
+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1],
+					   [description])))[]dnl
+m4_pushdef([_libtool_name],
+    m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl
+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])),
+    [0], [_libtool_name=[$]$1],
+    [1], [_libtool_name=$lt_[]$1],
+    [2], [_libtool_name=$lt_[]$1],
+    [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl
+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
+])
+
+
+# _LT_LIBTOOL_CONFIG_VARS
+# -----------------------
+# Produce commented declarations of non-tagged libtool config variables
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
+# script.  Tagged libtool config variables (even for the LIBTOOL CONFIG
+# section) are produced by _LT_LIBTOOL_TAG_VARS.
+m4_defun([_LT_LIBTOOL_CONFIG_VARS],
+[m4_foreach([_lt_var],
+    m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])])
+
+
+# _LT_LIBTOOL_TAG_VARS(TAG)
+# -------------------------
+m4_define([_LT_LIBTOOL_TAG_VARS],
+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames),
+    [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])])
+
+
+# _LT_TAGVAR(VARNAME, [TAGNAME])
+# ------------------------------
+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
+
+
+# _LT_CONFIG_COMMANDS
+# -------------------
+# Send accumulated output to $CONFIG_STATUS.  Thanks to the lists of
+# variables for single and double quote escaping we saved from calls
+# to _LT_DECL, we can put quote escaped variables declarations
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'.  Finally, any additional code accumulated
+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
+m4_defun([_LT_CONFIG_COMMANDS],
+[AC_PROVIDE_IFELSE([LT_OUTPUT],
+	dnl If the libtool generation code has been placed in $CONFIG_LT,
+	dnl instead of duplicating it all over again into config.status,
+	dnl then we will have config.status run $CONFIG_LT later, so it
+	dnl needs to know what name is stored there:
+        [AC_CONFIG_COMMANDS([libtool],
+            [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])],
+    dnl If the libtool generation code is destined for config.status,
+    dnl expand the accumulated commands and init code now:
+    [AC_CONFIG_COMMANDS([libtool],
+        [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])])
+])#_LT_CONFIG_COMMANDS
+
+
+# Initialize.
+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT],
+[
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+sed_quote_subst='$sed_quote_subst'
+double_quote_subst='$double_quote_subst'
+delay_variable_subst='$delay_variable_subst'
+_LT_CONFIG_STATUS_DECLARATIONS
+LTCC='$LTCC'
+LTCFLAGS='$LTCFLAGS'
+compiler='$compiler_DEFAULT'
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
+# Quote evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_quote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+# Double-quote double-evaled strings.
+for var in lt_decl_all_varnames([[ \
+]], lt_decl_dquote_varnames); do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
+    *[[\\\\\\\`\\"\\\$]]*)
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
+      ;;
+    *)
+      eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
+      ;;
+    esac
+done
+
+_LT_OUTPUT_LIBTOOL_INIT
+])
+
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# '#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
+
+# LT_OUTPUT
+# ---------
+# This macro allows early generation of the libtool script (before
+# AC_OUTPUT is called), incase it is used in configure for compilation
+# tests.
+AC_DEFUN([LT_OUTPUT],
+[: ${CONFIG_LT=./config.lt}
+AC_MSG_NOTICE([creating $CONFIG_LT])
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+lt_cl_silent=false
+exec AS_MESSAGE_LOG_FD>>config.log
+{
+  echo
+  AS_BOX([Running $as_me.])
+} >&AS_MESSAGE_LOG_FD
+
+lt_cl_help="\
+'$as_me' creates a local libtool stub from the current configuration,
+for use in further configure time tests before the real libtool is
+generated.
+
+Usage: $[0] [[OPTIONS]]
+
+  -h, --help      print this help, then exit
+  -V, --version   print version number, then exit
+  -q, --quiet     do not print progress messages
+  -d, --debug     don't remove temporary files
+
+Report bugs to <bug-libtool at gnu.org>."
+
+lt_cl_version="\
+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl
+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
+configured by $[0], generated by m4_PACKAGE_STRING.
+
+Copyright (C) 2011 Free Software Foundation, Inc.
+This config.lt script is free software; the Free Software Foundation
+gives unlimited permision to copy, distribute and modify it."
+
+while test 0 != $[#]
+do
+  case $[1] in
+    --version | --v* | -V )
+      echo "$lt_cl_version"; exit 0 ;;
+    --help | --h* | -h )
+      echo "$lt_cl_help"; exit 0 ;;
+    --debug | --d* | -d )
+      debug=: ;;
+    --quiet | --q* | --silent | --s* | -q )
+      lt_cl_silent=: ;;
+
+    -*) AC_MSG_ERROR([unrecognized option: $[1]
+Try '$[0] --help' for more information.]) ;;
+
+    *) AC_MSG_ERROR([unrecognized argument: $[1]
+Try '$[0] --help' for more information.]) ;;
+  esac
+  shift
+done
+
+if $lt_cl_silent; then
+  exec AS_MESSAGE_FD>/dev/null
+fi
+_LTEOF
+
+cat >>"$CONFIG_LT" <<_LTEOF
+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT
+_LTEOF
+
+cat >>"$CONFIG_LT" <<\_LTEOF
+AC_MSG_NOTICE([creating $ofile])
+_LT_OUTPUT_LIBTOOL_COMMANDS
+AS_EXIT(0)
+_LTEOF
+chmod +x "$CONFIG_LT"
+
+# configure is writing to config.log, but config.lt does its own redirection,
+# appending to config.log, which fails on DOS, as config.log is still kept
+# open by configure.  Here we exec the FD to /dev/null, effectively closing
+# config.log, so it can be properly (re)opened and appended to by config.lt.
+lt_cl_success=:
+test yes = "$silent" &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
+])# LT_OUTPUT
+
+
+# _LT_CONFIG(TAG)
+# ---------------
+# If TAG is the built-in tag, create an initial libtool script with a
+# default configuration from the untagged config vars.  Otherwise add code
+# to config.status for appending the configuration named by TAG from the
+# matching tagged config vars.
+m4_defun([_LT_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_CONFIG_SAVE_COMMANDS([
+  m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
+  m4_if(_LT_TAG, [C], [
+    # See if we are running on zsh, and set the options that allow our
+    # commands through without removal of \ escapes.
+    if test -n "${ZSH_VERSION+set}"; then
+      setopt NO_GLOB_SUBST
+    fi
+
+    cfgfile=${ofile}T
+    trap "$RM \"$cfgfile\"; exit 1" 1 2 15
+    $RM "$cfgfile"
+
+    cat <<_LT_EOF >> "$cfgfile"
+#! $SHELL
+# Generated automatically by $as_me ($PACKAGE) $VERSION
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
+_LT_COPYING
+_LT_LIBTOOL_TAGS
+
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
+# ### BEGIN LIBTOOL CONFIG
+_LT_LIBTOOL_CONFIG_VARS
+_LT_LIBTOOL_TAG_VARS
+# ### END LIBTOOL CONFIG
+
+_LT_EOF
+
+    cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_EOF
+
+  case $host_os in
+  aix3*)
+    cat <<\_LT_EOF >> "$cfgfile"
+# AIX sometimes has problems with the GCC collect2 program.  For some
+# reason, if we set the COLLECT_NAMES environment variable, the problems
+# vanish in a puff of smoke.
+if test set != "${COLLECT_NAMES+set}"; then
+  COLLECT_NAMES=
+  export COLLECT_NAMES
+fi
+_LT_EOF
+    ;;
+  esac
+
+  _LT_PROG_LTMAIN
+
+  # We use sed instead of cat because bash on DJGPP gets confused if
+  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
+  # text mode, it properly converts lines to CR/LF.  This bash problem
+  # is reportedly fixed, but why not run on old versions too?
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
+
+   mv -f "$cfgfile" "$ofile" ||
+    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
+  chmod +x "$ofile"
+],
+[cat <<_LT_EOF >> "$ofile"
+
+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded
+dnl in a comment (ie after a #).
+# ### BEGIN LIBTOOL TAG CONFIG: $1
+_LT_LIBTOOL_TAG_VARS(_LT_TAG)
+# ### END LIBTOOL TAG CONFIG: $1
+_LT_EOF
+])dnl /m4_if
+],
+[m4_if([$1], [], [
+    PACKAGE='$PACKAGE'
+    VERSION='$VERSION'
+    RM='$RM'
+    ofile='$ofile'], [])
+])dnl /_LT_CONFIG_SAVE_COMMANDS
+])# _LT_CONFIG
+
+
+# LT_SUPPORTED_TAG(TAG)
+# ---------------------
+# Trace this macro to discover what tags are supported by the libtool
+# --tag option, using:
+#    autoconf --trace 'LT_SUPPORTED_TAG:$1'
+AC_DEFUN([LT_SUPPORTED_TAG], [])
+
+
+# C support is built-in for now
+m4_define([_LT_LANG_C_enabled], [])
+m4_define([_LT_TAGS], [])
+
+
+# LT_LANG(LANG)
+# -------------
+# Enable libtool support for the given language if not already enabled.
+AC_DEFUN([LT_LANG],
+[AC_BEFORE([$0], [LT_OUTPUT])dnl
+m4_case([$1],
+  [C],			[_LT_LANG(C)],
+  [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
+  [Java],		[_LT_LANG(GCJ)],
+  [Fortran 77],		[_LT_LANG(F77)],
+  [Fortran],		[_LT_LANG(FC)],
+  [Windows Resource],	[_LT_LANG(RC)],
+  [m4_ifdef([_LT_LANG_]$1[_CONFIG],
+    [_LT_LANG($1)],
+    [m4_fatal([$0: unsupported language: "$1"])])])dnl
+])# LT_LANG
+
+
+# _LT_LANG(LANGNAME)
+# ------------------
+m4_defun([_LT_LANG],
+[m4_ifdef([_LT_LANG_]$1[_enabled], [],
+  [LT_SUPPORTED_TAG([$1])dnl
+  m4_append([_LT_TAGS], [$1 ])dnl
+  m4_define([_LT_LANG_]$1[_enabled], [])dnl
+  _LT_LANG_$1_CONFIG($1)])dnl
+])# _LT_LANG
+
+
+m4_ifndef([AC_PROG_GO], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
+# _LT_LANG_DEFAULT_CONFIG
+# -----------------------
+m4_defun([_LT_LANG_DEFAULT_CONFIG],
+[AC_PROVIDE_IFELSE([AC_PROG_CXX],
+  [LT_LANG(CXX)],
+  [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_F77],
+  [LT_LANG(F77)],
+  [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])])
+
+AC_PROVIDE_IFELSE([AC_PROG_FC],
+  [LT_LANG(FC)],
+  [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])])
+
+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal
+dnl pulling things in needlessly.
+AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+  [LT_LANG(GCJ)],
+  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+    [LT_LANG(GCJ)],
+    [AC_PROVIDE_IFELSE([LT_PROG_GCJ],
+      [LT_LANG(GCJ)],
+      [m4_ifdef([AC_PROG_GCJ],
+	[m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([A][M_PROG_GCJ],
+	[m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])])
+       m4_ifdef([LT_PROG_GCJ],
+	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
+
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
+AC_PROVIDE_IFELSE([LT_PROG_RC],
+  [LT_LANG(RC)],
+  [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
+])# _LT_LANG_DEFAULT_CONFIG
+
+# Obsolete macros:
+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)])
+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
+dnl AC_DEFUN([AC_LIBTOOL_F77], [])
+dnl AC_DEFUN([AC_LIBTOOL_FC], [])
+dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
+
+
+# _LT_TAG_COMPILER
+# ----------------
+m4_defun([_LT_TAG_COMPILER],
+[AC_REQUIRE([AC_PROG_CC])dnl
+
+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl
+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl
+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl
+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl
+
+# If no C compiler was specified, use CC.
+LTCC=${LTCC-"$CC"}
+
+# If no C compiler flags were specified, use CFLAGS.
+LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
+
+# Allow CC to be a program name with arguments.
+compiler=$CC
+])# _LT_TAG_COMPILER
+
+
+# _LT_COMPILER_BOILERPLATE
+# ------------------------
+# Check for compiler boilerplate output or warnings with
+# the simple compiler test code.
+m4_defun([_LT_COMPILER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_compile_test_code" >conftest.$ac_ext
+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_compiler_boilerplate=`cat conftest.err`
+$RM conftest*
+])# _LT_COMPILER_BOILERPLATE
+
+
+# _LT_LINKER_BOILERPLATE
+# ----------------------
+# Check for linker boilerplate output or warnings with
+# the simple link test code.
+m4_defun([_LT_LINKER_BOILERPLATE],
+[m4_require([_LT_DECL_SED])dnl
+ac_outfile=conftest.$ac_objext
+echo "$lt_simple_link_test_code" >conftest.$ac_ext
+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
+_lt_linker_boilerplate=`cat conftest.err`
+$RM -r conftest*
+])# _LT_LINKER_BOILERPLATE
+
+# _LT_REQUIRED_DARWIN_CHECKS
+# -------------------------
+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
+  case $host_os in
+    rhapsody* | darwin*)
+    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
+    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
+    AC_CHECK_TOOL([LIPO], [lipo], [:])
+    AC_CHECK_TOOL([OTOOL], [otool], [:])
+    AC_CHECK_TOOL([OTOOL64], [otool64], [:])
+    _LT_DECL([], [DSYMUTIL], [1],
+      [Tool to manipulate archived DWARF debug symbol files on Mac OS X])
+    _LT_DECL([], [NMEDIT], [1],
+      [Tool to change global to local symbols on Mac OS X])
+    _LT_DECL([], [LIPO], [1],
+      [Tool to manipulate fat objects and archives on Mac OS X])
+    _LT_DECL([], [OTOOL], [1],
+      [ldd/readelf like tool for Mach-O binaries on Mac OS X])
+    _LT_DECL([], [OTOOL64], [1],
+      [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4])
+
+    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
+      [lt_cv_apple_cc_single_mod=no
+      if test -z "$LT_MULTI_MODULE"; then
+	# By default we will add the -single_module flag. You can override
+	# by either setting the environment variable LT_MULTI_MODULE
+	# non-empty at configure time, or by adding -multi_module to the
+	# link flags.
+	rm -rf libconftest.dylib*
+	echo "int foo(void){return 1;}" > conftest.c
+	echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD
+	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
+	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
+        _lt_result=$?
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
+	  lt_cv_apple_cc_single_mod=yes
+	else
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	fi
+	rm -rf libconftest.dylib*
+	rm -f conftest.*
+      fi])
+
+    AC_CACHE_CHECK([for -exported_symbols_list linker flag],
+      [lt_cv_ld_exported_symbols_list],
+      [lt_cv_ld_exported_symbols_list=no
+      save_LDFLAGS=$LDFLAGS
+      echo "_main" > conftest.sym
+      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
+      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+	[lt_cv_ld_exported_symbols_list=yes],
+	[lt_cv_ld_exported_symbols_list=no])
+	LDFLAGS=$save_LDFLAGS
+    ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
+    case $host_os in
+    rhapsody* | darwin1.[[012]])
+      _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
+    darwin1.*)
+      _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+    darwin*) # darwin 5.x on
+      # if running on 10.5 or later, the deployment target defaults
+      # to the OS version, if on x86, and 10.4, the deployment
+      # target defaults to 10.4. Don't you love it?
+      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
+	10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+	10.[[012]][[,.]]*)
+	  _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
+	10.*)
+	  _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+      esac
+    ;;
+  esac
+    if test yes = "$lt_cv_apple_cc_single_mod"; then
+      _lt_dar_single_mod='$single_module'
+    fi
+    if test yes = "$lt_cv_ld_exported_symbols_list"; then
+      _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
+    else
+      _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
+    fi
+    if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
+      _lt_dsymutil='~$DSYMUTIL $lib || :'
+    else
+      _lt_dsymutil=
+    fi
+    ;;
+  esac
+])
+
+
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
+# Checks for linker and compiler features on darwin
+m4_defun([_LT_DARWIN_LINKER_FEATURES],
+[
+  m4_require([_LT_REQUIRED_DARWIN_CHECKS])
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_automatic, $1)=yes
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  if test yes = "$lt_cv_ld_force_load"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
+  _LT_TAGVAR(link_all_deplibs, $1)=yes
+  _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
+  case $cc_basename in
+     ifort*|nagfor*) _lt_dar_can_shared=yes ;;
+     *) _lt_dar_can_shared=$GCC ;;
+  esac
+  if test yes = "$_lt_dar_can_shared"; then
+    output_verbose_link_cmd=func_echo_all
+    _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+    _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+    _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+    _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
+    m4_if([$1], [CXX],
+[   if test yes != "$lt_cv_apple_cc_single_mod"; then
+      _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+      _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
+    fi
+],[])
+  else
+  _LT_TAGVAR(ld_shlibs, $1)=no
+  fi
+])
+
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
+# Links a minimal program and checks the executable
+# for the system default hardcoded library path. In most cases,
+# this is /usr/lib:/lib, but when the MPI compilers are used
+# the location of the communication and MPI libs are included too.
+# If we don't find anything, use the default library path according
+# to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
+m4_defun([_LT_SYS_MODULE_PATH_AIX],
+[m4_require([_LT_DECL_SED])dnl
+if test set = "${lt_cv_aix_libpath+set}"; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
+])# _LT_SYS_MODULE_PATH_AIX
+
+
+# _LT_SHELL_INIT(ARG)
+# -------------------
+m4_define([_LT_SHELL_INIT],
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
+
+
+# _LT_PROG_ECHO_BACKSLASH
+# -----------------------
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
+m4_defun([_LT_PROG_ECHO_BACKSLASH],
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
+case $ECHO in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
+
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
+
+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
+])# _LT_PROG_ECHO_BACKSLASH
+
+
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+  [Search for dependent libraries within DIR (or the compiler's sysroot
+   if not specified).])],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case $with_sysroot in #(
+ yes)
+   if test yes = "$GCC"; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([$with_sysroot])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and where our libraries should be installed.])])
+
+# _LT_ENABLE_LOCK
+# ---------------
+m4_defun([_LT_ENABLE_LOCK],
+[AC_ARG_ENABLE([libtool-lock],
+  [AS_HELP_STRING([--disable-libtool-lock],
+    [avoid locking (might break parallel builds)])])
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
+
+# Some flags need to be propagated to the compiler or linker for good
+# libtool support.
+case $host in
+ia64-*-hpux*)
+  # Find out what ABI is being produced by ac_compile, and set mode
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.$ac_objext` in
+      *ELF-32*)
+	HPUX_IA64_MODE=32
+	;;
+      *ELF-64*)
+	HPUX_IA64_MODE=64
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+*-*-irix6*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    if test yes = "$lt_cv_prog_gnu_ld"; then
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -melf32bsmip"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -melf32bmipn32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -melf64bmip"
+	;;
+      esac
+    else
+      case `/usr/bin/file conftest.$ac_objext` in
+	*32-bit*)
+	  LD="${LD-ld} -32"
+	  ;;
+	*N32*)
+	  LD="${LD-ld} -n32"
+	  ;;
+	*64-bit*)
+	  LD="${LD-ld} -64"
+	  ;;
+      esac
+    fi
+  fi
+  rm -rf conftest*
+  ;;
+
+mips64*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    emul=elf
+    case `/usr/bin/file conftest.$ac_objext` in
+      *32-bit*)
+	emul="${emul}32"
+	;;
+      *64-bit*)
+	emul="${emul}64"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *MSB*)
+	emul="${emul}btsmip"
+	;;
+      *LSB*)
+	emul="${emul}ltsmip"
+	;;
+    esac
+    case `/usr/bin/file conftest.$ac_objext` in
+      *N32*)
+	emul="${emul}n32"
+	;;
+    esac
+    LD="${LD-ld} -m $emul"
+  fi
+  rm -rf conftest*
+  ;;
+
+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.  Note that the listed cases only cover the
+  # situations where additional linker options are needed (such as when
+  # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+  # vice versa); the common cases where no linker options are needed do
+  # not appear in the list.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+      *32-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_i386_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    case `/usr/bin/file conftest.o` in
+	      *x86-64*)
+		LD="${LD-ld} -m elf32_x86_64"
+		;;
+	      *)
+		LD="${LD-ld} -m elf_i386"
+		;;
+	    esac
+	    ;;
+	  powerpc64le-*linux*)
+	    LD="${LD-ld} -m elf32lppclinux"
+	    ;;
+	  powerpc64-*linux*)
+	    LD="${LD-ld} -m elf32ppclinux"
+	    ;;
+	  s390x-*linux*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
+	  sparc64-*linux*)
+	    LD="${LD-ld} -m elf32_sparc"
+	    ;;
+	esac
+	;;
+      *64-bit*)
+	case $host in
+	  x86_64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	    ;;
+	  x86_64-*linux*)
+	    LD="${LD-ld} -m elf_x86_64"
+	    ;;
+	  powerpcle-*linux*)
+	    LD="${LD-ld} -m elf64lppc"
+	    ;;
+	  powerpc-*linux*)
+	    LD="${LD-ld} -m elf64ppc"
+	    ;;
+	  s390*-*linux*|s390*-*tpf*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
+	  sparc*-*linux*)
+	    LD="${LD-ld} -m elf64_sparc"
+	    ;;
+	esac
+	;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+
+*-*-sco3.2v5*)
+  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+  SAVE_CFLAGS=$CFLAGS
+  CFLAGS="$CFLAGS -belf"
+  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
+    [AC_LANG_PUSH(C)
+     AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
+     AC_LANG_POP])
+  if test yes != "$lt_cv_cc_needs_belf"; then
+    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+    CFLAGS=$SAVE_CFLAGS
+  fi
+  ;;
+*-*solaris*)
+  # Find out what ABI is being produced by ac_compile, and set linker
+  # options accordingly.
+  echo 'int i;' > conftest.$ac_ext
+  if AC_TRY_EVAL(ac_compile); then
+    case `/usr/bin/file conftest.o` in
+    *64-bit*)
+      case $lt_cv_prog_gnu_ld in
+      yes*)
+        case $host in
+        i?86-*-solaris*|x86_64-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD=${LD-ld}_sol2
+        fi
+        ;;
+      *)
+	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
+	  LD="${LD-ld} -64"
+	fi
+	;;
+      esac
+      ;;
+    esac
+  fi
+  rm -rf conftest*
+  ;;
+esac
+
+need_locks=$enable_libtool_lock
+])# _LT_ENABLE_LOCK
+
+
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test 0 -eq "$ac_status"; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test 0 -ne "$ac_status"; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test no = "$lt_cv_ar_at_file"; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
+# _LT_CMD_OLD_ARCHIVE
+# -------------------
+m4_defun([_LT_CMD_OLD_ARCHIVE],
+[_LT_PROG_AR
+
+AC_CHECK_TOOL(STRIP, strip, :)
+test -z "$STRIP" && STRIP=:
+_LT_DECL([], [STRIP], [1], [A symbol stripping program])
+
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+test -z "$RANLIB" && RANLIB=:
+_LT_DECL([], [RANLIB], [1],
+    [Commands used to install an old-style archive])
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  bitrig* | openbsd*)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
+    ;;
+  *)
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
+fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+_LT_DECL([], [old_postinstall_cmds], [2])
+_LT_DECL([], [old_postuninstall_cmds], [2])
+_LT_TAGDECL([], [old_archive_cmds], [2],
+    [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
+])# _LT_CMD_OLD_ARCHIVE
+
+
+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------------------
+# Check whether the given compiler option works
+AC_DEFUN([_LT_COMPILER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+   lt_compiler_flag="$3"  ## exclude from sc_useless_quotes_in_assignment
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   # The option is referenced via a variable to avoid confusing sed.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>conftest.err)
+   ac_status=$?
+   cat conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s "$ac_outfile"; then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings other than the usual output.
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
+     $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+     if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+       $2=yes
+     fi
+   fi
+   $RM conftest*
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$5], , :, [$5])
+else
+    m4_if([$6], , :, [$6])
+fi
+])# _LT_COMPILER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
+
+
+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
+#                  [ACTION-SUCCESS], [ACTION-FAILURE])
+# ----------------------------------------------------
+# Check whether the given linker option works
+AC_DEFUN([_LT_LINKER_OPTION],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_SED])dnl
+AC_CACHE_CHECK([$1], [$2],
+  [$2=no
+   save_LDFLAGS=$LDFLAGS
+   LDFLAGS="$LDFLAGS $3"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&AS_MESSAGE_LOG_FD
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         $2=yes
+       fi
+     else
+       $2=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS=$save_LDFLAGS
+])
+
+if test yes = "[$]$2"; then
+    m4_if([$4], , :, [$4])
+else
+    m4_if([$5], , :, [$5])
+fi
+])# _LT_LINKER_OPTION
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], [])
+
+
+# LT_CMD_MAX_LEN
+#---------------
+AC_DEFUN([LT_CMD_MAX_LEN],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+# find the maximum length of command line arguments
+AC_MSG_CHECKING([the maximum length of command line arguments])
+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+  i=0
+  teststring=ABCD
+
+  case $build_os in
+  msdosdjgpp*)
+    # On DJGPP, this test can blow up pretty badly due to problems in libc
+    # (any single argument exceeding 2000 bytes causes a buffer overrun
+    # during glob expansion).  Even if it were fixed, the result of this
+    # check would be larger than it should be.
+    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
+    ;;
+
+  gnu*)
+    # Under GNU Hurd, this test is not required because there is
+    # no limit to the length of command line arguments.
+    # Libtool will interpret -1 as no limit whatsoever
+    lt_cv_sys_max_cmd_len=-1;
+    ;;
+
+  cygwin* | mingw* | cegcc*)
+    # On Win9x/ME, this test blows up -- it succeeds, but takes
+    # about 5 minutes as the teststring grows exponentially.
+    # Worse, since 9x/ME are not pre-emptively multitasking,
+    # you end up with a "frozen" computer, even though with patience
+    # the test eventually succeeds (with a max line length of 256k).
+    # Instead, let's just punt: use the minimum linelength reported by
+    # all of the supported platforms: 8192 (on NT/2K/XP).
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  amigaos*)
+    # On AmigaOS with pdksh, this test takes hours, literally.
+    # So we just punt and use a minimum line length of 8192.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
+  bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
+    # This has been around since 386BSD, at least.  Likely further.
+    if test -x /sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+    elif test -x /usr/sbin/sysctl; then
+      lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
+    else
+      lt_cv_sys_max_cmd_len=65536	# usable default for all BSDs
+    fi
+    # And add a safety zone
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    ;;
+
+  interix*)
+    # We know the value 262144 and hardcode it with a safety zone (like BSD)
+    lt_cv_sys_max_cmd_len=196608
+    ;;
+
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
+  osf*)
+    # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
+    # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
+    # nice to cause kernel panics so lets avoid the loop below.
+    # First set a reasonable default.
+    lt_cv_sys_max_cmd_len=16384
+    #
+    if test -x /sbin/sysconfig; then
+      case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
+        *1*) lt_cv_sys_max_cmd_len=-1 ;;
+      esac
+    fi
+    ;;
+  sco3.2v5*)
+    lt_cv_sys_max_cmd_len=102400
+    ;;
+  sysv5* | sco5v6* | sysv4.2uw2*)
+    kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
+    if test -n "$kargmax"; then
+      lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[	 ]]//'`
+    else
+      lt_cv_sys_max_cmd_len=32768
+    fi
+    ;;
+  *)
+    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
+    if test -n "$lt_cv_sys_max_cmd_len" && \
+       test undefined != "$lt_cv_sys_max_cmd_len"; then
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
+    else
+      # Make teststring a little bigger before we do anything with it.
+      # a 1K string should be a reasonable start.
+      for i in 1 2 3 4 5 6 7 8; do
+        teststring=$teststring$teststring
+      done
+      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
+      # If test is not a shell built-in, we'll probably end up computing a
+      # maximum length that is only half of the actual maximum length, but
+      # we can't tell.
+      while { test X`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
+	      test 17 != "$i" # 1/2 MB should be enough
+      do
+        i=`expr $i + 1`
+        teststring=$teststring$teststring
+      done
+      # Only check the string length outside the loop.
+      lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1`
+      teststring=
+      # Add a significant safety factor because C++ compilers can tack on
+      # massive amounts of additional arguments before passing them to the
+      # linker.  It appears as though 1/2 is a usable value.
+      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
+    fi
+    ;;
+  esac
+])
+if test -n "$lt_cv_sys_max_cmd_len"; then
+  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
+else
+  AC_MSG_RESULT(none)
+fi
+max_cmd_len=$lt_cv_sys_max_cmd_len
+_LT_DECL([], [max_cmd_len], [0],
+    [What is the maximum length of a command?])
+])# LT_CMD_MAX_LEN
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], [])
+
+
+# _LT_HEADER_DLFCN
+# ----------------
+m4_defun([_LT_HEADER_DLFCN],
+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl
+])# _LT_HEADER_DLFCN
+
+
+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+#                      ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+# ----------------------------------------------------------------
+m4_defun([_LT_TRY_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes = "$cross_compiling"; then :
+  [$4]
+else
+  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+  lt_status=$lt_dlunknown
+  cat > conftest.$ac_ext <<_LT_EOF
+[#line $LINENO "configure"
+#include "confdefs.h"
+
+#if HAVE_DLFCN_H
+#include <dlfcn.h>
+#endif
+
+#include <stdio.h>
+
+#ifdef RTLD_GLOBAL
+#  define LT_DLGLOBAL		RTLD_GLOBAL
+#else
+#  ifdef DL_GLOBAL
+#    define LT_DLGLOBAL		DL_GLOBAL
+#  else
+#    define LT_DLGLOBAL		0
+#  endif
+#endif
+
+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
+   find out it does not work in some platform. */
+#ifndef LT_DLLAZY_OR_NOW
+#  ifdef RTLD_LAZY
+#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
+#  else
+#    ifdef DL_LAZY
+#      define LT_DLLAZY_OR_NOW		DL_LAZY
+#    else
+#      ifdef RTLD_NOW
+#        define LT_DLLAZY_OR_NOW	RTLD_NOW
+#      else
+#        ifdef DL_NOW
+#          define LT_DLLAZY_OR_NOW	DL_NOW
+#        else
+#          define LT_DLLAZY_OR_NOW	0
+#        endif
+#      endif
+#    endif
+#  endif
+#endif
+
+/* When -fvisibility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
+int main ()
+{
+  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
+  int status = $lt_dlunknown;
+
+  if (self)
+    {
+      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
+      /* dlclose (self); */
+    }
+  else
+    puts (dlerror ());
+
+  return status;
+}]
+_LT_EOF
+  if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
+    (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+    lt_status=$?
+    case x$lt_status in
+      x$lt_dlno_uscore) $1 ;;
+      x$lt_dlneed_uscore) $2 ;;
+      x$lt_dlunknown|x*) $3 ;;
+    esac
+  else :
+    # compilation failed
+    $3
+  fi
+fi
+rm -fr conftest*
+])# _LT_TRY_DLOPEN_SELF
+
+
+# LT_SYS_DLOPEN_SELF
+# ------------------
+AC_DEFUN([LT_SYS_DLOPEN_SELF],
+[m4_require([_LT_HEADER_DLFCN])dnl
+if test yes != "$enable_dlopen"; then
+  enable_dlopen=unknown
+  enable_dlopen_self=unknown
+  enable_dlopen_self_static=unknown
+else
+  lt_cv_dlopen=no
+  lt_cv_dlopen_libs=
+
+  case $host_os in
+  beos*)
+    lt_cv_dlopen=load_add_on
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ;;
+
+  mingw* | pw32* | cegcc*)
+    lt_cv_dlopen=LoadLibrary
+    lt_cv_dlopen_libs=
+    ;;
+
+  cygwin*)
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    ;;
+
+  darwin*)
+    # if libdl is installed we need to link against it
+    AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+    lt_cv_dlopen=dyld
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=yes
+    ])
+    ;;
+
+  tpf*)
+    # Don't try to run any link tests for TPF.  We know it's impossible
+    # because TPF is a cross-compiler, and we know how we open DSOs.
+    lt_cv_dlopen=dlopen
+    lt_cv_dlopen_libs=
+    lt_cv_dlopen_self=no
+    ;;
+
+  *)
+    AC_CHECK_FUNC([shl_load],
+	  [lt_cv_dlopen=shl_load],
+      [AC_CHECK_LIB([dld], [shl_load],
+	    [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
+	[AC_CHECK_FUNC([dlopen],
+	      [lt_cv_dlopen=dlopen],
+	  [AC_CHECK_LIB([dl], [dlopen],
+		[lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
+	    [AC_CHECK_LIB([svld], [dlopen],
+		  [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
+	      [AC_CHECK_LIB([dld], [dld_link],
+		    [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
+	      ])
+	    ])
+	  ])
+	])
+      ])
+    ;;
+  esac
+
+  if test no = "$lt_cv_dlopen"; then
+    enable_dlopen=no
+  else
+    enable_dlopen=yes
+  fi
+
+  case $lt_cv_dlopen in
+  dlopen)
+    save_CPPFLAGS=$CPPFLAGS
+    test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+    save_LDFLAGS=$LDFLAGS
+    wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+    save_LIBS=$LIBS
+    LIBS="$lt_cv_dlopen_libs $LIBS"
+
+    AC_CACHE_CHECK([whether a program can dlopen itself],
+	  lt_cv_dlopen_self, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
+	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
+    ])
+
+    if test yes = "$lt_cv_dlopen_self"; then
+      wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+	  lt_cv_dlopen_self_static, [dnl
+	  _LT_TRY_DLOPEN_SELF(
+	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
+	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
+      ])
+    fi
+
+    CPPFLAGS=$save_CPPFLAGS
+    LDFLAGS=$save_LDFLAGS
+    LIBS=$save_LIBS
+    ;;
+  esac
+
+  case $lt_cv_dlopen_self in
+  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
+  *) enable_dlopen_self=unknown ;;
+  esac
+
+  case $lt_cv_dlopen_self_static in
+  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
+  *) enable_dlopen_self_static=unknown ;;
+  esac
+fi
+_LT_DECL([dlopen_support], [enable_dlopen], [0],
+	 [Whether dlopen is supported])
+_LT_DECL([dlopen_self], [enable_dlopen_self], [0],
+	 [Whether dlopen of programs is supported])
+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0],
+	 [Whether dlopen of statically linked programs is supported])
+])# LT_SYS_DLOPEN_SELF
+
+# Old name:
+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [])
+
+
+# _LT_COMPILER_C_O([TAGNAME])
+# ---------------------------
+# Check to see if options -c and -o are simultaneously supported by compiler.
+# This macro does not hard code the compiler like AC_PROG_CC_C_O.
+m4_defun([_LT_COMPILER_C_O],
+[m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+   $RM -r conftest 2>/dev/null
+   mkdir conftest
+   cd conftest
+   mkdir out
+   echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+   lt_compiler_flag="-o out/conftest2.$ac_objext"
+   # Insert the option either (1) after the last *FLAGS variable, or
+   # (2) before a word containing "conftest.", or (3) at the end.
+   # Note that $ac_compile itself does not contain backslashes and begins
+   # with a dollar sign (not a hyphen), so the echo should work correctly.
+   lt_compile=`echo "$ac_compile" | $SED \
+   -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
+   -e 's:$: $lt_compiler_flag:'`
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval "$lt_compile" 2>out/conftest.err)
+   ac_status=$?
+   cat out/conftest.err >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   if (exit $ac_status) && test -s out/conftest2.$ac_objext
+   then
+     # The compiler can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
+     $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
+     if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+       _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+     fi
+   fi
+   chmod u+w . 2>&AS_MESSAGE_LOG_FD
+   $RM conftest*
+   # SGI C++ compiler will create directory out/ii_files/ for
+   # template instantiation
+   test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files
+   $RM out/* && rmdir out
+   cd ..
+   $RM -r conftest
+   $RM conftest*
+])
+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1],
+	[Does compiler simultaneously support -c and -o options?])
+])# _LT_COMPILER_C_O
+
+
+# _LT_COMPILER_FILE_LOCKS([TAGNAME])
+# ----------------------------------
+# Check to see if we can do hard links to lock some files if needed
+m4_defun([_LT_COMPILER_FILE_LOCKS],
+[m4_require([_LT_ENABLE_LOCK])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+_LT_COMPILER_C_O([$1])
+
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
+  # do not overwrite the value of need_locks provided by the user
+  AC_MSG_CHECKING([if we can lock with hard links])
+  hard_links=yes
+  $RM conftest*
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  touch conftest.a
+  ln conftest.a conftest.b 2>&5 || hard_links=no
+  ln conftest.a conftest.b 2>/dev/null && hard_links=no
+  AC_MSG_RESULT([$hard_links])
+  if test no = "$hard_links"; then
+    AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
+    need_locks=warn
+  fi
+else
+  need_locks=no
+fi
+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?])
+])# _LT_COMPILER_FILE_LOCKS
+
+
+# _LT_CHECK_OBJDIR
+# ----------------
+m4_defun([_LT_CHECK_OBJDIR],
+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
+[rm -f .libs 2>/dev/null
+mkdir .libs 2>/dev/null
+if test -d .libs; then
+  lt_cv_objdir=.libs
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  lt_cv_objdir=_libs
+fi
+rmdir .libs 2>/dev/null])
+objdir=$lt_cv_objdir
+_LT_DECL([], [objdir], [0],
+         [The name of the directory that contains temporary libtool files])dnl
+m4_pattern_allow([LT_OBJDIR])dnl
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+  [Define to the sub-directory where libtool stores uninstalled libraries.])
+])# _LT_CHECK_OBJDIR
+
+
+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME])
+# --------------------------------------
+# Check hardcoding attributes.
+m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
+[AC_MSG_CHECKING([how to hardcode library paths into programs])
+_LT_TAGVAR(hardcode_action, $1)=
+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
+   test -n "$_LT_TAGVAR(runpath_var, $1)" ||
+   test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
+
+  # We can hardcode non-existent directories.
+  if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
+     # If the only mechanism to avoid hardcoding is shlibpath_var, we
+     # have to relink, otherwise we might link with an installed library
+     # when we should be linking with a yet-to-be-installed one
+     ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+     test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
+    # Linking always hardcodes the temporary library directory.
+    _LT_TAGVAR(hardcode_action, $1)=relink
+  else
+    # We can link without hardcoding, and we can hardcode nonexisting dirs.
+    _LT_TAGVAR(hardcode_action, $1)=immediate
+  fi
+else
+  # We cannot hardcode anything, or else we can only hardcode existing
+  # directories.
+  _LT_TAGVAR(hardcode_action, $1)=unsupported
+fi
+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
+
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+   test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
+  # Fast installation is not supported
+  enable_fast_install=no
+elif test yes = "$shlibpath_overrides_runpath" ||
+     test no = "$enable_shared"; then
+  # Fast installation is not necessary
+  enable_fast_install=needless
+fi
+_LT_TAGDECL([], [hardcode_action], [0],
+    [How to hardcode a shared library path into an executable])
+])# _LT_LINKER_HARDCODE_LIBPATH
+
+
+# _LT_CMD_STRIPLIB
+# ----------------
+m4_defun([_LT_CMD_STRIPLIB],
+[m4_require([_LT_DECL_EGREP])
+striplib=
+old_striplib=
+AC_MSG_CHECKING([whether stripping libraries is possible])
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
+  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
+  AC_MSG_RESULT([yes])
+else
+# FIXME - insert some real tests, host_os isn't really good enough
+  case $host_os in
+  darwin*)
+    if test -n "$STRIP"; then
+      striplib="$STRIP -x"
+      old_striplib="$STRIP -S"
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+    ;;
+  *)
+    AC_MSG_RESULT([no])
+    ;;
+  esac
+fi
+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
+_LT_DECL([], [striplib], [1])
+])# _LT_CMD_STRIPLIB
+
+
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+#       string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+#       string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+#       "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+#       VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+    case x at S|@2 in
+    x)
+        ;;
+    *:)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+        ;;
+    x:*)
+        eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    *::*)
+        eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+        eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+        ;;
+    *)
+        eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+        ;;
+    esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
+# _LT_SYS_DYNAMIC_LINKER([TAG])
+# -----------------------------
+# PORTME Fill in your ld.so characteristics
+m4_defun([_LT_SYS_DYNAMIC_LINKER],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_OBJDUMP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
+AC_MSG_CHECKING([dynamic linker characteristics])
+m4_if([$1],
+	[], [
+if test yes = "$GCC"; then
+  case $host_os in
+    darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+    *) lt_awk_arg='/^libraries:/' ;;
+  esac
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+    *) lt_sed_strip_eq='s|=/|/|g' ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
+    # if the path contains ";" then we assume it to be the separator
+    # otherwise default to the standard path separator (i.e. ":") - it is
+    # assumed that no part of a normal pathname contains ";" but that should
+    # okay in the real world where ";" in dirpaths is itself problematic.
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
+  # Ok, now we have the path, separated by spaces, we can step through it
+  # and add multilib dir if necessary...
+  lt_tmp_lt_search_path_spec=
+  lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+  # ...but if some path component already ends with the multilib dir we assume
+  # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+  case "$lt_multi_os_dir; $lt_search_path_spec " in
+  "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+    lt_multi_os_dir=
+    ;;
+  esac
+  for lt_sys_path in $lt_search_path_spec; do
+    if test -d "$lt_sys_path$lt_multi_os_dir"; then
+      lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+    elif test -n "$lt_multi_os_dir"; then
+      test -d "$lt_sys_path" && \
+	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
+    fi
+  done
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
+BEGIN {RS = " "; FS = "/|\n";} {
+  lt_foo = "";
+  lt_count = 0;
+  for (lt_i = NF; lt_i > 0; lt_i--) {
+    if ($lt_i != "" && $lt_i != ".") {
+      if ($lt_i == "..") {
+        lt_count++;
+      } else {
+        if (lt_count == 0) {
+          lt_foo = "/" $lt_i lt_foo;
+        } else {
+          lt_count--;
+        }
+      }
+    }
+  }
+  if (lt_foo != "") { lt_freq[[lt_foo]]++; }
+  if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
+}'`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
+else
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+fi])
+library_names_spec=
+libname_spec='lib$name'
+soname_spec=
+shrext_cmds=.so
+postinstall_cmds=
+postuninstall_cmds=
+finish_cmds=
+finish_eval=
+shlibpath_var=
+shlibpath_overrides_runpath=unknown
+version_type=none
+dynamic_linker="$host_os ld.so"
+sys_lib_dlsearch_path_spec="/lib /usr/lib"
+need_lib_prefix=unknown
+hardcode_into_libs=no
+
+# when you set need_version to no, make sure it does not cause -set_version
+# flags to be left without arguments
+need_version=unknown
+
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
+case $host_os in
+aix3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
+  shlibpath_var=LIBPATH
+
+  # AIX 3 has no versioning support, so we append a major version to the name.
+  soname_spec='$libname$release$shared_ext$major'
+  ;;
+
+aix[[4-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  hardcode_into_libs=yes
+  if test ia64 = "$host_cpu"; then
+    # AIX 5 supports IA64
+    library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
+    shlibpath_var=LD_LIBRARY_PATH
+  else
+    # With GCC up to 2.95.x, collect2 would create an import file
+    # for dependence libraries.  The import file would start with
+    # the line '#! .'.  This would cause the generated library to
+    # depend on '.', always an invalid library.  This was fixed in
+    # development snapshots of GCC prior to 3.0.
+    case $host_os in
+      aix4 | aix4.[[01]] | aix4.[[01]].*)
+      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
+	   echo ' yes '
+	   echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
+	:
+      else
+	can_build_shared=no
+      fi
+      ;;
+    esac
+    # Using Import Files as archive members, it is possible to support
+    # filename-based versioning of shared library archives on AIX. While
+    # this would work for both with and without runtime linking, it will
+    # prevent static linking of such archives. So we do filename-based
+    # shared library versioning with .so extension only, which is used
+    # when both runtime linking and shared linking is enabled.
+    # Unfortunately, runtime linking may impact performance, so we do
+    # not want this to be the default eventually. Also, we use the
+    # versioned .so libs for executables only if there is the -brtl
+    # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+    # To allow for filename-based versioning support, we need to create
+    # libNAME.so.V as an archive file, containing:
+    # *) an Import File, referring to the versioned filename of the
+    #    archive as well as the shared archive member, telling the
+    #    bitwidth (32 or 64) of that shared object, and providing the
+    #    list of exported symbols of that shared object, eventually
+    #    decorated with the 'weak' keyword
+    # *) the shared object with the F_LOADONLY flag set, to really avoid
+    #    it being seen by the linker.
+    # At run time we better use the real file rather than another symlink,
+    # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+    case $with_aix_soname,$aix_use_runtimelinking in
+    # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
+    # soname into executable. Probably we can add versioning support to
+    # collect2, so additional links can be useful in future.
+    aix,yes) # traditional libtool
+      dynamic_linker='AIX unversionable lib.so'
+      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
+      # instead of lib<name>.a to let people know that these are not
+      # typical AIX shared libraries.
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      ;;
+    aix,no) # traditional AIX only
+      dynamic_linker='AIX lib.a[(]lib.so.V[)]'
+      # We preserve .a as extension for shared libraries through AIX4.2
+      # and later when we are not doing run time linking.
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      ;;
+    svr4,*) # full svr4 only
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,yes) # both, prefer svr4
+      dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+      library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+      # unpreferred sharedlib libNAME.a needs extra handling
+      postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+      postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+      # We do not specify a path in Import Files, so LIBPATH fires.
+      shlibpath_overrides_runpath=yes
+      ;;
+    *,no) # both, prefer aix
+      dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+      library_names_spec='$libname$release.a $libname.a'
+      soname_spec='$libname$release$shared_ext$major'
+      # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+      postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+      postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+      ;;
+    esac
+    shlibpath_var=LIBPATH
+  fi
+  ;;
+
+amigaos*)
+  case $host_cpu in
+  powerpc)
+    # Since July 2007 AmigaOS4 officially supports .so libraries.
+    # When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    ;;
+  m68k)
+    library_names_spec='$libname.ixlibrary $libname.a'
+    # Create ${libname}_ixlibrary.a entries in /sys/libs.
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    ;;
+  esac
+  ;;
+
+beos*)
+  library_names_spec='$libname$shared_ext'
+  dynamic_linker="$host_os ld.so"
+  shlibpath_var=LIBRARY_PATH
+  ;;
+
+bsdi[[45]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
+  # the default ld.so.conf also contains /usr/contrib/lib and
+  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
+  # libtool to hard-code these into programs
+  ;;
+
+cygwin* | mingw* | pw32* | cegcc*)
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
+    library_names_spec='$libname.dll.a'
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname~
+      chmod a+x \$dldir/$dlname~
+      if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+        eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+      fi'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+
+    case $host_os in
+    cygwin*)
+      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
+      soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
+      ;;
+    mingw* | cegcc*)
+      # MinGW DLLs use traditional 'lib' prefix
+      soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    pw32*)
+      # pw32 DLLs use 'pw' prefix rather than 'lib'
+      library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+      ;;
+    esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+    library_names_spec='$libname.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec=$LIB
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \$file`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
+    ;;
+
+  *)
+    # Assume MSVC wrapper
+    library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
+    dynamic_linker='Win32 ld.exe'
+    ;;
+  esac
+  # FIXME: first we should search . and the directory the executable is in
+  shlibpath_var=PATH
+  ;;
+
+darwin* | rhapsody*)
+  dynamic_linker="$host_os dyld"
+  version_type=darwin
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$major$shared_ext'
+  shlibpath_overrides_runpath=yes
+  shlibpath_var=DYLD_LIBRARY_PATH
+  shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
+m4_if([$1], [],[
+  sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+  ;;
+
+dgux*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+freebsd* | dragonfly*)
+  # DragonFly does not have aout.  When/if they implement a new
+  # versioning mechanism, adjust this.
+  if test -x /usr/bin/objformat; then
+    objformat=`/usr/bin/objformat`
+  else
+    case $host_os in
+    freebsd[[23]].*) objformat=aout ;;
+    *) objformat=elf ;;
+    esac
+  fi
+  version_type=freebsd-$objformat
+  case $version_type in
+    freebsd-elf*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      soname_spec='$libname$release$shared_ext$major'
+      need_version=no
+      need_lib_prefix=no
+      ;;
+    freebsd-*)
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+      need_version=yes
+      ;;
+  esac
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_os in
+  freebsd2.*)
+    shlibpath_overrides_runpath=yes
+    ;;
+  freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
+  freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+    shlibpath_overrides_runpath=no
+    hardcode_into_libs=yes
+    ;;
+  *) # from 4.6 on, and DragonFly
+    shlibpath_overrides_runpath=yes
+    hardcode_into_libs=yes
+    ;;
+  esac
+  ;;
+
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  dynamic_linker="$host_os runtime_loader"
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
+  hardcode_into_libs=yes
+  ;;
+
+hpux9* | hpux10* | hpux11*)
+  # Give a soname corresponding to the major version so that dld.sl refuses to
+  # link against other versions.
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  case $host_cpu in
+  ia64*)
+    shrext_cmds='.so'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.so"
+    shlibpath_var=LD_LIBRARY_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    if test 32 = "$HPUX_IA64_MODE"; then
+      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
+    else
+      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
+    fi
+    ;;
+  hppa*64*)
+    shrext_cmds='.sl'
+    hardcode_into_libs=yes
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
+    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+    ;;
+  *)
+    shrext_cmds='.sl'
+    dynamic_linker="$host_os dld.sl"
+    shlibpath_var=SHLIB_PATH
+    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    ;;
+  esac
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
+  postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
+  ;;
+
+interix[[3-9]]*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $host_os in
+    nonstopux*) version_type=nonstopux ;;
+    *)
+	if test yes = "$lt_cv_prog_gnu_ld"; then
+		version_type=linux # correct to gnu/linux during the next big refactor
+	else
+		version_type=irix
+	fi ;;
+  esac
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
+  case $host_os in
+  irix5* | nonstopux*)
+    libsuff= shlibsuff=
+    ;;
+  *)
+    case $LD in # libtool.m4 will add one of these switches to LD
+    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
+      libsuff= shlibsuff= libmagic=32-bit;;
+    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
+      libsuff=32 shlibsuff=N32 libmagic=N32;;
+    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
+      libsuff=64 shlibsuff=64 libmagic=64-bit;;
+    *) libsuff= shlibsuff= libmagic=never-match;;
+    esac
+    ;;
+  esac
+  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
+  shlibpath_overrides_runpath=no
+  sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+  sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
+  hardcode_into_libs=yes
+  ;;
+
+# No shared lib support for Linux oldld, aout, or coff.
+linux*oldld* | linux*aout* | linux*coff*)
+  dynamic_linker=no
+  ;;
+
+linux*android*)
+  version_type=none # Android doesn't support versioned libraries.
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext'
+  soname_spec='$libname$release$shared_ext'
+  finish_cmds=
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  dynamic_linker='Android linker'
+  # Don't embed -rpath directories since the linker doesn't support them.
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+
+  # Some binutils ld are patched to set DT_RUNPATH
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
+
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+
+  # Ideally, we could use ldconfig to report *all* directores which are
+  # searched for libraries, however this is still not possible.  Aside from not
+  # being certain /sbin/ldconfig is available, command
+  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+  # even though it is searched at run-time.  Try to do the best guess by
+  # appending ld.so.conf contents (and includes) to the search path.
+  if test -f /etc/ld.so.conf; then
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+  fi
+
+  # We used to test for /lib/ld.so.1 and disable shared libraries on
+  # powerpc, because MkLinux only supported shared libraries with the
+  # GNU dynamic linker.  Since this was broken with cross compilers,
+  # most powerpc-linux boxes support dynamic linking these days and
+  # people can always --disable-shared, the test was removed, and we
+  # assume the GNU/Linux dynamic linker is in use.
+  dynamic_linker='GNU/Linux ld.so'
+  ;;
+
+netbsdelf*-gnu)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+  soname_spec='${libname}${release}${shared_ext}$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='NetBSD ld.elf_so'
+  ;;
+
+netbsd*)
+  version_type=sunos
+  need_lib_prefix=no
+  need_version=no
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+    dynamic_linker='NetBSD (a.out) ld.so'
+  else
+    library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+    soname_spec='$libname$release$shared_ext$major'
+    dynamic_linker='NetBSD ld.elf_so'
+  fi
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  ;;
+
+newsos6)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+*nto* | *qnx*)
+  version_type=qnx
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  dynamic_linker='ldqnx.so'
+  ;;
+
+openbsd* | bitrig*)
+  version_type=sunos
+  sys_lib_dlsearch_path_spec=/usr/lib
+  need_lib_prefix=no
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    need_version=no
+  else
+    need_version=yes
+  fi
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  ;;
+
+os2*)
+  libname_spec='$name'
+  version_type=windows
+  shrext_cmds=.dll
+  need_version=no
+  need_lib_prefix=no
+  # OS/2 can only load a DLL with a base name of 8 characters or less.
+  soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+    v=$($ECHO $release$versuffix | tr -d .-);
+    n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+    $ECHO $n$v`$shared_ext'
+  library_names_spec='${libname}_dll.$libext'
+  dynamic_linker='OS/2 ld.exe'
+  shlibpath_var=BEGINLIBPATH
+  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  postinstall_cmds='base_file=`basename \$file`~
+    dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+    dldir=$destdir/`dirname \$dlpath`~
+    test -d \$dldir || mkdir -p \$dldir~
+    $install_prog $dir/$dlname \$dldir/$dlname~
+    chmod a+x \$dldir/$dlname~
+    if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+      eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+    fi'
+  postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+    dlpath=$dir/\$dldll~
+    $RM \$dlpath'
+  ;;
+
+osf3* | osf4* | osf5*)
+  version_type=osf
+  need_lib_prefix=no
+  need_version=no
+  soname_spec='$libname$release$shared_ext$major'
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
+  sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+  ;;
+
+rdos*)
+  dynamic_linker=no
+  ;;
+
+solaris*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  # ldd complains unless libraries are executable
+  postinstall_cmds='chmod +x $lib'
+  ;;
+
+sunos4*)
+  version_type=sunos
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  if test yes = "$with_gnu_ld"; then
+    need_lib_prefix=no
+  fi
+  need_version=yes
+  ;;
+
+sysv4 | sysv4.3*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  case $host_vendor in
+    sni)
+      shlibpath_overrides_runpath=no
+      need_lib_prefix=no
+      runpath_var=LD_RUN_PATH
+      ;;
+    siemens)
+      need_lib_prefix=no
+      ;;
+    motorola)
+      need_lib_prefix=no
+      need_version=no
+      shlibpath_overrides_runpath=no
+      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
+      ;;
+  esac
+  ;;
+
+sysv4*MP*)
+  if test -d /usr/nec; then
+    version_type=linux # correct to gnu/linux during the next big refactor
+    library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+    soname_spec='$libname$shared_ext.$major'
+    shlibpath_var=LD_LIBRARY_PATH
+  fi
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  version_type=sco
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  hardcode_into_libs=yes
+  if test yes = "$with_gnu_ld"; then
+    sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
+  else
+    sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
+    case $host_os in
+      sco3.2v5*)
+        sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
+	;;
+    esac
+  fi
+  sys_lib_dlsearch_path_spec='/usr/lib'
+  ;;
+
+tpf*)
+  # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
+  version_type=linux # correct to gnu/linux during the next big refactor
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  hardcode_into_libs=yes
+  ;;
+
+uts4*)
+  version_type=linux # correct to gnu/linux during the next big refactor
+  library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+  soname_spec='$libname$release$shared_ext$major'
+  shlibpath_var=LD_LIBRARY_PATH
+  ;;
+
+*)
+  dynamic_linker=no
+  ;;
+esac
+AC_MSG_RESULT([$dynamic_linker])
+test no = "$dynamic_linker" && can_build_shared=no
+
+variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+if test yes = "$GCC"; then
+  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+fi
+
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
+fi
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
+fi
+
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
+_LT_DECL([], [variables_saved_for_relink], [1],
+    [Variables whose values should be saved in libtool wrapper scripts and
+    restored at link time])
+_LT_DECL([], [need_lib_prefix], [0],
+    [Do we need the "lib" prefix for modules?])
+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?])
+_LT_DECL([], [version_type], [0], [Library versioning type])
+_LT_DECL([], [runpath_var], [0],  [Shared library runtime path variable])
+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable])
+_LT_DECL([], [shlibpath_overrides_runpath], [0],
+    [Is shlibpath searched before the hard-coded library search path?])
+_LT_DECL([], [libname_spec], [1], [Format of library name prefix])
+_LT_DECL([], [library_names_spec], [1],
+    [[List of archive names.  First name is the real one, the rest are links.
+    The last name is the one that the linker finds with -lNAME]])
+_LT_DECL([], [soname_spec], [1],
+    [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
+_LT_DECL([], [postinstall_cmds], [2],
+    [Command to use after installation of a shared archive])
+_LT_DECL([], [postuninstall_cmds], [2],
+    [Command to use after uninstallation of a shared archive])
+_LT_DECL([], [finish_cmds], [2],
+    [Commands used to finish a libtool library installation in a directory])
+_LT_DECL([], [finish_eval], [1],
+    [[As "finish_cmds", except a single script fragment to be evaled but
+    not shown]])
+_LT_DECL([], [hardcode_into_libs], [0],
+    [Whether we should hardcode library paths into libraries])
+_LT_DECL([], [sys_lib_search_path_spec], [2],
+    [Compile-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+    [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+    [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
+])# _LT_SYS_DYNAMIC_LINKER
+
+
+# _LT_PATH_TOOL_PREFIX(TOOL)
+# --------------------------
+# find a file program that can recognize shared library
+AC_DEFUN([_LT_PATH_TOOL_PREFIX],
+[m4_require([_LT_DECL_EGREP])dnl
+AC_MSG_CHECKING([for $1])
+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
+[case $MAGIC_CMD in
+[[\\/*] |  ?:[\\/]*])
+  lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
+  ;;
+*)
+  lt_save_MAGIC_CMD=$MAGIC_CMD
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+dnl $ac_dummy forces splitting on constant user-supplied paths.
+dnl POSIX.2 word splitting is done only on the output of word expansions,
+dnl not every word.  This closes a longstanding sh security hole.
+  ac_dummy="m4_if([$2], , $PATH, [$2])"
+  for ac_dir in $ac_dummy; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$1"; then
+      lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
+      if test -n "$file_magic_test_file"; then
+	case $deplibs_check_method in
+	"file_magic "*)
+	  file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+	  MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+	    $EGREP "$file_magic_regex" > /dev/null; then
+	    :
+	  else
+	    cat <<_LT_EOF 1>&2
+
+*** Warning: the command libtool uses to detect shared libraries,
+*** $file_magic_cmd, produces output that libtool cannot recognize.
+*** The result is that libtool may fail to recognize shared libraries
+*** as such.  This will affect the creation of libtool libraries that
+*** depend on shared libraries, but programs linked with such libtool
+*** libraries will work regardless of this problem.  Nevertheless, you
+*** may want to report the problem to your system manager and/or to
+*** bug-libtool at gnu.org
+
+_LT_EOF
+	  fi ;;
+	esac
+      fi
+      break
+    fi
+  done
+  IFS=$lt_save_ifs
+  MAGIC_CMD=$lt_save_MAGIC_CMD
+  ;;
+esac])
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
+if test -n "$MAGIC_CMD"; then
+  AC_MSG_RESULT($MAGIC_CMD)
+else
+  AC_MSG_RESULT(no)
+fi
+_LT_DECL([], [MAGIC_CMD], [0],
+	 [Used to examine libraries when file_magic_cmd begins with "file"])dnl
+])# _LT_PATH_TOOL_PREFIX
+
+# Old name:
+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
+
+
+# _LT_PATH_MAGIC
+# --------------
+# find a file program that can recognize a shared library
+m4_defun([_LT_PATH_MAGIC],
+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+if test -z "$lt_cv_path_MAGIC_CMD"; then
+  if test -n "$ac_tool_prefix"; then
+    _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
+  else
+    MAGIC_CMD=:
+  fi
+fi
+])# _LT_PATH_MAGIC
+
+
+# LT_PATH_LD
+# ----------
+# find the pathname to the GNU or non-GNU linker
+AC_DEFUN([LT_PATH_LD],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
+
+AC_ARG_WITH([gnu-ld],
+    [AS_HELP_STRING([--with-gnu-ld],
+	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
+    [test no = "$withval" || with_gnu_ld=yes],
+    [with_gnu_ld=no])dnl
+
+ac_prog=ld
+if test yes = "$GCC"; then
+  # Check if gcc -print-prog-name=ld gives a path.
+  AC_MSG_CHECKING([for ld used by $CC])
+  case $host in
+  *-*-mingw*)
+    # gcc leaves a trailing carriage return, which upsets mingw
+    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+  *)
+    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
+  esac
+  case $ac_prog in
+    # Accept absolute paths.
+    [[\\/]]* | ?:[[\\/]]*)
+      re_direlt='/[[^/]][[^/]]*/\.\./'
+      # Canonicalize the pathname of ld
+      ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'`
+      while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
+	ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
+      done
+      test -z "$LD" && LD=$ac_prog
+      ;;
+  "")
+    # If it fails, then pretend we aren't using GCC.
+    ac_prog=ld
+    ;;
+  *)
+    # If it is relative, then search for the first ld in PATH.
+    with_gnu_ld=unknown
+    ;;
+  esac
+elif test yes = "$with_gnu_ld"; then
+  AC_MSG_CHECKING([for GNU ld])
+else
+  AC_MSG_CHECKING([for non-GNU ld])
+fi
+AC_CACHE_VAL(lt_cv_path_LD,
+[if test -z "$LD"; then
+  lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+  for ac_dir in $PATH; do
+    IFS=$lt_save_ifs
+    test -z "$ac_dir" && ac_dir=.
+    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+      lt_cv_path_LD=$ac_dir/$ac_prog
+      # Check to see if the program is GNU ld.  I'd rather use --version,
+      # but apparently some variants of GNU ld only accept -v.
+      # Break only if it was the GNU/non-GNU ld that we prefer.
+      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+      *GNU* | *'with BFD'*)
+	test no != "$with_gnu_ld" && break
+	;;
+      *)
+	test yes != "$with_gnu_ld" && break
+	;;
+      esac
+    fi
+  done
+  IFS=$lt_save_ifs
+else
+  lt_cv_path_LD=$LD # Let the user override the test with a path.
+fi])
+LD=$lt_cv_path_LD
+if test -n "$LD"; then
+  AC_MSG_RESULT($LD)
+else
+  AC_MSG_RESULT(no)
+fi
+test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
+_LT_PATH_LD_GNU
+AC_SUBST([LD])
+
+_LT_TAGDECL([], [LD], [1], [The linker used to build libraries])
+])# LT_PATH_LD
+
+# Old names:
+AU_ALIAS([AM_PROG_LD], [LT_PATH_LD])
+AU_ALIAS([AC_PROG_LD], [LT_PATH_LD])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_LD], [])
+dnl AC_DEFUN([AC_PROG_LD], [])
+
+
+# _LT_PATH_LD_GNU
+#- --------------
+m4_defun([_LT_PATH_LD_GNU],
+[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+case `$LD -v 2>&1 </dev/null` in
+*GNU* | *'with BFD'*)
+  lt_cv_prog_gnu_ld=yes
+  ;;
+*)
+  lt_cv_prog_gnu_ld=no
+  ;;
+esac])
+with_gnu_ld=$lt_cv_prog_gnu_ld
+])# _LT_PATH_LD_GNU
+
+
+# _LT_CMD_RELOAD
+# --------------
+# find reload flag for linker
+#   -- PORTME Some linkers may need a different reload flag.
+m4_defun([_LT_CMD_RELOAD],
+[AC_CACHE_CHECK([for $LD option to reload object files],
+  lt_cv_ld_reload_flag,
+  [lt_cv_ld_reload_flag='-r'])
+reload_flag=$lt_cv_ld_reload_flag
+case $reload_flag in
+"" | " "*) ;;
+*) reload_flag=" $reload_flag" ;;
+esac
+reload_cmds='$LD$reload_flag -o $output$reload_objs'
+case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test yes != "$GCC"; then
+      reload_cmds=false
+    fi
+    ;;
+  darwin*)
+    if test yes = "$GCC"; then
+      reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
+    else
+      reload_cmds='$LD$reload_flag -o $output$reload_objs'
+    fi
+    ;;
+esac
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
+])# _LT_CMD_RELOAD
+
+
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+  cmp -s conftest.i conftest.out \
+  && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+  [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
+# _LT_CHECK_MAGIC_METHOD
+# ----------------------
+# how to check for library dependencies
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_MAGIC_METHOD],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+AC_CACHE_CHECK([how to recognize dependent libraries],
+lt_cv_deplibs_check_method,
+[lt_cv_file_magic_cmd='$MAGIC_CMD'
+lt_cv_file_magic_test_file=
+lt_cv_deplibs_check_method='unknown'
+# Need to set the preceding variable on all platforms that support
+# interlibrary dependencies.
+# 'none' -- dependencies not supported.
+# 'unknown' -- same as none, but documents that we really don't know.
+# 'pass_all' -- all dependencies passed with no checks.
+# 'test_compile' -- check by making test program.
+# 'file_magic [[regex]]' -- check by looking for files in library path
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
+
+case $host_os in
+aix[[4-9]]*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+beos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+bsdi[[45]]*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+  lt_cv_file_magic_cmd='/usr/bin/file -L'
+  lt_cv_file_magic_test_file=/shlib/libc.so
+  ;;
+
+cygwin*)
+  # func_win32_libid is a shell function defined in ltmain.sh
+  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+  lt_cv_file_magic_cmd='func_win32_libid'
+  ;;
+
+mingw* | pw32*)
+  # Base MSYS/MinGW do not provide the 'file' command needed by
+  # func_win32_libid shell function, so use a weaker test based on 'objdump',
+  # unless we find 'file', for example because we are cross-compiling.
+  if ( file / ) >/dev/null 2>&1; then
+    lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+    lt_cv_file_magic_cmd='func_win32_libid'
+  else
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
+    lt_cv_file_magic_cmd='$OBJDUMP -f'
+  fi
+  ;;
+
+cegcc*)
+  # use the weaker test based on 'objdump'. See mingw*.
+  lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
+  lt_cv_file_magic_cmd='$OBJDUMP -f'
+  ;;
+
+darwin* | rhapsody*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+freebsd* | dragonfly*)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    case $host_cpu in
+    i*86 )
+      # Not sure whether the presence of OpenBSD here was a mistake.
+      # Let's accept both of them until this is cleared up.
+      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+      lt_cv_file_magic_cmd=/usr/bin/file
+      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+      ;;
+    esac
+  else
+    lt_cv_deplibs_check_method=pass_all
+  fi
+  ;;
+
+haiku*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+hpux10.20* | hpux11*)
+  lt_cv_file_magic_cmd=/usr/bin/file
+  case $host_cpu in
+  ia64*)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+    ;;
+  hppa*64*)
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
+    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
+    ;;
+  *)
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
+    lt_cv_file_magic_test_file=/usr/lib/libc.sl
+    ;;
+  esac
+  ;;
+
+interix[[3-9]]*)
+  # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
+  lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
+  ;;
+
+irix5* | irix6* | nonstopux*)
+  case $LD in
+  *-32|*"-32 ") libmagic=32-bit;;
+  *-n32|*"-n32 ") libmagic=N32;;
+  *-64|*"-64 ") libmagic=64-bit;;
+  *) libmagic=never-match;;
+  esac
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+netbsd* | netbsdelf*-gnu)
+  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
+  fi
+  ;;
+
+newos6*)
+  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
+  lt_cv_file_magic_cmd=/usr/bin/file
+  lt_cv_file_magic_test_file=/usr/lib/libnls.so
+  ;;
+
+*nto* | *qnx*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+openbsd* | bitrig*)
+  if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+  else
+    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+  fi
+  ;;
+
+osf3* | osf4* | osf5*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+rdos*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+solaris*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+
+sysv4 | sysv4.3*)
+  case $host_vendor in
+  motorola)
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
+    ;;
+  ncr)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  sequent)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
+    ;;
+  sni)
+    lt_cv_file_magic_cmd='/bin/file'
+    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
+    lt_cv_file_magic_test_file=/lib/libc.so
+    ;;
+  siemens)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  pc)
+    lt_cv_deplibs_check_method=pass_all
+    ;;
+  esac
+  ;;
+
+tpf*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+os2*)
+  lt_cv_deplibs_check_method=pass_all
+  ;;
+esac
+])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
+file_magic_cmd=$lt_cv_file_magic_cmd
+deplibs_check_method=$lt_cv_deplibs_check_method
+test -z "$deplibs_check_method" && deplibs_check_method=unknown
+
+_LT_DECL([], [deplibs_check_method], [1],
+    [Method to check whether dependent libraries are shared objects])
+_LT_DECL([], [file_magic_cmd], [1],
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
+])# _LT_CHECK_MAGIC_METHOD
+
+
+# LT_PATH_NM
+# ----------
+# find the pathname to a BSD- or MS-compatible name lister
+AC_DEFUN([LT_PATH_NM],
+[AC_REQUIRE([AC_PROG_CC])dnl
+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
+[if test -n "$NM"; then
+  # Let the user override the test.
+  lt_cv_path_NM=$NM
+else
+  lt_nm_to_check=${ac_tool_prefix}nm
+  if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
+    lt_nm_to_check="$lt_nm_to_check nm"
+  fi
+  for lt_tmp_nm in $lt_nm_to_check; do
+    lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
+    for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
+      IFS=$lt_save_ifs
+      test -z "$ac_dir" && ac_dir=.
+      tmp_nm=$ac_dir/$lt_tmp_nm
+      if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
+	# Check to see if the nm accepts a BSD-compat flag.
+	# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
+	#   nm: unknown option "B" ignored
+	# Tru64's nm complains that /dev/null is an invalid object file
+	# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+	case $build_os in
+	mingw*) lt_bad_file=conftest.nm/nofile ;;
+	*) lt_bad_file=/dev/null ;;
+	esac
+	case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+	*$lt_bad_file* | *'Invalid file or object type'*)
+	  lt_cv_path_NM="$tmp_nm -B"
+	  break 2
+	  ;;
+	*)
+	  case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+	  */dev/null*)
+	    lt_cv_path_NM="$tmp_nm -p"
+	    break 2
+	    ;;
+	  *)
+	    lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+	    continue # so that we can try to find one that supports BSD flags
+	    ;;
+	  esac
+	  ;;
+	esac
+      fi
+    done
+    IFS=$lt_save_ifs
+  done
+  : ${lt_cv_path_NM=no}
+fi])
+if test no != "$lt_cv_path_NM"; then
+  NM=$lt_cv_path_NM
+else
+  # Didn't find any BSD compatible name lister, look for dumpbin.
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols -headers"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
+  AC_SUBST([DUMPBIN])
+  if test : != "$DUMPBIN"; then
+    NM=$DUMPBIN
+  fi
+fi
+test -z "$NM" && NM=nm
+AC_SUBST([NM])
+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl
+
+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
+  [lt_cv_nm_interface="BSD nm"
+  echo "int some_variable = 0;" > conftest.$ac_ext
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$ac_compile" 2>conftest.err)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
+  cat conftest.out >&AS_MESSAGE_LOG_FD
+  if $GREP 'External.*some_variable' conftest.out > /dev/null; then
+    lt_cv_nm_interface="MS dumpbin"
+  fi
+  rm -f conftest*])
+])# LT_PATH_NM
+
+# Old names:
+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM])
+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_PROG_NM], [])
+dnl AC_DEFUN([AC_PROG_NM], [])
+
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh;
+  # decide which one to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd=$ECHO
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test yes != "$lt_cv_path_mainfest_tool"; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
+
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+  test DEF = "`$SED -n dnl
+    -e '\''s/^[[	 ]]*//'\'' dnl Strip leading whitespace
+    -e '\''/^\(;.*\)*$/d'\'' dnl      Delete empty lines and comments
+    -e '\''s/^\(EXPORTS\|LIBRARY\)\([[	 ]].*\)*$/DEF/p'\'' dnl
+    -e q dnl                          Only consider the first "real" line
+    $1`" dnl
+])# _LT_DLL_DEF_P
+
+
+# LT_LIB_M
+# --------
+# check for math library
+AC_DEFUN([LT_LIB_M],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+LIBM=
+case $host in
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
+  # These system don't have libm, or don't need it
+  ;;
+*-ncr-sysv4.3*)
+  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
+  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
+  ;;
+*)
+  AC_CHECK_LIB(m, cos, LIBM=-lm)
+  ;;
+esac
+AC_SUBST([LIBM])
+])# LT_LIB_M
+
+# Old name:
+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_CHECK_LIBM], [])
+
+
+# _LT_COMPILER_NO_RTTI([TAGNAME])
+# -------------------------------
+m4_defun([_LT_COMPILER_NO_RTTI],
+[m4_require([_LT_TAG_COMPILER])dnl
+
+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+
+if test yes = "$GCC"; then
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
+
+  _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
+    lt_cv_prog_compiler_rtti_exceptions,
+    [-fno-rtti -fno-exceptions], [],
+    [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
+fi
+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1],
+	[Compiler flag to turn off builtin functions])
+])# _LT_COMPILER_NO_RTTI
+
+
+# _LT_CMD_GLOBAL_SYMBOLS
+# ----------------------
+m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+AC_REQUIRE([LT_PATH_LD])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+
+# Check for command to grab the raw symbol name followed by C symbol from nm.
+AC_MSG_CHECKING([command to parse $NM output from $compiler object])
+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
+[
+# These are sane defaults that work on at least a few old systems.
+# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
+
+# Character class describing NM global symbol codes.
+symcode='[[BCDEGRST]]'
+
+# Regexp to match symbols that can be accessed directly from C.
+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+# Define system-specific variables.
+case $host_os in
+aix*)
+  symcode='[[BCDT]]'
+  ;;
+cygwin* | mingw* | pw32* | cegcc*)
+  symcode='[[ABCDGISTW]]'
+  ;;
+hpux*)
+  if test ia64 = "$host_cpu"; then
+    symcode='[[ABCDEGRST]]'
+  fi
+  ;;
+irix* | nonstopux*)
+  symcode='[[BCDEGRST]]'
+  ;;
+osf*)
+  symcode='[[BCDEGQRST]]'
+  ;;
+solaris*)
+  symcode='[[BDRT]]'
+  ;;
+sco3.2v5*)
+  symcode='[[DT]]'
+  ;;
+sysv4.2uw2*)
+  symcode='[[DT]]'
+  ;;
+sysv5* | sco5v6* | unixware* | OpenUNIX*)
+  symcode='[[ABDT]]'
+  ;;
+sysv4)
+  symcode='[[DFNSTU]]'
+  ;;
+esac
+
+# If we're using GNU nm, then use its standard symbol codes.
+case `$NM -V 2>&1` in
+*GNU* | *'with BFD'*)
+  symcode='[[ABCDGIRSTW]]' ;;
+esac
+
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  # Gets list of data symbols to import.
+  lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+  # Adjust the below global symbol transforms to fixup imported variables.
+  lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+  lt_c_name_hook=" -e 's/^I .* \(.*\)$/  {\"\1\", (void *) 0},/p'"
+  lt_c_name_lib_hook="\
+  -e 's/^I .* \(lib.*\)$/  {\"\1\", (void *) 0},/p'\
+  -e 's/^I .* \(.*\)$/  {\"lib\1\", (void *) 0},/p'"
+else
+  # Disable hooks by default.
+  lt_cv_sys_global_symbol_to_import=
+  lt_cdecl_hook=
+  lt_c_name_hook=
+  lt_c_name_lib_hook=
+fi
+
+# Transform an extracted symbol line into a proper C declaration.
+# Some systems (esp. on ia64) link data and code symbols differently,
+# so use this general approach.
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
+
+# Transform an extracted symbol line into symbol name and symbol address
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/  {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/  {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/  {\"lib\1\", (void *) \&\1},/p'"
+
+# Handle CRLF in mingw tool chain
+opt_cr=
+case $build_os in
+mingw*)
+  opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp
+  ;;
+esac
+
+# Try without a prefix underscore, then with it.
+for ac_symprfx in "" "_"; do
+
+  # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
+  symxfrm="\\1 $ac_symprfx\\2 \\2"
+
+  # Write the raw and C identifiers.
+  if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+    # Fake it for dumpbin and say T for any non-static function,
+    # D for any global variable and I for any imported variable.
+    # Also find C++ and __fastcall symbols from MSVC++,
+    # which start with @ or ?.
+    lt_cv_sys_global_symbol_pipe="$AWK ['"\
+"     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
+"     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+"     /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+"     /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+"     /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
+"     \$ 0!~/External *\|/{next};"\
+"     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
+"     {if(hide[section]) next};"\
+"     {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+"     {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+"     s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+"     s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
+"     ' prfx=^$ac_symprfx]"
+  else
+    lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+  fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
+
+  # Check to see that the pipe works correctly.
+  pipe_works=no
+
+  rm -f conftest*
+  cat > conftest.$ac_ext <<_LT_EOF
+#ifdef __cplusplus
+extern "C" {
+#endif
+char nm_test_var;
+void nm_test_func(void);
+void nm_test_func(void){}
+#ifdef __cplusplus
+}
+#endif
+int main(){nm_test_var='a';nm_test_func();return(0);}
+_LT_EOF
+
+  if AC_TRY_EVAL(ac_compile); then
+    # Now try to grab the symbols.
+    nlist=conftest.nm
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+      # Try sorting and uniquifying the output.
+      if sort "$nlist" | uniq > "$nlist"T; then
+	mv -f "$nlist"T "$nlist"
+      else
+	rm -f "$nlist"T
+      fi
+
+      # Make sure that we snagged all the symbols we need.
+      if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
+	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
+	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t at _DLSYM_CONST
+#elif defined __osf__
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t at _DLSYM_CONST
+#else
+# define LT@&t at _DLSYM_CONST const
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+_LT_EOF
+	  # Now generate the symbol file.
+	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext'
+
+	  cat <<_LT_EOF >> conftest.$ac_ext
+
+/* The mapping between symbol names and symbols.  */
+LT@&t at _DLSYM_CONST struct {
+  const char *name;
+  void       *address;
+}
+lt__PROGRAM__LTX_preloaded_symbols[[]] =
+{
+  { "@PROGRAM@", (void *) 0 },
+_LT_EOF
+	  $SED "s/^$symcode$symcode* .* \(.*\)$/  {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+	  cat <<\_LT_EOF >> conftest.$ac_ext
+  {0, (void *) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+  return lt__PROGRAM__LTX_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+_LT_EOF
+	  # Now try linking the two files.
+	  mv conftest.$ac_objext conftstm.$ac_objext
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
+	  LIBS=conftstm.$ac_objext
+	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
+	  if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
+	    pipe_works=yes
+	  fi
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
+	else
+	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
+	fi
+      else
+	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
+      fi
+    else
+      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
+    fi
+  else
+    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
+    cat conftest.$ac_ext >&5
+  fi
+  rm -rf conftest* conftst*
+
+  # Do not use the global_symbol_pipe unless it works.
+  if test yes = "$pipe_works"; then
+    break
+  else
+    lt_cv_sys_global_symbol_pipe=
+  fi
+done
+])
+if test -z "$lt_cv_sys_global_symbol_pipe"; then
+  lt_cv_sys_global_symbol_to_cdecl=
+fi
+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
+  AC_MSG_RESULT(failed)
+else
+  AC_MSG_RESULT(ok)
+fi
+
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
+    [Take the output of nm and produce a listing of raw symbols and C names])
+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
+    [Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+    [Transform the output of nm into a list of symbols to manually relocate])
+_LT_DECL([global_symbol_to_c_name_address],
+    [lt_cv_sys_global_symbol_to_c_name_address], [1],
+    [Transform the output of nm in a C name address pair])
+_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
+    [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
+    [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+    [The name lister interface])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
+]) # _LT_CMD_GLOBAL_SYMBOLS
+
+
+# _LT_COMPILER_PIC([TAGNAME])
+# ---------------------------
+m4_defun([_LT_COMPILER_PIC],
+[m4_require([_LT_TAG_COMPILER])dnl
+_LT_TAGVAR(lt_prog_compiler_wl, $1)=
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+_LT_TAGVAR(lt_prog_compiler_static, $1)=
+
+m4_if([$1], [CXX], [
+  # C++ specific cases for pic, static, wl, etc.
+  if test yes = "$GXX"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+    aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+    mingw* | cygwin* | os2* | pw32* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+    *djgpp*)
+      # DJGPP does not support shared libraries at all
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+      ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+    *qnx* | *nto*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+  else
+    case $host_os in
+      aix[[4-9]]*)
+	# All AIX code is PIC.
+	if test ia64 = "$host_cpu"; then
+	  # AIX 5 now supports IA64 processor
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	else
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+	fi
+	;;
+      chorus*)
+	case $cc_basename in
+	cxch68*)
+	  # Green Hills C++ Compiler
+	  # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+	  ;;
+	esac
+	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
+      dgux*)
+	case $cc_basename in
+	  ec++*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  ghcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      freebsd* | dragonfly*)
+	# FreeBSD uses GNU C++
+	;;
+      hpux9* | hpux10* | hpux11*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    if test ia64 != "$host_cpu"; then
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	    fi
+	    ;;
+	  aCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+	    case $host_cpu in
+	    hppa*64*|ia64*)
+	      # +Z the default
+	      ;;
+	    *)
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	      ;;
+	    esac
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      interix*)
+	# This is c89, which is MS Visual C++ (no shared libs)
+	# Anyone wants to do a port?
+	;;
+      irix5* | irix6* | nonstopux*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    # CC pic flag -KPIC is the default.
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+	case $cc_basename in
+	  KCC*)
+	    # KAI C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    ;;
+	  ecpc* )
+	    # old Intel C++ for x86_64, which still supported -KPIC.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  icpc* )
+	    # Intel C++, used to be incompatible with GCC.
+	    # ICC 10 doesn't accept -KPIC any more.
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	    ;;
+	  pgCC* | pgcpp*)
+	    # Portland Group C++ compiler
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  cxx*)
+	    # Compaq C++
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+      lynxos*)
+	;;
+      m88k*)
+	;;
+      mvs*)
+	case $cc_basename in
+	  cxx*)
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      netbsd* | netbsdelf*-gnu)
+	;;
+      *qnx* | *nto*)
+        # QNX uses GNU C++, but need to define -shared option too, otherwise
+        # it will coredump.
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+        ;;
+      osf3* | osf4* | osf5*)
+	case $cc_basename in
+	  KCC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+	    ;;
+	  RCC*)
+	    # Rational C++ 2.4.1
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  cxx*)
+	    # Digital/Compaq C++
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    # Make sure the PIC flag is empty.  It appears that all Alpha
+	    # Linux and Compaq Tru64 Unix objects are PIC.
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      psos*)
+	;;
+      solaris*)
+	case $cc_basename in
+	  CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	    ;;
+	  gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sunos4*)
+	case $cc_basename in
+	  CC*)
+	    # Sun C++ 4.x
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	  lcc*)
+	    # Lucid
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+	case $cc_basename in
+	  CC*)
+	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	    ;;
+	esac
+	;;
+      tandem*)
+	case $cc_basename in
+	  NCC*)
+	    # NonStop-UX NCC 3.20
+	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	    ;;
+	  *)
+	    ;;
+	esac
+	;;
+      vxworks*)
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+	;;
+    esac
+  fi
+],
+[
+  if test yes = "$GCC"; then
+    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+    _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+
+    case $host_os in
+      aix*)
+      # All AIX code is PIC.
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+        ;;
+      m68k)
+            # FIXME: we need at least 68020 code to build shared libraries, but
+            # adding the '-m68020' flag to GCC prevents building anything better,
+            # like '-m68040'.
+            _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+        ;;
+      esac
+      ;;
+
+    beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+      # PIC is the default for these OSes.
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      # Although the cygwin gcc ignores -fPIC, still need this for old-style
+      # (--disable-auto-import) libraries
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      ;;
+
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
+    hpux*)
+      # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
+      # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
+      # sets the default TLS model and affects inlining.
+      case $host_cpu in
+      hppa*64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	;;
+      esac
+      ;;
+
+    interix[[3-9]]*)
+      # Interix 3.x gcc -fpic/-fPIC options generate broken code.
+      # Instead, we relocate shared libraries at runtime.
+      ;;
+
+    msdosdjgpp*)
+      # Just because we use GCC doesn't mean we suddenly get shared libraries
+      # on systems that don't support them.
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      enable_shared=no
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+      fi
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+      ;;
+    esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
+  else
+    # PORTME Check for flag to pass linker flags through the system compiler.
+    case $host_os in
+    aix*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      if test ia64 = "$host_cpu"; then
+	# AIX 5 now supports IA64 processor
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      else
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+      fi
+      ;;
+
+    darwin* | rhapsody*)
+      # PIC is the default on this platform
+      # Common symbols not allowed in MH_DYLIB files
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+      case $cc_basename in
+      nagfor*)
+        # NAG Fortran compiler
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      esac
+      ;;
+
+    mingw* | cygwin* | pw32* | os2* | cegcc*)
+      # This hack is so that the source file can tell whether it is being
+      # built for inclusion in a dll (and should export symbols for example).
+      m4_if([$1], [GCJ], [],
+	[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+      case $host_os in
+      os2*)
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+	;;
+      esac
+      ;;
+
+    hpux9* | hpux10* | hpux11*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+      # not for PA HP-UX.
+      case $host_cpu in
+      hppa*64*|ia64*)
+	# +Z the default
+	;;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+	;;
+      esac
+      # Is there a better lt_prog_compiler_static that works with the bundled CC?
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # PIC (with -KPIC) is the default.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+      case $cc_basename in
+      # old Intel for x86_64, which still supported -KPIC.
+      ecc*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # icc used to be incompatible with GCC.
+      # ICC 10 doesn't accept -KPIC any more.
+      icc* | ifort*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+        ;;
+      # Lahey Fortran 8.1.
+      lf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
+	;;
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
+        # Portland Group compilers (*not* the Pentium gcc compiler,
+	# which looks to be a dead project)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+        ;;
+      ccc*)
+        _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+        # All Alpha code is PIC.
+        _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+        ;;
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
+	;;
+      *)
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
+	*Sun\ C*)
+	  # Sun C 5.9
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  ;;
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  ;;
+	esac
+	;;
+      esac
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *nto* | *qnx*)
+      # QNX uses GNU C++, but need to define -shared option too, otherwise
+      # it will coredump.
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared'
+      ;;
+
+    osf3* | osf4* | osf5*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      # All OSF/1 code is PIC.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    rdos*)
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      case $cc_basename in
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
+      *)
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4 | sysv4.2uw2* | sysv4.3*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      fi
+      ;;
+
+    sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    unicos*)
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+      _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+      ;;
+
+    *)
+      _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
+      ;;
+    esac
+  fi
+])
+case $host_os in
+  # For platforms that do not support PIC, -DPIC is meaningless:
+  *djgpp*)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
+    ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
+    ;;
+esac
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
+
+#
+# Check to make sure the PIC flag actually works.
+#
+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+  _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works],
+    [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)],
+    [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t at m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [],
+    [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in
+     "" | " "*) ;;
+     *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;;
+     esac],
+    [_LT_TAGVAR(lt_prog_compiler_pic, $1)=
+     _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+fi
+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
+	[Additional compiler flags for building library objects])
+
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
+#
+# Check to make sure the static flag actually works.
+#
+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\"
+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
+  _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1),
+  $lt_tmp_static_flag,
+  [],
+  [_LT_TAGVAR(lt_prog_compiler_static, $1)=])
+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1],
+	[Compiler flag to prevent dynamic linking])
+])# _LT_COMPILER_PIC
+
+
+# _LT_LINKER_SHLIBS([TAGNAME])
+# ----------------------------
+# See if the linker supports building shared libraries.
+m4_defun([_LT_LINKER_SHLIBS],
+[AC_REQUIRE([LT_PATH_LD])dnl
+AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_TAG_COMPILER])dnl
+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+m4_if([$1], [CXX], [
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  case $host_os in
+  aix[[4-9]]*)
+    # If we're using GNU nm, then we don't want the "-C" option.
+    # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+    # Without the "-l" option, or with the "-B" option, AIX nm treats
+    # weak defined symbols like other global defined symbols, whereas
+    # GNU nm marks them as "W".
+    # While the 'weak' keyword is ignored in the Export File, we need
+    # it in the Import File for the 'aix-soname' feature, so we have
+    # to replace the "-B" option with "-P" for AIX nm.
+    if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+    else
+      _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+    fi
+    ;;
+  pw32*)
+    _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
+    ;;
+  cygwin* | mingw* | cegcc*)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  *)
+    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+    ;;
+  esac
+], [
+  runpath_var=
+  _LT_TAGVAR(allow_undefined_flag, $1)=
+  _LT_TAGVAR(always_export_symbols, $1)=no
+  _LT_TAGVAR(archive_cmds, $1)=
+  _LT_TAGVAR(archive_expsym_cmds, $1)=
+  _LT_TAGVAR(compiler_needs_object, $1)=no
+  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+  _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+  _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(hardcode_automatic, $1)=no
+  _LT_TAGVAR(hardcode_direct, $1)=no
+  _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+  _LT_TAGVAR(hardcode_minus_L, $1)=no
+  _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+  _LT_TAGVAR(inherit_rpath, $1)=no
+  _LT_TAGVAR(link_all_deplibs, $1)=unknown
+  _LT_TAGVAR(module_cmds, $1)=
+  _LT_TAGVAR(module_expsym_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_new_cmds, $1)=
+  _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)=
+  _LT_TAGVAR(thread_safe_flag_spec, $1)=
+  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+  # include_expsyms should be a list of space-separated symbols to be *always*
+  # included in the symbol list
+  _LT_TAGVAR(include_expsyms, $1)=
+  # exclude_expsyms can be an extended regexp of symbols to exclude
+  # it will be wrapped by ' (' and ')$', so one must not match beginning or
+  # end of line.  Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+  # as well as any symbol that contains 'd'.
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
+  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
+  # platforms (ab)use it in PIC code, but their linkers get confused if
+  # the symbol is explicitly referenced.  Since portable code cannot
+  # rely on this symbol name, it's probably fine to never include it in
+  # preloaded symbol tables.
+  # Exclude shared library initialization/finalization symbols.
+dnl Note also adjust exclude_expsyms for C++ above.
+  extract_expsyms_cmds=
+
+  case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    # FIXME: the MSVC++ port hasn't been tested in a loooong time
+    # When not using gcc, we currently assume that we are using
+    # Microsoft Visual C++.
+    if test yes != "$GCC"; then
+      with_gnu_ld=no
+    fi
+    ;;
+  interix*)
+    # we just hope/assume this is gcc and not c89 (= MSVC++)
+    with_gnu_ld=yes
+    ;;
+  openbsd* | bitrig*)
+    with_gnu_ld=no
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
+    _LT_TAGVAR(link_all_deplibs, $1)=no
+    ;;
+  esac
+
+  _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
+  if test yes = "$with_gnu_ld"; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test yes = "$lt_use_gnu_ld_interface"; then
+    # If archive_cmds runs LD, not CC, wlarc should be empty
+    wlarc='$wl'
+
+    # Set some defaults for GNU ld with shared library support. These
+    # are reset later if shared libraries are not supported. Putting them
+    # here allows them to be overridden if necessary.
+    runpath_var=LD_RUN_PATH
+    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+    # ancient GNU ld didn't support --whole-archive et. al.
+    if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+    else
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+    supports_anon_versioning=no
+    case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
+      *GNU\ gold*) supports_anon_versioning=yes ;;
+      *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
+      *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
+      *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
+      *\ 2.11.*) ;; # other 2.11 versions
+      *) supports_anon_versioning=yes ;;
+    esac
+
+    # See if GNU ld supports shared libraries.
+    case $host_os in
+    aix[[3-9]]*)
+      # On AIX/PPC, the GNU linker is very broken
+      if test ia64 != "$host_cpu"; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: the GNU linker, at least up to release 2.19, is reported
+*** to be unable to reliably create shared libraries on AIX.
+*** Therefore, libtool is disabling shared libraries support.  If you
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
+
+_LT_EOF
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    beos*)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	# support --undefined.  This deserves some investigation.  FIXME
+	_LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+      # as there is no search path for DLLs.
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=no
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+
+      if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	# If the export-symbols file already is a .def file, use it as
+	# is; otherwise, prepend EXPORTS...
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+          cp $export_symbols $output_objdir/$soname.def;
+        else
+          echo EXPORTS > $output_objdir/$soname.def;
+          cat $export_symbols >> $output_objdir/$soname.def;
+        fi~
+        $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    interix[[3-9]]*)
+      _LT_TAGVAR(hardcode_direct, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+      # Instead, shared libraries are loaded at an image base (0x10000000 by
+      # default) and relocated if they conflict, which is a slow very memory
+      # consuming and fragmenting process.  To avoid this, we pick a random,
+      # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+      # time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+      ;;
+
+    gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
+      tmp_diet=no
+      if test linux-dietlibc = "$host_os"; then
+	case $cc_basename in
+	  diet\ *) tmp_diet=yes;;	# linux-dietlibc with static linking (!diet-dyn)
+	esac
+      fi
+      if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
+	 && test no = "$tmp_diet"
+      then
+	tmp_addflag=' $pic_flag'
+	tmp_sharedflag='-shared'
+	case $cc_basename,$host_cpu in
+        pgcc*)				# Portland Group C compiler
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag'
+	  ;;
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  tmp_addflag=' $pic_flag -Mnomain' ;;
+	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
+	  tmp_addflag=' -i_dynamic' ;;
+	efc*,ia64* | ifort*,ia64*)	# Intel Fortran compiler on ia64
+	  tmp_addflag=' -i_dynamic -nofor_main' ;;
+	ifc* | ifort*)			# Intel Fortran compiler
+	  tmp_addflag=' -nofor_main' ;;
+	lf95*)				# Lahey Fortran 8.1
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
+	  tmp_sharedflag='--shared' ;;
+        nagfor*)                        # NAGFOR 5.3
+          tmp_sharedflag='-Wl,-shared' ;;
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
+	  tmp_sharedflag='-qmkshrobj'
+	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
+	esac
+	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ C*)			# Sun C 5.9
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  tmp_sharedflag='-G' ;;
+	*Sun\ F*)			# Sun Fortran 8.3
+	  tmp_sharedflag='-G' ;;
+	esac
+	_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+
+        if test yes = "$supports_anon_versioning"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+            echo "local: *; };" >> $output_objdir/$libname.ver~
+            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+        fi
+
+	case $cc_basename in
+	tcc*)
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+	  ;;
+	xlf* | bgf* | bgxlf* | mpixlf*)
+	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
+	  if test yes = "$supports_anon_versioning"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+              echo "local: *; };" >> $output_objdir/$libname.ver~
+              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	  fi
+	  ;;
+	esac
+      else
+        _LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+	wlarc=
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      fi
+      ;;
+
+    solaris*)
+      if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: The releases 2.8.* of the GNU linker cannot reliably
+*** create shared libraries on Solaris systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.9.1 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+      elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
+      case `$LD -v 2>&1` in
+        *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	cat <<_LT_EOF 1>&2
+
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
+*** reliably create shared libraries on SCO systems.  Therefore, libtool
+*** is disabling shared libraries support.  We urge you to upgrade GNU
+*** binutils to release 2.16.91.0.3 or newer.  Another option is to modify
+*** your PATH or compiler configuration so that the native linker is
+*** used, and then restart.
+
+_LT_EOF
+	;;
+	*)
+	  # For security reasons, it is highly recommended that you always
+	  # use absolute paths for naming shared libraries, and exclude the
+	  # DT_RUNPATH tag from executables and libraries.  But doing so
+	  # requires that you compile everything twice, which is a pain.
+	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	;;
+      esac
+      ;;
+
+    sunos4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      wlarc=
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+    esac
+
+    if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
+      runpath_var=
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=
+      _LT_TAGVAR(whole_archive_flag_spec, $1)=
+    fi
+  else
+    # PORTME fill in a description of your system's linker (not GNU ld)
+    case $host_os in
+    aix3*)
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
+      # Note: this linker hardcodes the directories in LIBPATH if there
+      # are no directories specified by -L.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
+	# Neither direct hardcoding nor static linking is supported with a
+	# broken collect2.
+	_LT_TAGVAR(hardcode_direct, $1)=unsupported
+      fi
+      ;;
+
+    aix[[4-9]]*)
+      if test ia64 = "$host_cpu"; then
+	# On IA64, the linker does run time linking by default, so we don't
+	# have to do anything special.
+	aix_use_runtimelinking=no
+	exp_sym_flag='-Bexport'
+	no_entry_flag=
+      else
+	# If we're using GNU nm, then we don't want the "-C" option.
+	# -C means demangle to GNU nm, but means don't demangle to AIX nm.
+	# Without the "-l" option, or with the "-B" option, AIX nm treats
+	# weak defined symbols like other global defined symbols, whereas
+	# GNU nm marks them as "W".
+	# While the 'weak' keyword is ignored in the Export File, we need
+	# it in the Import File for the 'aix-soname' feature, so we have
+	# to replace the "-B" option with "-P" for AIX nm.
+	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
+	else
+	  _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
+	fi
+	aix_use_runtimelinking=no
+
+	# Test if we are trying to use run time linking or normal
+	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
+	# have runtime linking enabled, and use it for executables.
+	# For shared libraries, we enable/disable runtime linking
+	# depending on the kind of the shared library created -
+	# when "with_aix_soname,aix_use_runtimelinking" is:
+	# "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "aix,yes"  lib.so          shared, rtl:yes, for executables
+	#            lib.a           static archive
+	# "both,no"  lib.so.V(shr.o) shared, rtl:yes
+	#            lib.a(lib.so.V) shared, rtl:no,  for executables
+	# "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a(lib.so.V) shared, rtl:no
+	# "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+	#            lib.a           static archive
+	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	  for ld_flag in $LDFLAGS; do
+	  if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
+	    aix_use_runtimelinking=yes
+	    break
+	  fi
+	  done
+	  if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	    # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	    # so we don't have lib.a shared libs to link our executables.
+	    # We have to force runtime linking in this case.
+	    aix_use_runtimelinking=yes
+	    LDFLAGS="$LDFLAGS -Wl,-brtl"
+	  fi
+	  ;;
+	esac
+
+	exp_sym_flag='-bexport'
+	no_entry_flag='-bnoentry'
+      fi
+
+      # When large executables or shared objects are built, AIX ld can
+      # have problems creating the table of contents.  If linking a library
+      # or program results in "error TOC overflow" add -mminimal-toc to
+      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+      _LT_TAGVAR(archive_cmds, $1)=''
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+      case $with_aix_soname,$aix_use_runtimelinking in
+      aix,*) ;; # traditional, no import file
+      svr4,* | *,yes) # use import file
+	# The Import File defines what to hardcode.
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+	;;
+      esac
+
+      if test yes = "$GCC"; then
+	case $host_os in aix4.[[012]]|aix4.[[012]].*)
+	# We only want to do this on AIX 4.2 and lower, the check
+	# below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	   strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	  # We have reworked collect2
+	  :
+	  else
+	  # We have old collect2
+	  _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	  # It fails to find uninstalled libraries when the uninstalled
+	  # path is not listed in the libpath.  Setting hardcode_minus_L
+	  # to unsupported forces relinking
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+	  ;;
+	esac
+	shared_flag='-shared'
+	if test yes = "$aix_use_runtimelinking"; then
+	  shared_flag="$shared_flag "'$wl-G'
+	fi
+	# Need to ensure runtime linking is disabled for the traditional
+	# shared library, or the linker may eventually find shared libraries
+	# /with/ Import File - we do not want to mix them.
+	shared_flag_aix='-shared'
+	shared_flag_svr4='-shared $wl-G'
+      else
+	# not using gcc
+	if test ia64 = "$host_cpu"; then
+	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	# chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+	else
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag='$wl-G'
+	  else
+	    shared_flag='$wl-bM:SRE'
+	  fi
+	  shared_flag_aix='$wl-bM:SRE'
+	  shared_flag_svr4='$wl-G'
+	fi
+      fi
+
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+      # It seems that -bexpall does not export symbols beginning with
+      # underscore (_), so it is better to generate a list of symbols to export.
+      _LT_TAGVAR(always_export_symbols, $1)=yes
+      if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+	# Warning - without using the other runtime loading flags (-brtl),
+	# -berok will link without error, but may produce a broken library.
+	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+        # Determine the default libpath from the value encoded in an
+        # empty executable.
+        _LT_SYS_MODULE_PATH_AIX([$1])
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+      else
+	if test ia64 = "$host_cpu"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	  _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+	else
+	 # Determine the default libpath from the value encoded in an
+	 # empty executable.
+	 _LT_SYS_MODULE_PATH_AIX([$1])
+	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	  # Warning - without using the other run time loading flags,
+	  # -berok will link without error, but may produce a broken library.
+	  _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	  if test yes = "$with_gnu_ld"; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
+	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	  # -brtl affects multiple linker settings, -berok does not and is overridden later
+	  compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	  if test svr4 != "$with_aix_soname"; then
+	    # This is similar to how AIX traditionally builds its shared libraries.
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	  fi
+	  if test aix != "$with_aix_soname"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	  else
+	    # used by -dlpreopen to get the symbols
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	  fi
+	  _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+	fi
+      fi
+      ;;
+
+    amigaos*)
+      case $host_cpu in
+      powerpc)
+            # see comment about AmigaOS4 .so support
+            _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+            _LT_TAGVAR(archive_expsym_cmds, $1)=''
+        ;;
+      m68k)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
+            _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes
+        ;;
+      esac
+      ;;
+
+    bsdi[[45]]*)
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+      ;;
+
+    cygwin* | mingw* | pw32* | cegcc*)
+      # When not using gcc, we currently assume that we are using
+      # Microsoft Visual C++.
+      # hardcode_libdir_flag_spec is actually meaningless, as there is
+      # no search path for DLLs.
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+            cp "$export_symbols" "$output_objdir/$soname.def";
+            echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+          else
+            $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+          fi~
+          $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+          linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+          lt_tool_outputfile="@TOOL_OUTPUT@"~
+          case $lt_outputfile in
+            *.exe|*.EXE) ;;
+            *)
+              lt_outputfile=$lt_outputfile.exe
+              lt_tool_outputfile=$lt_tool_outputfile.exe
+              ;;
+          esac~
+          if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+            $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+            $RM "$lt_outputfile.manifest";
+          fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=.dll
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
+      ;;
+
+    darwin* | rhapsody*)
+      _LT_DARWIN_LINKER_FEATURES($1)
+      ;;
+
+    dgux*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
+    # support.  Future versions do this automatically, but an explicit c++rt0.o
+    # does not break anything, and helps significantly (at the cost of a little
+    # extra space).
+    freebsd2.2*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+    freebsd2.*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+    freebsd* | dragonfly*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    hpux9*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+
+      # hardcode_minus_L: Not really in the search PATH,
+      # but as the default location of the library.
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+      ;;
+
+    hpux10*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# hardcode_minus_L: Not really in the search PATH,
+	# but as the default location of the library.
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+      fi
+      ;;
+
+    hpux11*)
+      if test yes,no = "$GCC,$with_gnu_ld"; then
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+	  ;;
+	esac
+      fi
+      if test no = "$with_gnu_ld"; then
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	case $host_cpu in
+	hppa*64*|ia64*)
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  ;;
+	*)
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+
+	  # hardcode_minus_L: Not really in the search PATH,
+	  # but as the default location of the library.
+	  _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	  ;;
+	esac
+      fi
+      ;;
+
+    irix5* | irix6* | nonstopux*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	# Try to use the -exported_symbol ld option, if it does not
+	# work, assume that -exports_file does not work either and
+	# implicitly export all symbols.
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS=$LDFLAGS
+	   LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS=$save_LDFLAGS])
+	if test yes = "$lt_cv_irix_exported_symbol"; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
+	fi
+	_LT_TAGVAR(link_all_deplibs, $1)=no
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(inherit_rpath, $1)=yes
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    linux*)
+      case $cc_basename in
+      tcc*)
+	# Fabrice Bellard et al's Tiny C Compiler
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	;;
+      esac
+      ;;
+
+    netbsd* | netbsdelf*-gnu)
+      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    newsos6)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *nto* | *qnx*)
+      ;;
+
+    openbsd* | bitrig*)
+      if test -f /usr/libexec/ld.so; then
+	_LT_TAGVAR(hardcode_direct, $1)=yes
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	else
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	fi
+      else
+	_LT_TAGVAR(ld_shlibs, $1)=no
+      fi
+      ;;
+
+    os2*)
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+      shrext_cmds=.dll
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	$ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	$ECHO EXPORTS >> $output_objdir/$libname.def~
+	prefix_cmds="$SED"~
+	if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	  prefix_cmds="$prefix_cmds -e 1d";
+	fi~
+	prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	$CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	emximp -o $lib $output_objdir/$libname.def'
+      _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      ;;
+
+    osf3*)
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    osf4* | osf5*)	# as osf3* with the addition of -msym flag
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+      else
+	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
+          $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
+
+	# Both c and cxx compiler support -rpath directly
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+      fi
+      _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+      ;;
+
+    solaris*)
+      _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
+      if test yes = "$GCC"; then
+	wlarc='$wl'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+          $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+      else
+	case `$CC -V 2>&1` in
+	*"Compilers 5.0"*)
+	  wlarc=''
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+	  ;;
+	*)
+	  wlarc='$wl'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+            $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  ;;
+	esac
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      case $host_os in
+      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+      *)
+	# The compiler driver will combine and reorder linker options,
+	# but understands '-z linker_flag'.  GCC discards it without '$wl',
+	# but is careful enough not to reorder.
+	# Supported since Solaris 2.6 (maybe 2.5.1?)
+	if test yes = "$GCC"; then
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+	else
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	fi
+	;;
+      esac
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
+    sunos4*)
+      if test sequent = "$host_vendor"; then
+	# Use $CC to link under sequent, because it throws in some extra .o
+	# files that make .init and .fini sections work.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+      fi
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_direct, $1)=yes
+      _LT_TAGVAR(hardcode_minus_L, $1)=yes
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4)
+      case $host_vendor in
+	sni)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true???
+	;;
+	siemens)
+	  ## LD is ld it makes a PLAMLIB
+	  ## CC just makes a GrossModule.
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
+	  _LT_TAGVAR(hardcode_direct, $1)=no
+        ;;
+	motorola)
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	  _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
+	;;
+      esac
+      runpath_var='LD_RUN_PATH'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    sysv4.3*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
+      ;;
+
+    sysv4*MP*)
+      if test -d /usr/nec; then
+	_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	runpath_var=LD_RUN_PATH
+	hardcode_runpath_var=yes
+	_LT_TAGVAR(ld_shlibs, $1)=yes
+      fi
+      ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    sysv5* | sco3.2v5* | sco5v6*)
+      # Note: We CANNOT use -z defs as we might desire, because we do not
+      # link with -lc, and that would cause any symbols used from libc to
+      # always be unresolved, which means just about no library would
+      # ever link correctly.  If we're not using GNU ld we use -z text
+      # though, which does catch some bad symbols but isn't as heavy-handed
+      # as -z defs.
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+      _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+      runpath_var='LD_RUN_PATH'
+
+      if test yes = "$GCC"; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      else
+	_LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+      fi
+      ;;
+
+    uts4*)
+      _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      ;;
+
+    *)
+      _LT_TAGVAR(ld_shlibs, $1)=no
+      ;;
+    esac
+
+    if test sni = "$host_vendor"; then
+      case $host in
+      sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
+	;;
+      esac
+    fi
+  fi
+])
+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
+
+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl
+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl
+_LT_DECL([], [extract_expsyms_cmds], [2],
+    [The commands to extract the exported symbol list from a shared archive])
+
+#
+# Do we need to explicitly link libc?
+#
+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in
+x|xyes)
+  # Assume -lc should be added
+  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+
+  if test yes,yes = "$GCC,$enable_shared"; then
+    case $_LT_TAGVAR(archive_cmds, $1) in
+    *'~'*)
+      # FIXME: we may have to deal with multi-command sequences.
+      ;;
+    '$CC '*)
+      # Test whether the compiler implicitly links with -lc since on some
+      # systems, -lgcc has to come before -lc. If gcc already passes -lc
+      # to ld, don't add -lc before -lgcc.
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
+      ;;
+    esac
+  fi
+  ;;
+esac
+
+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0],
+    [Whether or not to add -lc for building shared libraries])
+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes],
+    [enable_shared_with_static_runtimes], [0],
+    [Whether or not to disallow shared libs when runtime libs are static])
+_LT_TAGDECL([], [export_dynamic_flag_spec], [1],
+    [Compiler flag to allow reflexive dlopens])
+_LT_TAGDECL([], [whole_archive_flag_spec], [1],
+    [Compiler flag to generate shared objects directly from archives])
+_LT_TAGDECL([], [compiler_needs_object], [1],
+    [Whether the compiler copes with passing no objects directly])
+_LT_TAGDECL([], [old_archive_from_new_cmds], [2],
+    [Create an old-style archive from a shared archive])
+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2],
+    [Create a temporary old-style archive to link instead of a shared archive])
+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive])
+_LT_TAGDECL([], [archive_expsym_cmds], [2])
+_LT_TAGDECL([], [module_cmds], [2],
+    [Commands used to build a loadable module if different from building
+    a shared archive.])
+_LT_TAGDECL([], [module_expsym_cmds], [2])
+_LT_TAGDECL([], [with_gnu_ld], [1],
+    [Whether we are building with GNU ld or not])
+_LT_TAGDECL([], [allow_undefined_flag], [1],
+    [Flag that allows shared libraries with undefined symbols to be built])
+_LT_TAGDECL([], [no_undefined_flag], [1],
+    [Flag that enforces no undefined symbols])
+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
+    [Flag to hardcode $libdir into a binary during linking.
+    This must work even if $libdir does not exist])
+_LT_TAGDECL([], [hardcode_libdir_separator], [1],
+    [Whether we need a single "-rpath" flag with a separated argument])
+_LT_TAGDECL([], [hardcode_direct], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary])
+_LT_TAGDECL([], [hardcode_direct_absolute], [0],
+    [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
+    DIR into the resulting binary and the resulting library dependency is
+    "absolute", i.e impossible to change by setting $shlibpath_var if the
+    library is relocated])
+_LT_TAGDECL([], [hardcode_minus_L], [0],
+    [Set to "yes" if using the -LDIR flag during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_shlibpath_var], [0],
+    [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR
+    into the resulting binary])
+_LT_TAGDECL([], [hardcode_automatic], [0],
+    [Set to "yes" if building a shared library automatically hardcodes DIR
+    into the library and all subsequent libraries and executables linked
+    against it])
+_LT_TAGDECL([], [inherit_rpath], [0],
+    [Set to yes if linker adds runtime paths of dependent libraries
+    to runtime path list])
+_LT_TAGDECL([], [link_all_deplibs], [0],
+    [Whether libtool must link a program against all its dependency libraries])
+_LT_TAGDECL([], [always_export_symbols], [0],
+    [Set to "yes" if exported symbols are required])
+_LT_TAGDECL([], [export_symbols_cmds], [2],
+    [The commands to list exported symbols])
+_LT_TAGDECL([], [exclude_expsyms], [1],
+    [Symbols that should not be listed in the preloaded symbols])
+_LT_TAGDECL([], [include_expsyms], [1],
+    [Symbols that must always be exported])
+_LT_TAGDECL([], [prelink_cmds], [2],
+    [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
+_LT_TAGDECL([], [file_list_spec], [1],
+    [Specify filename containing input files])
+dnl FIXME: Not yet implemented
+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1],
+dnl    [Compiler flag to generate thread safe objects])
+])# _LT_LINKER_SHLIBS
+
+
+# _LT_LANG_C_CONFIG([TAG])
+# ------------------------
+# Ensure that the configuration variables for a C compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_C_CONFIG],
+[m4_require([_LT_DECL_EGREP])dnl
+lt_save_CC=$CC
+AC_LANG_PUSH(C)
+
+# Source file extension for C test sources.
+ac_ext=c
+
+# Object file extension for compiled C test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="int some_variable = 0;"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='int main(){return(0);}'
+
+_LT_TAG_COMPILER
+# Save the default compiler, since it gets overwritten when the other
+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP.
+compiler_DEFAULT=$CC
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_SYS_DYNAMIC_LINKER($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+  LT_SYS_DLOPEN_SELF
+  _LT_CMD_STRIPLIB
+
+  # Report what library types will actually be built
+  AC_MSG_CHECKING([if libtool supports shared libraries])
+  AC_MSG_RESULT([$can_build_shared])
+
+  AC_MSG_CHECKING([whether to build shared libraries])
+  test no = "$can_build_shared" && enable_shared=no
+
+  # On AIX, shared libraries and static libraries use the same namespace, and
+  # are all built from PIC.
+  case $host_os in
+  aix3*)
+    test yes = "$enable_shared" && enable_static=no
+    if test -n "$RANLIB"; then
+      archive_cmds="$archive_cmds~\$RANLIB \$lib"
+      postinstall_cmds='$RANLIB $lib'
+    fi
+    ;;
+
+  aix[[4-9]]*)
+    if test ia64 != "$host_cpu"; then
+      case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+      yes,aix,yes) ;;			# shared object as lib.so file only
+      yes,svr4,*) ;;			# shared object as lib.so archive member only
+      yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+      esac
+    fi
+    ;;
+  esac
+  AC_MSG_RESULT([$enable_shared])
+
+  AC_MSG_CHECKING([whether to build static libraries])
+  # Make sure either enable_shared or enable_static is yes.
+  test yes = "$enable_shared" || enable_static=yes
+  AC_MSG_RESULT([$enable_static])
+
+  _LT_CONFIG($1)
+fi
+AC_LANG_POP
+CC=$lt_save_CC
+])# _LT_LANG_C_CONFIG
+
+
+# _LT_LANG_CXX_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a C++ compiler are suitably
+# defined.  These variables are subsequently used by _LT_CONFIG to write
+# the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_CXX_CONFIG],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test no != "$CXX" &&
+    ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+    (test g++ != "$CXX"))); then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
+
+AC_LANG_PUSH(C++)
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(compiler_needs_object, $1)=no
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for C++ test sources.
+ac_ext=cpp
+
+# Object file extension for compiled C++ test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the CXX compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_caught_CXX_error"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="int some_variable = 0;"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
+  lt_save_LD=$LD
+  lt_save_GCC=$GCC
+  GCC=$GXX
+  lt_save_with_gnu_ld=$with_gnu_ld
+  lt_save_path_LD=$lt_cv_path_LD
+  if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+    lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+  else
+    $as_unset lt_cv_prog_gnu_ld
+  fi
+  if test -n "${lt_cv_path_LDCXX+set}"; then
+    lt_cv_path_LD=$lt_cv_path_LDCXX
+  else
+    $as_unset lt_cv_path_LD
+  fi
+  test -z "${LDCXX+set}" || LD=$LDCXX
+  CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    # We don't want -fno-exception when compiling C++ code, so set the
+    # no_builtin_flag separately
+    if test yes = "$GXX"; then
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+    else
+      _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
+    fi
+
+    if test yes = "$GXX"; then
+      # Set up default GNU C++ configuration
+
+      LT_PATH_LD
+
+      # Check if GNU C++ uses GNU ld as the underlying linker, since the
+      # archiving commands below assume that GNU ld is being used.
+      if test yes = "$with_gnu_ld"; then
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+        # If archive_cmds runs LD, not CC, wlarc should be empty
+        # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
+        #     investigate it a little bit more. (MM)
+        wlarc='$wl'
+
+        # ancient GNU ld didn't support --whole-archive et. al.
+        if eval "`$CC -print-prog-name=ld` --help 2>&1" |
+	  $GREP 'no-whole-archive' > /dev/null; then
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+        else
+          _LT_TAGVAR(whole_archive_flag_spec, $1)=
+        fi
+      else
+        with_gnu_ld=no
+        wlarc=
+
+        # A generic and very simple default shared library creation
+        # command for GNU C++ for the case where it uses the native
+        # linker, instead of GNU ld.  If possible, this setting should
+        # overridden to take advantage of the native linker features on
+        # the platform it is being used on.
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+      fi
+
+      # Commands to make compiler produce verbose output that lists
+      # what "hidden" libraries, object files and flags are used when
+      # linking a shared library.
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+    else
+      GXX=no
+      with_gnu_ld=no
+      wlarc=
+    fi
+
+    # PORTME: fill in a description of your system's C++ link characteristics
+    AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+    _LT_TAGVAR(ld_shlibs, $1)=yes
+    case $host_os in
+      aix3*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+      aix[[4-9]]*)
+        if test ia64 = "$host_cpu"; then
+          # On IA64, the linker does run time linking by default, so we don't
+          # have to do anything special.
+          aix_use_runtimelinking=no
+          exp_sym_flag='-Bexport'
+          no_entry_flag=
+        else
+          aix_use_runtimelinking=no
+
+          # Test if we are trying to use run time linking or normal
+          # AIX style linking. If -brtl is somewhere in LDFLAGS, we
+          # have runtime linking enabled, and use it for executables.
+          # For shared libraries, we enable/disable runtime linking
+          # depending on the kind of the shared library created -
+          # when "with_aix_soname,aix_use_runtimelinking" is:
+          # "aix,no"   lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "aix,yes"  lib.so          shared, rtl:yes, for executables
+          #            lib.a           static archive
+          # "both,no"  lib.so.V(shr.o) shared, rtl:yes
+          #            lib.a(lib.so.V) shared, rtl:no,  for executables
+          # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a(lib.so.V) shared, rtl:no
+          # "svr4,*"   lib.so.V(shr.o) shared, rtl:yes, for executables
+          #            lib.a           static archive
+          case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
+	    for ld_flag in $LDFLAGS; do
+	      case $ld_flag in
+	      *-brtl*)
+	        aix_use_runtimelinking=yes
+	        break
+	        ;;
+	      esac
+	    done
+	    if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+	      # With aix-soname=svr4, we create the lib.so.V shared archives only,
+	      # so we don't have lib.a shared libs to link our executables.
+	      # We have to force runtime linking in this case.
+	      aix_use_runtimelinking=yes
+	      LDFLAGS="$LDFLAGS -Wl,-brtl"
+	    fi
+	    ;;
+          esac
+
+          exp_sym_flag='-bexport'
+          no_entry_flag='-bnoentry'
+        fi
+
+        # When large executables or shared objects are built, AIX ld can
+        # have problems creating the table of contents.  If linking a library
+        # or program results in "error TOC overflow" add -mminimal-toc to
+        # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
+        # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
+
+        _LT_TAGVAR(archive_cmds, $1)=''
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+        case $with_aix_soname,$aix_use_runtimelinking in
+        aix,*) ;;	# no import file
+        svr4,* | *,yes) # use import file
+          # The Import File defines what to hardcode.
+          _LT_TAGVAR(hardcode_direct, $1)=no
+          _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+          ;;
+        esac
+
+        if test yes = "$GXX"; then
+          case $host_os in aix4.[[012]]|aix4.[[012]].*)
+          # We only want to do this on AIX 4.2 and lower, the check
+          # below for broken collect2 doesn't work under 4.3+
+	  collect2name=`$CC -print-prog-name=collect2`
+	  if test -f "$collect2name" &&
+	     strings "$collect2name" | $GREP resolve_lib_name >/dev/null
+	  then
+	    # We have reworked collect2
+	    :
+	  else
+	    # We have old collect2
+	    _LT_TAGVAR(hardcode_direct, $1)=unsupported
+	    # It fails to find uninstalled libraries when the uninstalled
+	    # path is not listed in the libpath.  Setting hardcode_minus_L
+	    # to unsupported forces relinking
+	    _LT_TAGVAR(hardcode_minus_L, $1)=yes
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=
+	  fi
+          esac
+          shared_flag='-shared'
+	  if test yes = "$aix_use_runtimelinking"; then
+	    shared_flag=$shared_flag' $wl-G'
+	  fi
+	  # Need to ensure runtime linking is disabled for the traditional
+	  # shared library, or the linker may eventually find shared libraries
+	  # /with/ Import File - we do not want to mix them.
+	  shared_flag_aix='-shared'
+	  shared_flag_svr4='-shared $wl-G'
+        else
+          # not using gcc
+          if test ia64 = "$host_cpu"; then
+	  # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
+	  # chokes on -Wl,-G. The following line is correct:
+	  shared_flag='-G'
+          else
+	    if test yes = "$aix_use_runtimelinking"; then
+	      shared_flag='$wl-G'
+	    else
+	      shared_flag='$wl-bM:SRE'
+	    fi
+	    shared_flag_aix='$wl-bM:SRE'
+	    shared_flag_svr4='$wl-G'
+          fi
+        fi
+
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
+        # It seems that -bexpall does not export symbols beginning with
+        # underscore (_), so it is better to generate a list of symbols to
+	# export.
+        _LT_TAGVAR(always_export_symbols, $1)=yes
+	if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
+          # Warning - without using the other runtime loading flags (-brtl),
+          # -berok will link without error, but may produce a broken library.
+          # The "-G" linker flag allows undefined symbols.
+          _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
+          # Determine the default libpath from the value encoded in an empty
+          # executable.
+          _LT_SYS_MODULE_PATH_AIX([$1])
+          _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
+        else
+          if test ia64 = "$host_cpu"; then
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
+	    _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
+          else
+	    # Determine the default libpath from the value encoded in an
+	    # empty executable.
+	    _LT_SYS_MODULE_PATH_AIX([$1])
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+	    # Warning - without using the other run time loading flags,
+	    # -berok will link without error, but may produce a broken library.
+	    _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+	    _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+	    if test yes = "$with_gnu_ld"; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+	    # -brtl affects multiple linker settings, -berok does not and is overridden later
+	    compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+	    if test svr4 != "$with_aix_soname"; then
+	      # This is similar to how AIX traditionally builds its shared
+	      # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+	    fi
+	    if test aix != "$with_aix_soname"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+	    else
+	      # used by -dlpreopen to get the symbols
+	      _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV  $output_objdir/$realname.d/$soname $output_objdir'
+	    fi
+	    _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
+          fi
+        fi
+        ;;
+
+      beos*)
+	if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+	  # support --undefined.  This deserves some investigation.  FIXME
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      chorus*)
+        case $cc_basename in
+          *)
+	  # FIXME: insert proper C++ library support
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	  ;;
+        esac
+        ;;
+
+      cygwin* | mingw* | pw32* | cegcc*)
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=.dll
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp "$export_symbols" "$output_objdir/$soname.def";
+              echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+            else
+              $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+            fi~
+            $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+            linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+            lt_tool_outputfile="@TOOL_OUTPUT@"~
+            case $lt_outputfile in
+              *.exe|*.EXE) ;;
+              *)
+                lt_outputfile=$lt_outputfile.exe
+                lt_tool_outputfile=$lt_tool_outputfile.exe
+                ;;
+            esac~
+            func_to_tool_file "$lt_outputfile"~
+            if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+              $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+              $RM "$lt_outputfile.manifest";
+            fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file, use it as
+	    # is; otherwise, prepend EXPORTS...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+              cp $export_symbols $output_objdir/$soname.def;
+            else
+              echo EXPORTS > $output_objdir/$soname.def;
+              cat $export_symbols >> $output_objdir/$soname.def;
+            fi~
+            $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
+      darwin* | rhapsody*)
+        _LT_DARWIN_LINKER_FEATURES($1)
+	;;
+
+      os2*)
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	_LT_TAGVAR(hardcode_minus_L, $1)=yes
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	shrext_cmds=.dll
+	_LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+	  $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+	  $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+	  $ECHO EXPORTS >> $output_objdir/$libname.def~
+	  prefix_cmds="$SED"~
+	  if test EXPORTS = "`$SED 1q $export_symbols`"; then
+	    prefix_cmds="$prefix_cmds -e 1d";
+	  fi~
+	  prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+	  cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+	  $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+	  emximp -o $lib $output_objdir/$libname.def'
+	_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+
+      dgux*)
+        case $cc_basename in
+          ec++*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          ghcx*)
+	    # Green Hills C++ Compiler
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      freebsd2.*)
+        # C++ shared libraries reported to be fairly broken before
+	# switch to ELF
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      freebsd-elf*)
+        _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+        ;;
+
+      freebsd* | dragonfly*)
+        # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+        # conventions
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+        ;;
+
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
+        ;;
+
+      hpux9*)
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+        _LT_TAGVAR(hardcode_direct, $1)=yes
+        _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+				             # but as the default
+				             # location of the library.
+
+        case $cc_basename in
+          CC*)
+            # FIXME: insert proper C++ library support
+            _LT_TAGVAR(ld_shlibs, $1)=no
+            ;;
+          aCC*)
+            _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            # Commands to make compiler produce verbose output that lists
+            # what "hidden" libraries, object files and flags are used when
+            # linking a shared library.
+            #
+            # There doesn't appear to be a way to prevent this compiler from
+            # explicitly linking system object files so we need to strip them
+            # from the output so that they don't get included in the library
+            # dependencies.
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            ;;
+          *)
+            if test yes = "$GXX"; then
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
+            else
+              # FIXME: insert proper C++ library support
+              _LT_TAGVAR(ld_shlibs, $1)=no
+            fi
+            ;;
+        esac
+        ;;
+
+      hpux10*|hpux11*)
+        if test no = "$with_gnu_ld"; then
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
+	  _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+          case $host_cpu in
+            hppa*64*|ia64*)
+              ;;
+            *)
+	      _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+              ;;
+          esac
+        fi
+        case $host_cpu in
+          hppa*64*|ia64*)
+            _LT_TAGVAR(hardcode_direct, $1)=no
+            _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+            ;;
+          *)
+            _LT_TAGVAR(hardcode_direct, $1)=yes
+            _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+            _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+					         # but as the default
+					         # location of the library.
+            ;;
+        esac
+
+        case $cc_basename in
+          CC*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          aCC*)
+	    case $host_cpu in
+	      hppa*64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      ia64*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	      *)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	        ;;
+	    esac
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        case $host_cpu in
+	          hppa*64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          ia64*)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	          *)
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            ;;
+	        esac
+	      fi
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      interix[[3-9]]*)
+	_LT_TAGVAR(hardcode_direct, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
+	# Instead, shared libraries are loaded at an image base (0x10000000 by
+	# default) and relocated if they conflict, which is a slow very memory
+	# consuming and fragmenting process.  To avoid this, we pick a random,
+	# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
+	# time.  Moving up from 0x10000000 also allows more sbrk(2) space.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+	;;
+      irix5* | irix6*)
+        case $cc_basename in
+          CC*)
+	    # SGI C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    if test yes = "$GXX"; then
+	      if test no = "$with_gnu_ld"; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+	      else
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
+	      fi
+	    fi
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+	    ;;
+        esac
+        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+        _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+        _LT_TAGVAR(inherit_rpath, $1)=yes
+        ;;
+
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+	    ;;
+	  icpc* | ecpc* )
+	    # Intel C++
+	    with_gnu_ld=yes
+	    # version 8.0 and above of icpc choke on multiply defined symbols
+	    # if we add $predep_objects and $postdep_objects, however 7.1 and
+	    # earlier do not add the objects themselves.
+	    case `$CC -V 2>&1` in
+	      *"Version 7."*)
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	      *)  # Version 8.0 or newer
+	        tmp_idyn=
+	        case $host_cpu in
+		  ia64*) tmp_idyn=' -i_dynamic';;
+		esac
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+		_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+		;;
+	    esac
+	    _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
+	    ;;
+          pgCC* | pgcpp*)
+            # Portland Group C++ compiler
+	    case `$CC -V` in
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
+	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
+               rm -rf $tpldir~
+               $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+               compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+                $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+                $RANLIB $oldlib'
+	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
+                rm -rf $tpldir~
+                $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+                $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    *) # Version 6 and above use weak symbols
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	      ;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+            ;;
+	  cxx*)
+	    # Compaq C++
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
+
+	    runpath_var=LD_RUN_PATH
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+	    ;;
+	  xl* | mpixl* | bgxl*)
+	    # IBM XL 8.0 on PPC, with GNU ld
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+	    if test yes = "$supports_anon_versioning"; then
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
+                cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+                echo "local: *; };" >> $output_objdir/$libname.ver~
+                $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
+	    fi
+	    ;;
+	  *)
+	    case `$CC -V 2>&1 | sed 5q` in
+	    *Sun\ C*)
+	      # Sun C++ 5.9
+	      _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	      _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
+	      _LT_TAGVAR(compiler_needs_object, $1)=yes
+
+	      # Not sure whether something based on
+	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
+	      # would be better.
+	      output_verbose_link_cmd='func_echo_all'
+
+	      # Archives containing C++ object files must be created using
+	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	      # necessary to make sure instantiated templates are included
+	      # in the archive.
+	      _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	      ;;
+	    esac
+	    ;;
+	esac
+	;;
+
+      lynxos*)
+        # FIXME: insert proper C++ library support
+	_LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      m88k*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+	;;
+
+      mvs*)
+        case $cc_basename in
+          cxx*)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	  *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+	esac
+	;;
+
+      netbsd*)
+        if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+	  wlarc=
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	fi
+	# Workaround some broken pre-1.5 toolchains
+	output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+	;;
+
+      *nto* | *qnx*)
+        _LT_TAGVAR(ld_shlibs, $1)=yes
+	;;
+
+      openbsd* | bitrig*)
+	if test -f /usr/libexec/ld.so; then
+	  _LT_TAGVAR(hardcode_direct, $1)=yes
+	  _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	  _LT_TAGVAR(hardcode_direct_absolute, $1)=yes
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
+	  fi
+	  output_verbose_link_cmd=func_echo_all
+	else
+	  _LT_TAGVAR(ld_shlibs, $1)=no
+	fi
+	;;
+
+      osf3* | osf4* | osf5*)
+        case $cc_basename in
+          KCC*)
+	    # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+	    # KCC will only create a shared library if the output file
+	    # ends with ".so" (or ".sl" for HP-UX), so rename the library
+	    # to its proper name (with version) after linking.
+	    _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Archives containing C++ object files must be created using
+	    # the KAI C++ compiler.
+	    case $host in
+	      osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;;
+	      *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;;
+	    esac
+	    ;;
+          RCC*)
+	    # Rational C++ 2.4.1
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          cxx*)
+	    case $host in
+	      osf3*)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+		;;
+	      *)
+	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+                  echo "-hidden">> $lib.exp~
+                  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+                  $RM $lib.exp'
+	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+		;;
+	    esac
+
+	    _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	    # Commands to make compiler produce verbose output that lists
+	    # what "hidden" libraries, object files and flags are used when
+	    # linking a shared library.
+	    #
+	    # There doesn't appear to be a way to prevent this compiler from
+	    # explicitly linking system object files so we need to strip them
+	    # from the output so that they don't get included in the library
+	    # dependencies.
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    ;;
+	  *)
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+	      case $host in
+	        osf3*)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	        *)
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+		  ;;
+	      esac
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+	      _LT_TAGVAR(hardcode_libdir_separator, $1)=:
+
+	      # Commands to make compiler produce verbose output that lists
+	      # what "hidden" libraries, object files and flags are used when
+	      # linking a shared library.
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+
+	    else
+	      # FIXME: insert proper C++ library support
+	      _LT_TAGVAR(ld_shlibs, $1)=no
+	    fi
+	    ;;
+        esac
+        ;;
+
+      psos*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      sunos4*)
+        case $cc_basename in
+          CC*)
+	    # Sun C++ 4.x
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          lcc*)
+	    # Lucid
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      solaris*)
+        case $cc_basename in
+          CC* | sunCC*)
+	    # Sun C++ 4.2, 5.x and Centerline C++
+            _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
+	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+              $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+	    _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	    case $host_os in
+	      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+	      *)
+		# The compiler driver will combine and reorder linker options,
+		# but understands '-z linker_flag'.
+	        # Supported since Solaris 2.6 (maybe 2.5.1?)
+		_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+	        ;;
+	    esac
+	    _LT_TAGVAR(link_all_deplibs, $1)=yes
+
+	    output_verbose_link_cmd='func_echo_all'
+
+	    # Archives containing C++ object files must be created using
+	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
+	    # necessary to make sure instantiated templates are included
+	    # in the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+	    ;;
+          gcx*)
+	    # Green Hills C++ Compiler
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+
+	    # The C++ compiler must be used to create the archive.
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+	    ;;
+          *)
+	    # GNU C++ compiler with Solaris linker
+	    if test yes,no = "$GXX,$with_gnu_ld"; then
+	      _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
+	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      else
+	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
+	        # platform.
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
+                  $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+
+	        # Commands to make compiler produce verbose output that lists
+	        # what "hidden" libraries, object files and flags are used when
+	        # linking a shared library.
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      fi
+
+	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
+	      case $host_os in
+		solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+		*)
+		  _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
+		  ;;
+	      esac
+	    fi
+	    ;;
+        esac
+        ;;
+
+    sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
+      _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=no
+      _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+      runpath_var='LD_RUN_PATH'
+
+      case $cc_basename in
+        CC*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+      esac
+      ;;
+
+      sysv5* | sco3.2v5* | sco5v6*)
+	# Note: We CANNOT use -z defs as we might desire, because we do not
+	# link with -lc, and that would cause any symbols used from libc to
+	# always be unresolved, which means just about no library would
+	# ever link correctly.  If we're not using GNU ld we use -z text
+	# though, which does catch some bad symbols but isn't as heavy-handed
+	# as -z defs.
+	_LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+	_LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
+	_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
+	_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
+	_LT_TAGVAR(link_all_deplibs, $1)=yes
+	_LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
+	runpath_var='LD_RUN_PATH'
+
+	case $cc_basename in
+          CC*)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+              '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+              '"$_LT_TAGVAR(reload_cmds, $1)"
+	    ;;
+	  *)
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    ;;
+	esac
+      ;;
+
+      tandem*)
+        case $cc_basename in
+          NCC*)
+	    # NonStop-UX NCC 3.20
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+          *)
+	    # FIXME: insert proper C++ library support
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	    ;;
+        esac
+        ;;
+
+      vxworks*)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+
+      *)
+        # FIXME: insert proper C++ library support
+        _LT_TAGVAR(ld_shlibs, $1)=no
+        ;;
+    esac
+
+    AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
+    test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
+
+    _LT_TAGVAR(GCC, $1)=$GXX
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+  LDCXX=$LD
+  LD=$lt_save_LD
+  GCC=$lt_save_GCC
+  with_gnu_ld=$lt_save_with_gnu_ld
+  lt_cv_path_LDCXX=$lt_cv_path_LD
+  lt_cv_path_LD=$lt_save_path_LD
+  lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
+  lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
+fi # test yes != "$_lt_caught_CXX_error"
+
+AC_LANG_POP
+])# _LT_LANG_CXX_CONFIG
+
+
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case @S|@2 in
+  .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+  *)  func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
+
+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
+# ---------------------------------
+# Figure out "hidden" library dependencies from verbose
+# compiler output when linking a shared library.
+# Parse the compiler output and extract the necessary
+# objects, libraries and library flags.
+m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
+# Dependencies to place before and after the object being linked:
+_LT_TAGVAR(predep_objects, $1)=
+_LT_TAGVAR(postdep_objects, $1)=
+_LT_TAGVAR(predeps, $1)=
+_LT_TAGVAR(postdeps, $1)=
+_LT_TAGVAR(compiler_lib_search_path, $1)=
+
+dnl we can't use the lt_simple_compile_test_code here,
+dnl because it contains code intended for an executable,
+dnl not a library.  It's possible we should let each
+dnl tag define a new lt_????_link_test_code variable,
+dnl but it's only used here...
+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF
+int a;
+void foo (void) { a = 0; }
+_LT_EOF
+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF
+class Foo
+{
+public:
+  Foo (void) { a = 0; }
+private:
+  int a;
+};
+_LT_EOF
+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer*4 a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF
+      subroutine foo
+      implicit none
+      integer a
+      a=0
+      return
+      end
+_LT_EOF
+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF
+public class foo {
+  private int a;
+  public void bar (void) {
+    a = 0;
+  }
+};
+_LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
+])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
+dnl Parse the compiler output and extract the necessary
+dnl objects, libraries and library flags.
+if AC_TRY_EVAL(ac_compile); then
+  # Parse the compiler output and extract the necessary
+  # objects, libraries and library flags.
+
+  # Sentinel used to keep track of whether or not we are before
+  # the conftest object file.
+  pre_test_object_deps_done=no
+
+  for p in `eval "$output_verbose_link_cmd"`; do
+    case $prev$p in
+
+    -L* | -R* | -l*)
+       # Some compilers place space between "-{L,R}" and the path.
+       # Remove the space.
+       if test x-L = "$p" ||
+          test x-R = "$p"; then
+	 prev=$p
+	 continue
+       fi
+
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
+       if test no = "$pre_test_object_deps_done"; then
+	 case $prev in
+	 -L | -R)
+	   # Internal compiler library paths should come after those
+	   # provided the user.  The postdeps already come after the
+	   # user supplied libs so there is no need to process them.
+	   if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
+	     _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
+	   else
+	     _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
+	   fi
+	   ;;
+	 # The "-l" case would never come before the object being
+	 # linked, so don't bother handling this case.
+	 esac
+       else
+	 if test -z "$_LT_TAGVAR(postdeps, $1)"; then
+	   _LT_TAGVAR(postdeps, $1)=$prev$p
+	 else
+	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
+	 fi
+       fi
+       prev=
+       ;;
+
+    *.lto.$objext) ;; # Ignore GCC LTO objects
+    *.$objext)
+       # This assumes that the test object file only shows up
+       # once in the compiler output.
+       if test "$p" = "conftest.$objext"; then
+	 pre_test_object_deps_done=yes
+	 continue
+       fi
+
+       if test no = "$pre_test_object_deps_done"; then
+	 if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
+	   _LT_TAGVAR(predep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
+	 fi
+       else
+	 if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
+	   _LT_TAGVAR(postdep_objects, $1)=$p
+	 else
+	   _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
+	 fi
+       fi
+       ;;
+
+    *) ;; # Ignore the rest.
+
+    esac
+  done
+
+  # Clean up.
+  rm -f a.out a.exe
+else
+  echo "libtool.m4: error: problem compiling $1 test program"
+fi
+
+$RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
+
+# PORTME: override above test on systems where it is broken
+m4_if([$1], [CXX],
+[case $host_os in
+interix[[3-9]]*)
+  # Interix 3.5 installs completely hosed .la files for C++, so rather than
+  # hack all around it, let's just trust "g++" to DTRT.
+  _LT_TAGVAR(predep_objects,$1)=
+  _LT_TAGVAR(postdep_objects,$1)=
+  _LT_TAGVAR(postdeps,$1)=
+  ;;
+esac
+])
+
+case " $_LT_TAGVAR(postdeps, $1) " in
+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+esac
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=
+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
+fi
+_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
+    [The directories searched by this compiler when creating a shared library])
+_LT_TAGDECL([], [predep_objects], [1],
+    [Dependencies to place before and after the objects being linked to
+    create a shared library])
+_LT_TAGDECL([], [postdep_objects], [1])
+_LT_TAGDECL([], [predeps], [1])
+_LT_TAGDECL([], [postdeps], [1])
+_LT_TAGDECL([], [compiler_lib_search_path], [1],
+    [The library search path used internally by the compiler when linking
+    a shared library])
+])# _LT_SYS_HIDDEN_LIBDEPS
+
+
+# _LT_LANG_F77_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for a Fortran 77 compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_F77_CONFIG],
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test no = "$F77"; then
+  _lt_disable_F77=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for f77 test sources.
+ac_ext=f
+
+# Object file extension for compiled f77 test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the F77 compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_F77"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
+  compiler=$CC
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+  GCC=$G77
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$G77
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
+
+AC_LANG_POP
+])# _LT_LANG_F77_CONFIG
+
+
+# _LT_LANG_FC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for a Fortran compiler are
+# suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_FC_CONFIG],
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test no = "$FC"; then
+  _lt_disable_FC=yes
+fi
+
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+_LT_TAGVAR(allow_undefined_flag, $1)=
+_LT_TAGVAR(always_export_symbols, $1)=no
+_LT_TAGVAR(archive_expsym_cmds, $1)=
+_LT_TAGVAR(export_dynamic_flag_spec, $1)=
+_LT_TAGVAR(hardcode_direct, $1)=no
+_LT_TAGVAR(hardcode_direct_absolute, $1)=no
+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
+_LT_TAGVAR(hardcode_libdir_separator, $1)=
+_LT_TAGVAR(hardcode_minus_L, $1)=no
+_LT_TAGVAR(hardcode_automatic, $1)=no
+_LT_TAGVAR(inherit_rpath, $1)=no
+_LT_TAGVAR(module_cmds, $1)=
+_LT_TAGVAR(module_expsym_cmds, $1)=
+_LT_TAGVAR(link_all_deplibs, $1)=unknown
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+_LT_TAGVAR(no_undefined_flag, $1)=
+_LT_TAGVAR(whole_archive_flag_spec, $1)=
+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
+
+# Source file extension for fc test sources.
+ac_ext=${ac_fc_srcext-f}
+
+# Object file extension for compiled fc test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# No sense in running all these tests if we already determined that
+# the FC compiler isn't working.  Some variables (like enable_shared)
+# are currently assumed to apply to all compilers on this platform,
+# and will be corrupted by setting them based on a non-working compiler.
+if test yes != "$_lt_disable_FC"; then
+  # Code to be used in simple compile tests
+  lt_simple_compile_test_code="\
+      subroutine t
+      return
+      end
+"
+
+  # Code to be used in simple link tests
+  lt_simple_link_test_code="\
+      program t
+      end
+"
+
+  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+  _LT_TAG_COMPILER
+
+  # save warnings/boilerplate of simple test code
+  _LT_COMPILER_BOILERPLATE
+  _LT_LINKER_BOILERPLATE
+
+  # Allow CC to be a program name with arguments.
+  lt_save_CC=$CC
+  lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
+  CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
+  compiler=$CC
+  GCC=$ac_cv_fc_compiler_gnu
+
+  _LT_TAGVAR(compiler, $1)=$CC
+  _LT_CC_BASENAME([$compiler])
+
+  if test -n "$compiler"; then
+    AC_MSG_CHECKING([if libtool supports shared libraries])
+    AC_MSG_RESULT([$can_build_shared])
+
+    AC_MSG_CHECKING([whether to build shared libraries])
+    test no = "$can_build_shared" && enable_shared=no
+
+    # On AIX, shared libraries and static libraries use the same namespace, and
+    # are all built from PIC.
+    case $host_os in
+      aix3*)
+        test yes = "$enable_shared" && enable_static=no
+        if test -n "$RANLIB"; then
+          archive_cmds="$archive_cmds~\$RANLIB \$lib"
+          postinstall_cmds='$RANLIB $lib'
+        fi
+        ;;
+      aix[[4-9]]*)
+	if test ia64 != "$host_cpu"; then
+	  case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+	  yes,aix,yes) ;;		# shared object as lib.so file only
+	  yes,svr4,*) ;;		# shared object as lib.so archive member only
+	  yes,*) enable_static=no ;;	# shared object in lib.a archive as well
+	  esac
+	fi
+        ;;
+    esac
+    AC_MSG_RESULT([$enable_shared])
+
+    AC_MSG_CHECKING([whether to build static libraries])
+    # Make sure either enable_shared or enable_static is yes.
+    test yes = "$enable_shared" || enable_static=yes
+    AC_MSG_RESULT([$enable_static])
+
+    _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+    _LT_TAGVAR(LD, $1)=$LD
+
+    ## CAVEAT EMPTOR:
+    ## There is no encapsulation within the following macros, do not change
+    ## the running order or otherwise move them around unless you know exactly
+    ## what you are doing...
+    _LT_SYS_HIDDEN_LIBDEPS($1)
+    _LT_COMPILER_PIC($1)
+    _LT_COMPILER_C_O($1)
+    _LT_COMPILER_FILE_LOCKS($1)
+    _LT_LINKER_SHLIBS($1)
+    _LT_SYS_DYNAMIC_LINKER($1)
+    _LT_LINKER_HARDCODE_LIBPATH($1)
+
+    _LT_CONFIG($1)
+  fi # test -n "$compiler"
+
+  GCC=$lt_save_GCC
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_FC"
+
+AC_LANG_POP
+])# _LT_LANG_FC_CONFIG
+
+
+# _LT_LANG_GCJ_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Java Compiler compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GCJ_CONFIG],
+[AC_REQUIRE([LT_PROG_GCJ])dnl
+AC_LANG_SAVE
+
+# Source file extension for Java test sources.
+ac_ext=java
+
+# Object file extension for compiled Java test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="class foo {}"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# GCJ did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GCJ_CONFIG
+
+
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)=$LD
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+## CAVEAT EMPTOR:
+## There is no encapsulation within the following macros, do not change
+## the running order or otherwise move them around unless you know exactly
+## what you are doing...
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
+# _LT_LANG_RC_CONFIG([TAG])
+# -------------------------
+# Ensure that the configuration variables for the Windows resource compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to 'libtool'.
+m4_defun([_LT_LANG_RC_CONFIG],
+[AC_REQUIRE([LT_PROG_RC])dnl
+AC_LANG_SAVE
+
+# Source file extension for RC test sources.
+ac_ext=rc
+
+# Object file extension for compiled RC test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+# Code to be used in simple link tests
+lt_simple_link_test_code=$lt_simple_compile_test_code
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=
+CC=${RC-"windres"}
+CFLAGS=
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_CC_BASENAME([$compiler])
+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+if test -n "$compiler"; then
+  :
+  _LT_CONFIG($1)
+fi
+
+GCC=$lt_save_GCC
+AC_LANG_RESTORE
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_RC_CONFIG
+
+
+# LT_PROG_GCJ
+# -----------
+AC_DEFUN([LT_PROG_GCJ],
+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
+  [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
+    [AC_CHECK_TOOL(GCJ, gcj,)
+      test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
+      AC_SUBST(GCJFLAGS)])])[]dnl
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
+
+
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
+# LT_PROG_RC
+# ----------
+AC_DEFUN([LT_PROG_RC],
+[AC_CHECK_TOOL(RC, windres,)
+])
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_RC], [])
+
+
+# _LT_DECL_EGREP
+# --------------
+# If we don't have a new enough Autoconf to choose the best grep
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_EGREP],
+[AC_REQUIRE([AC_PROG_EGREP])dnl
+AC_REQUIRE([AC_PROG_FGREP])dnl
+test -z "$GREP" && GREP=grep
+_LT_DECL([], [GREP], [1], [A grep program that handles long lines])
+_LT_DECL([], [EGREP], [1], [An ERE matcher])
+_LT_DECL([], [FGREP], [1], [A literal string matcher])
+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too
+AC_SUBST([GREP])
+])
+
+
+# _LT_DECL_OBJDUMP
+# --------------
+# If we don't have a new enough Autoconf to choose the best objdump
+# available, choose the one first in the user's PATH.
+m4_defun([_LT_DECL_OBJDUMP],
+[AC_CHECK_TOOL(OBJDUMP, objdump, false)
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper])
+AC_SUBST([OBJDUMP])
+])
+
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
+
+# _LT_DECL_SED
+# ------------
+# Check for a fully-functional sed program, that truncates
+# as few characters as possible.  Prefer GNU sed if found.
+m4_defun([_LT_DECL_SED],
+[AC_PROG_SED
+test -z "$SED" && SED=sed
+Xsed="$SED -e 1s/^X//"
+_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
+    [Sed that helps us avoid accidentally triggering echo(1) options like -n])
+])# _LT_DECL_SED
+
+m4_ifndef([AC_PROG_SED], [
+############################################################
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+############################################################
+
+m4_defun([AC_PROG_SED],
+[AC_MSG_CHECKING([for a sed that does not truncate output])
+AC_CACHE_VAL(lt_cv_path_SED,
+[# Loop through the user's path and test for sed and gsed.
+# Then use that list of sed's as ones to test for truncation.
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for lt_ac_prog in sed gsed; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
+      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
+        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+      fi
+    done
+  done
+done
+IFS=$as_save_IFS
+lt_ac_max=0
+lt_ac_count=0
+# Add /usr/xpg4/bin/sed as it is typically found on Solaris
+# along with /bin/sed that truncates output.
+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+  test ! -f "$lt_ac_sed" && continue
+  cat /dev/null > conftest.in
+  lt_ac_count=0
+  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+  # Check for GNU sed and select it if it is found.
+  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
+    lt_cv_path_SED=$lt_ac_sed
+    break
+  fi
+  while true; do
+    cat conftest.in conftest.in >conftest.tmp
+    mv conftest.tmp conftest.in
+    cp conftest.in conftest.nl
+    echo >>conftest.nl
+    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
+    cmp -s conftest.out conftest.nl || break
+    # 10000 chars as input seems more than enough
+    test 10 -lt "$lt_ac_count" && break
+    lt_ac_count=`expr $lt_ac_count + 1`
+    if test "$lt_ac_count" -gt "$lt_ac_max"; then
+      lt_ac_max=$lt_ac_count
+      lt_cv_path_SED=$lt_ac_sed
+    fi
+  done
+done
+])
+SED=$lt_cv_path_SED
+AC_SUBST([SED])
+AC_MSG_RESULT([$SED])
+])#AC_PROG_SED
+])#m4_ifndef
+
+# Old name:
+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([LT_AC_PROG_SED], [])
+
+
+# _LT_CHECK_SHELL_FEATURES
+# ------------------------
+# Find out whether the shell is Bourne or XSI compatible,
+# or has some other useful features.
+m4_defun([_LT_CHECK_SHELL_FEATURES],
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+  lt_unset=unset
+else
+  lt_unset=false
+fi
+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
+
+# test EBCDIC or ASCII
+case `echo X|tr X '\101'` in
+ A) # ASCII based system
+    # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
+  lt_SP2NL='tr \040 \012'
+  lt_NL2SP='tr \015\012 \040\040'
+  ;;
+ *) # EBCDIC based system
+  lt_SP2NL='tr \100 \n'
+  lt_NL2SP='tr \r\n \100\100'
+  ;;
+esac
+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
+])# _LT_CHECK_SHELL_FEATURES
+
+
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine what file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/libtool.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltoptions.m4
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltoptions.m4	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltoptions.m4	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,437 @@
+# Helper functions for option handling.                    -*- Autoconf -*-
+#
+#   Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+#   Foundation, Inc.
+#   Written by Gary V. Vaughan, 2004
+#
+# 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 ltoptions.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
+
+
+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME)
+# ------------------------------------------
+m4_define([_LT_MANGLE_OPTION],
+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])])
+
+
+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME)
+# ---------------------------------------
+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a
+# matching handler defined, dispatch to it.  Other OPTION-NAMEs are
+# saved as a flag.
+m4_define([_LT_SET_OPTION],
+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
+        _LT_MANGLE_DEFUN([$1], [$2]),
+    [m4_warning([Unknown $1 option '$2'])])[]dnl
+])
+
+
+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET])
+# ------------------------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+m4_define([_LT_IF_OPTION],
+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])])
+
+
+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET)
+# -------------------------------------------------------
+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME
+# are set.
+m4_define([_LT_UNLESS_OPTIONS],
+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+	    [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option),
+		      [m4_define([$0_found])])])[]dnl
+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3
+])[]dnl
+])
+
+
+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST)
+# ----------------------------------------
+# OPTION-LIST is a space-separated list of Libtool options associated
+# with MACRO-NAME.  If any OPTION has a matching handler declared with
+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about
+# the unknown option and exit.
+m4_defun([_LT_SET_OPTIONS],
+[# Set options
+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])),
+    [_LT_SET_OPTION([$1], _LT_Option)])
+
+m4_if([$1],[LT_INIT],[
+  dnl
+  dnl Simply set some default values (i.e off) if boolean options were not
+  dnl specified:
+  _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no
+  ])
+  _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no
+  ])
+  dnl
+  dnl If no reference was made to various pairs of opposing options, then
+  dnl we run the default mode handler for the pair.  For example, if neither
+  dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
+  dnl archives by default:
+  _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
+  _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
+  _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
+		   [_LT_ENABLE_FAST_INSTALL])
+  _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+		   [_LT_WITH_AIX_SONAME([aix])])
+  ])
+])# _LT_SET_OPTIONS
+
+
+## --------------------------------- ##
+## Macros to handle LT_INIT options. ##
+## --------------------------------- ##
+
+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME)
+# -----------------------------------------
+m4_define([_LT_MANGLE_DEFUN],
+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])])
+
+
+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE)
+# -----------------------------------------------
+m4_define([LT_OPTION_DEFINE],
+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl
+])# LT_OPTION_DEFINE
+
+
+# dlopen
+# ------
+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes
+])
+
+AU_DEFUN([AC_LIBTOOL_DLOPEN],
+[_LT_SET_OPTION([LT_INIT], [dlopen])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'dlopen' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], [])
+
+
+# win32-dll
+# ---------
+# Declare package support for building win32 dll's.
+LT_OPTION_DEFINE([LT_INIT], [win32-dll],
+[enable_win32_dll=yes
+
+case $host in
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
+  AC_CHECK_TOOL(AS, as, false)
+  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+  AC_CHECK_TOOL(OBJDUMP, objdump, false)
+  ;;
+esac
+
+test -z "$AS" && AS=as
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
+
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
+
+test -z "$OBJDUMP" && OBJDUMP=objdump
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
+])# win32-dll
+
+AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+_LT_SET_OPTION([LT_INIT], [win32-dll])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'win32-dll' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
+
+
+# _LT_ENABLE_SHARED([DEFAULT])
+# ----------------------------
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_SHARED],
+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([shared],
+    [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
+	[build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_shared=yes ;;
+    no) enable_shared=no ;;
+    *)
+      enable_shared=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_shared=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
+
+    _LT_DECL([build_libtool_libs], [enable_shared], [0],
+	[Whether or not to build shared libraries])
+])# _LT_ENABLE_SHARED
+
+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared])
+])
+
+AC_DEFUN([AC_DISABLE_SHARED],
+[_LT_SET_OPTION([LT_INIT], [disable-shared])
+])
+
+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)])
+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_SHARED], [])
+dnl AC_DEFUN([AM_DISABLE_SHARED], [])
+
+
+
+# _LT_ENABLE_STATIC([DEFAULT])
+# ----------------------------
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_STATIC],
+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([static],
+    [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@],
+	[build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_static=yes ;;
+    no) enable_static=no ;;
+    *)
+     enable_static=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_static=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_static=]_LT_ENABLE_STATIC_DEFAULT)
+
+    _LT_DECL([build_old_libs], [enable_static], [0],
+	[Whether or not to build static libraries])
+])# _LT_ENABLE_STATIC
+
+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])])
+
+# Old names:
+AC_DEFUN([AC_ENABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static])
+])
+
+AC_DEFUN([AC_DISABLE_STATIC],
+[_LT_SET_OPTION([LT_INIT], [disable-static])
+])
+
+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)])
+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AM_ENABLE_STATIC], [])
+dnl AC_DEFUN([AM_DISABLE_STATIC], [])
+
+
+
+# _LT_ENABLE_FAST_INSTALL([DEFAULT])
+# ----------------------------------
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'.  If omitted, it defaults to 'yes'.
+m4_define([_LT_ENABLE_FAST_INSTALL],
+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
+AC_ARG_ENABLE([fast-install],
+    [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
+    [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
+    [p=${PACKAGE-default}
+    case $enableval in
+    yes) enable_fast_install=yes ;;
+    no) enable_fast_install=no ;;
+    *)
+      enable_fast_install=no
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for pkg in $enableval; do
+	IFS=$lt_save_ifs
+	if test "X$pkg" = "X$p"; then
+	  enable_fast_install=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
+
+_LT_DECL([fast_install], [enable_fast_install], [0],
+	 [Whether or not to optimize for fast installation])dnl
+])# _LT_ENABLE_FAST_INSTALL
+
+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])])
+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])])
+
+# Old names:
+AU_DEFUN([AC_ENABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'fast-install' option into LT_INIT's first parameter.])
+])
+
+AU_DEFUN([AC_DISABLE_FAST_INSTALL],
+[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you put
+the 'disable-fast-install' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+
+
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'.  If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+  AC_MSG_CHECKING([which variant of shared library versioning to provide])
+  AC_ARG_WITH([aix-soname],
+    [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+      [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+    [case $withval in
+    aix|svr4|both)
+      ;;
+    *)
+      AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+      ;;
+    esac
+    lt_cv_with_aix_soname=$with_aix_soname],
+    [AC_CACHE_VAL([lt_cv_with_aix_soname],
+      [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+    with_aix_soname=$lt_cv_with_aix_soname])
+  AC_MSG_RESULT([$with_aix_soname])
+  if test aix != "$with_aix_soname"; then
+    # For the AIX way of multilib, we name the shared archive member
+    # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+    # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+    # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+    # the AIX toolchain works better with OBJECT_MODE set (default 32).
+    if test 64 = "${OBJECT_MODE-32}"; then
+      shared_archive_member_spec=shr_64
+    else
+      shared_archive_member_spec=shr
+    fi
+  fi
+  ;;
+*)
+  with_aix_soname=aix
+  ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+    [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
+# _LT_WITH_PIC([MODE])
+# --------------------
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
+# LT_INIT options.
+# MODE is either 'yes' or 'no'.  If omitted, it defaults to 'both'.
+m4_define([_LT_WITH_PIC],
+[AC_ARG_WITH([pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
+	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
+      for lt_pkg in $withval; do
+	IFS=$lt_save_ifs
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS=$lt_save_ifs
+      ;;
+    esac],
+    [pic_mode=m4_default([$1], [default])])
+
+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
+])# _LT_WITH_PIC
+
+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])])
+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])])
+
+# Old name:
+AU_DEFUN([AC_LIBTOOL_PICMODE],
+[_LT_SET_OPTION([LT_INIT], [pic-only])
+AC_DIAGNOSE([obsolete],
+[$0: Remove this warning and the call to _LT_SET_OPTION when you
+put the 'pic-only' option into LT_INIT's first parameter.])
+])
+
+dnl aclocal-1.4 backwards compatibility:
+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], [])
+
+## ----------------- ##
+## LTDL_INIT Options ##
+## ----------------- ##
+
+m4_define([_LTDL_MODE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive],
+		 [m4_define([_LTDL_MODE], [nonrecursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [recursive],
+		 [m4_define([_LTDL_MODE], [recursive])])
+LT_OPTION_DEFINE([LTDL_INIT], [subproject],
+		 [m4_define([_LTDL_MODE], [subproject])])
+
+m4_define([_LTDL_TYPE], [])
+LT_OPTION_DEFINE([LTDL_INIT], [installable],
+		 [m4_define([_LTDL_TYPE], [installable])])
+LT_OPTION_DEFINE([LTDL_INIT], [convenience],
+		 [m4_define([_LTDL_TYPE], [convenience])])


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltoptions.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltsugar.m4
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltsugar.m4	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltsugar.m4	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,124 @@
+# ltsugar.m4 -- libtool m4 base layer.                         -*-Autoconf-*-
+#
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
+# Written by Gary V. Vaughan, 2004
+#
+# 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 ltsugar.m4
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])])
+
+
+# lt_join(SEP, ARG1, [ARG2...])
+# -----------------------------
+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their
+# associated separator.
+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier
+# versions in m4sugar had bugs.
+m4_define([lt_join],
+[m4_if([$#], [1], [],
+       [$#], [2], [[$2]],
+       [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])])
+m4_define([_lt_join],
+[m4_if([$#$2], [2], [],
+       [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])])
+
+
+# lt_car(LIST)
+# lt_cdr(LIST)
+# ------------
+# Manipulate m4 lists.
+# These macros are necessary as long as will still need to support
+# Autoconf-2.59, which quotes differently.
+m4_define([lt_car], [[$1]])
+m4_define([lt_cdr],
+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
+       [$#], 1, [],
+       [m4_dquote(m4_shift($@))])])
+m4_define([lt_unquote], $1)
+
+
+# lt_append(MACRO-NAME, STRING, [SEPARATOR])
+# ------------------------------------------
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
+# Note that neither SEPARATOR nor STRING are expanded; they are appended
+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
+# No SEPARATOR is output if MACRO-NAME was previously undefined (different
+# than defined and empty).
+#
+# This macro is needed until we can rely on Autoconf 2.62, since earlier
+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING.
+m4_define([lt_append],
+[m4_define([$1],
+	   m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])])
+
+
+
+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...])
+# ----------------------------------------------------------
+# Produce a SEP delimited list of all paired combinations of elements of
+# PREFIX-LIST with SUFFIX1 through SUFFIXn.  Each element of the list
+# has the form PREFIXmINFIXSUFFIXn.
+# Needed until we can rely on m4_combine added in Autoconf 2.62.
+m4_define([lt_combine],
+[m4_if(m4_eval([$# > 3]), [1],
+       [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl
+[[m4_foreach([_Lt_prefix], [$2],
+	     [m4_foreach([_Lt_suffix],
+		]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[,
+	[_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])])
+
+
+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ])
+# -----------------------------------------------------------------------
+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited
+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ.
+m4_define([lt_if_append_uniq],
+[m4_ifdef([$1],
+	  [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1],
+		 [lt_append([$1], [$2], [$3])$4],
+		 [$5])],
+	  [lt_append([$1], [$2], [$3])$4])])
+
+
+# lt_dict_add(DICT, KEY, VALUE)
+# -----------------------------
+m4_define([lt_dict_add],
+[m4_define([$1($2)], [$3])])
+
+
+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE)
+# --------------------------------------------
+m4_define([lt_dict_add_subkey],
+[m4_define([$1($2:$3)], [$4])])
+
+
+# lt_dict_fetch(DICT, KEY, [SUBKEY])
+# ----------------------------------
+m4_define([lt_dict_fetch],
+[m4_ifval([$3],
+	m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]),
+    m4_ifdef([$1($2)], [m4_defn([$1($2)])]))])
+
+
+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE])
+# -----------------------------------------------------------------
+m4_define([lt_if_dict_fetch],
+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4],
+	[$5],
+    [$6])])
+
+
+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...])
+# --------------------------------------------------------------
+m4_define([lt_dict_filter],
+[m4_if([$5], [], [],
+  [lt_join(m4_quote(m4_default([$4], [[, ]])),
+           lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]),
+		      [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl
+])


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltsugar.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltversion.m4
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltversion.m4	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltversion.m4	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,23 @@
+# ltversion.m4 -- version numbers			-*- Autoconf -*-
+#
+#   Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
+#   Written by Scott James Remnant, 2004
+#
+# 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.
+
+# @configure_input@
+
+# serial 4179 ltversion.m4
+# This file is part of GNU Libtool
+
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
+
+AC_DEFUN([LTVERSION_VERSION],
+[macro_version='2.4.6'
+macro_revision='2.4.6'
+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
+_LT_DECL(, macro_revision, 0)
+])


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/ltversion.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/lt~obsolete.m4
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/lt~obsolete.m4	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/lt~obsolete.m4	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,99 @@
+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
+#
+#   Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+#   Foundation, Inc.
+#   Written by Scott James Remnant, 2004.
+#
+# 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 lt~obsolete.m4
+
+# These exist entirely to fool aclocal when bootstrapping libtool.
+#
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
+# which have later been changed to m4_define as they aren't part of the
+# exported API, or moved to Autoconf or Automake where they belong.
+#
+# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
+# using a macro with the same name in our local m4/libtool.m4 it'll
+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
+# and doesn't know about Autoconf macros at all.)
+#
+# So we provide this file, which has a silly filename so it's always
+# included after everything else.  This provides aclocal with the
+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
+# because those macros already exist, or will be overwritten later.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+#
+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
+# Yes, that means every name once taken will need to remain here until
+# we give up compatibility with versions before 1.7, at which point
+# we need to keep only those names which we still refer to.
+
+# This is to help aclocal find these macros, as it can't see m4_define.
+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
+
+m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
+m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
+m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
+m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
+m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
+m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
+m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
+m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
+m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
+m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
+m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
+m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
+m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
+m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
+m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
+m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
+m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
+m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
+m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
+m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
+m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
+m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
+m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
+m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
+m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
+m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
+m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
+m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
+m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
+m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
+m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
+m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
+m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/m4/lt~obsolete.m4
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+LF
\ No newline at end of property
Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/BoundingBox.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/BoundingBox.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/BoundingBox.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -67,26 +67,26 @@
 }
 
 
-/** Extracts a sequence of length values from a given string.
+/** Extracts a sequence of length values from a string like "5cm, 2.4in, 0pt".
  *  @param[in] boxstr whitespace and/or comma separated string of lengths.
  *  @param[out] the extracted lengths */
 void BoundingBox::extractLengths (string boxstr, vector<Length> &lengths) {
+	boxstr = util::trim(boxstr);
 	const size_t len = boxstr.length();
-	size_t l=0;
-	boxstr = util::trim(boxstr);
+	size_t left=0;
 	string lenstr;
 	do {
-		while (l < len && isspace(boxstr[l]))
-			l++;
-		size_t r=l;
-		while (r < len && !isspace(boxstr[r]) && boxstr[r] != ',')
-			r++;
-		lenstr = boxstr.substr(l, r-l);
+		while (left < len && isspace(boxstr[left]))
+			left++;
+		size_t right=left;
+		while (right < len && !isspace(boxstr[right]) && boxstr[right] != ',')
+			right++;
+		lenstr = boxstr.substr(left, right-left);
 		if (!lenstr.empty()) {
 			lengths.emplace_back(Length(lenstr));
-			if (boxstr[r] == ',')
-				r++;
-			l = r;
+			if (boxstr[right] == ',')
+				right++;
+			left = right;
 		}
 	} while (!lenstr.empty() && lengths.size() < 4);
 }

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/CLCommandLine.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/CLCommandLine.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/CLCommandLine.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -100,8 +100,10 @@
 		if (Option *option = lookupOption(shortname)) {
 			if (!combined || option->argMode() == Option::ArgMode::NONE) {
 				if (option->argMode() == Option::ArgMode::REQUIRED && strlen(argv[argn]) == 2) { // required argument separated by whitespace?
-					if (argn+1 < argc && argv[argn+1][0] != '-')
+					if (argn+1 < argc && argv[argn+1][0] != '-') {
+						iss.clear();            // reset error flags
 						iss.str(argv[++argn]);  // continue parsing with next command-line field
+					}
 				}
 				if (!option->parse(iss, false))
 					type_error(*option, true);
@@ -230,4 +232,4 @@
 		os << setw(0) << linecols[opt].second << '\n';
 	}
 	os << '\n' << _copyright << '\n';
-}
\ No newline at end of file
+}

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapReader.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapReader.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/CMapReader.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -147,8 +147,8 @@
 	ir.skipSpace();
 	if (ir.get() != '<')
 		throw CMapReaderException("invalid range entry ('<' expected)");
-	int val;
-	if (!ir.parseInt(16, val))
+	unsigned val;
+	if (!ir.parseUInt(16, val))
 		throw CMapReaderException("invalid range entry (hexadecimal value expected)");
 	if (ir.get() != '>')
 		throw CMapReaderException("invalid range entry ('>' expected)");

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Calculator.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Calculator.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Calculator.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -21,6 +21,7 @@
 #include <config.h>
 #include <cmath>
 #include <sstream>
+#include <stdexcept>
 #include "Calculator.hpp"
 
 using namespace std;
@@ -127,9 +128,9 @@
  *  the same token will be read again next time. */
 char Calculator::lookAhead (istream &is) {
 	is >> ws;
+	int c = is.peek();
 	if (is.eof())
 		return END;
-	int c = is.peek();
 	if (isdigit(c) || c == '.')
 		return NUMBER;
 	if (isalpha(c))
@@ -147,9 +148,18 @@
 char Calculator::lex (istream &is) {
 	int tokenType = lookAhead(is);
 	switch (tokenType) {
-		case NUMBER:
-			is >> _numValue;
+		case NUMBER: {
+			string str;
+			while (isdigit(is.peek()) || is.peek() == '.')
+				str += char(is.get());
+			try {
+				_numValue = stod(str);
+			}
+			catch (exception) {
+				throw CalculatorException("invalid number: "+str);
+			}
 			break;
+		}
 		case NAME: {
 			_strValue.clear();
 			while (isalpha(is.peek()))

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -19,7 +19,6 @@
 *************************************************************************/
 
 #define _USE_MATH_DEFINES
-#include <config.h>
 #include <array>
 #include <algorithm>
 #include <cctype>
@@ -46,12 +45,6 @@
 }
 
 
-Color::Color (const char *psname) {
-	if (!setPSName(psname, false))
-		setGray(uint8_t(0));
-}
-
-
 Color::Color (const string &psname) {
 	if (!setPSName(psname, false))
 		setGray(uint8_t(0));
@@ -217,7 +210,7 @@
 }
 
 
-void Color::operator *= (double c) {
+Color Color::operator *= (double c) {
 	uint32_t rgb=0;
 	for (int i=0; i < 3; i++) {
 		rgb |= uint32_t(floor((_rgb & 0xff)*c+0.5)) << (8*i);
@@ -224,6 +217,7 @@
 		_rgb >>= 8;
 	}
 	_rgb = rgb;
+	return *this;
 }
 
 
@@ -562,7 +556,6 @@
 static inline double sqr (double x)  {return x*x;}
 static inline double cube (double x) {return x*x*x;}
 
-
 void Color::Lab2XYZ (const valarray<double> &lab, valarray<double> &xyz) {
 	xyz.resize(3);
 	double wx=0.95047, wy=1.00, wz=1.08883;  // reference white D65
@@ -618,6 +611,9 @@
 }
 
 
+#if 0
+static constexpr double deg2rad (double x) {return x*M_PI/180.0;}
+
 /** Returns the Delta E difference (CIE 2000) between this and another color. */
 double Color::deltaE (const Color &c) const {
 	double l1, a1, b1;
@@ -624,38 +620,44 @@
 	double l2, a2, b2;
 	getLab(l1, a1, b1);
 	c.getLab(l2, a2, b2);
-	double dl = l2-l1;
-	double lm = (l1+l2)/2;
-	double c1 = sqrt(a1*a1 + b1*b1);
-	double c2 = sqrt(a2*a2 + b2*b2);
-	double cm = (c1+c2)/2;
-	double g  = (1-sqrt(pow(cm, 7)/(pow(cm, 7)+pow(25.0, 7))))/2;
-	double aa1 = a1*(1+g);
-	double aa2 = a2*(1+g);
-	double cc1 = sqrt(aa1*aa1 + b1*b1);
-	double cc2 = sqrt(aa2*aa2 + b2*b2);
-	double ccm = (cc1+cc2)/2;
-	double dcc = cc2-cc1;
-	double h1  = atan2(b1, aa1)*180/M_PI;
-	if (h1 < 0) h1 += 360;
-	double h2  = atan2(b2, aa2)*180/M_PI;
-	if (h2 < 0)	h2 += 360;
-	double hm = (abs(h1-h2) > 180 ? (h1+h2+360) : (h1+h2))/2;
-	double t  = 1 - 0.17*cos(hm-30) + 0.24*cos(2*hm) + 0.32*cos(3*hm+6) - 0.2*cos(4*hm-63);
-	double dh = h2-h1;
-	if (h2-h1 < -180)
-		dh += 360;
-	else if (h2-h1 > 180)
-		dh -= 360;
-	double dhh = 2*sqrt(cc1*cc2)*sin(dh/2);
-	double sl = 1 + 0.015*(lm-50.0)*(lm-50.0)/sqrt(20.0+(lm-50.0));
-	double sc = 1 + 0.045*ccm;
-	double sh = 1 + 0.015*ccm*t;
-	double dtheta = 30*exp(-sqr(hm-275)/25);
-	double rc = 2*sqrt(pow(ccm, 7)/(pow(ccm, 7)+pow(25.0, 7)));
-	double rt = -rc*sin(2*dtheta);
-	return sqrt(sqr(dl/sl) + sqr(dcc/sc) + sqr(dhh/sh) + rt*dcc/sc*dhh/sh);
+	const double deltaL = l2-l1;
+	const double lBar = (l1+l2)/2;
+	const double c1 = sqrt(a1*a1 + b1*b1);
+	const double c2 = sqrt(a2*a2 + b2*b2);
+	const double cBar = (c1+c2)/2.0;
+	const double g = (1.0-sqrt(pow(cBar, 7.0)/(pow(cBar, 7.0)+6103515625.0)))/2.0;
+	const double aa1 = a1*(1.0+g);
+	const double aa2 = a2*(1.0+g);
+	const double cc1 = sqrt(aa1*aa1 + b1*b1);
+	const double cc2 = sqrt(aa2*aa2 + b2*b2);
+	const double ccBar = (cc1+cc2)/2.0;
+	const double deltaCC = cc2-cc1;
+	double hh1 = atan2(b1, aa1);
+	if (hh1 < 0) hh1 += deg2rad(360);
+	double hh2 = atan2(b2, aa2);
+	if (hh2 < 0) hh2 += deg2rad(360);
+	const double hhBar = (std::abs(hh1-hh2) > deg2rad(180) ? (hh1+hh2+deg2rad(360)) : (hh1+hh2))/2.0;
+	const double t = 1.0
+		- 0.17*cos(hhBar-deg2rad(30.0))
+		+ 0.24*cos(2.0*hhBar)
+		+ 0.32*cos(3.0*hhBar+deg2rad(6.0))
+		- 0.20*cos(4.0*hhBar-deg2rad(63.0));
+	double deltaHH = hh2-hh1;
+	if (deltaHH < deg2rad(-180))
+		deltaHH += deg2rad(360);
+	else if (deltaHH > deg2rad(180))
+		deltaHH -= deg2rad(360);
+	const double deltaHHH = 2.0*sqrt(cc1*cc2)*sin(deltaHH/2.0);
+	const double sl = 1.0 + 0.015*sqr(lBar-50.0)/sqrt(20.0+sqr(lBar-50.0));
+	const double sc = 1.0 + 0.045*ccBar;
+	const double sh = 1.0 + 0.015*ccBar*t;
+	const double deltaTheta = deg2rad(30)*exp(-sqr((hhBar-deg2rad(275))/deg2rad(25)));
+	const double rc = 2.0*sqrt(pow(ccBar, 7)/(pow(ccBar, 7)+6103515625.0));
+	const double rt = -rc*sin(2.0*deltaTheta);
+	const double deltaE = sqrt(sqr(deltaL/sl) + sqr(deltaCC/sc) + sqr(deltaHHH/sh) + rt*deltaCC/sc*deltaHHH/sh);
+	return deltaE;
 }
+#endif
 
 
 int Color::numComponents (ColorSpace colorSpace) {

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.hpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.hpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Color.hpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -46,7 +46,6 @@
 		Color (uint8_t r, uint8_t g, uint8_t b)  {setRGB(r,g,b);}
 		Color (double r, double g, double b)     {setRGB(r,g,b);}
 		Color (const std::valarray<double> &rgb) {setRGB(rgb);}
-		Color (const char *name);
 		Color (const std::string &name);
 		operator uint32_t () const                     {return _rgb;}
 		bool operator == (const Color &c) const        {return _rgb == c._rgb;}
@@ -75,7 +74,7 @@
 		void getXYZ (double &x, double &y, double &z) const;
 		void getLab (double &l, double &a, double &b) const;
 		void getLab (std::valarray<double> &lab) const;
-		void operator *= (double c);
+		Color operator *= (double c);
 		double deltaE (const Color &c) const;
 		std::string rgbString () const;
 		std::string svgColorString (bool rgbonly) const;

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Directory.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -37,8 +37,8 @@
 	_firstread = true;
 	memset(&_fileData, 0, sizeof(WIN32_FIND_DATA));
 #else
-	_dir = 0;
-	_dirent = 0;
+	_dir = nullptr;
+	_dirent = nullptr;
 #endif
 }
 
@@ -49,8 +49,8 @@
 	_firstread = true;
 	memset(&_fileData, 0, sizeof(WIN32_FIND_DATA));
 #else
-	_dir = 0;
-	_dirent = 0;
+	_dir = nullptr;
+	_dirent = nullptr;
 #endif
 	open(dirname);
 }
@@ -81,7 +81,10 @@
 #ifdef _WIN32
 	FindClose(_handle);
 #else
-	closedir(_dir);
+	if (_dir) {
+		closedir(_dir);
+		_dir = nullptr;
+	}
 #endif
 }
 
@@ -92,7 +95,7 @@
 const char* Directory::read (EntryType type) {
 #ifdef _WIN32
 	if (_handle == INVALID_HANDLE_VALUE)
-		return 0;
+		return nullptr;
 	while (_firstread || FindNextFile(_handle, &_fileData)) {
 		_firstread = false;
 		if (_fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
@@ -104,25 +107,25 @@
 	}
 	FindClose(_handle);
 	_handle = INVALID_HANDLE_VALUE;
-	return 0;
+	return nullptr;
 #else
-	if (!_dir)
-		return 0;
-	while ((_dirent = readdir(_dir))) {
-		string path = string(_dirname) + "/" + _dirent->d_name;
-		struct stat stats;
-		if (stat(path.c_str(), &stats) == 0) {
-			if (S_ISDIR(stats.st_mode)) {
-				if (type == ET_FILE_OR_DIR || type == ET_DIR)
+	if (_dir) {
+		while ((_dirent = readdir(_dir))) {
+			string path = string(_dirname) + "/" + _dirent->d_name;
+			struct stat stats;
+			if (stat(path.c_str(), &stats) == 0) {
+				if (S_ISDIR(stats.st_mode)) {
+					if (type == ET_FILE_OR_DIR || type == ET_DIR)
+						return _dirent->d_name;
+				}
+				else if (type == ET_FILE_OR_DIR || type == ET_FILE)
 					return _dirent->d_name;
 			}
-			else if (type == ET_FILE_OR_DIR || type == ET_FILE)
-				return _dirent->d_name;
 		}
+		closedir(_dir);
+		_dir = nullptr;
 	}
-	closedir(_dir);
-	_dir = 0;
-	return 0;
+	return nullptr;
 #endif
 }
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -21,6 +21,7 @@
 #include <config.h>
 #include <cstdlib>
 #include <fstream>
+#include <set>
 #include <sstream>
 #include "CMap.hpp"
 #include "FileFinder.hpp"
@@ -318,9 +319,9 @@
 /** Extracts the glyph outlines of a given character.
  *  @param[in]  c character code of requested glyph
  *  @param[out] glyph path segments of the glyph outline
- *  @param[in]  cb optional callback object for tracer class
+ *  @param[in]  callback optional callback object for tracer class
  *  @return true if outline could be computed */
-bool PhysicalFont::getGlyph (int c, GraphicsPath<int32_t> &glyph, GFGlyphTracer::Callback *cb) const {
+bool PhysicalFont::getGlyph (int c, GraphicsPath<int32_t> &glyph, GFGlyphTracer::Callback *callback) const {
 	if (type() == Type::MF) {
 		const Glyph *cached_glyph=0;
 		if (CACHE_PATH) {
@@ -337,7 +338,7 @@
 			if (createGF(gfname)) {
 				try {
 					double ds = getMetrics() ? getMetrics()->getDesignSize() : 1;
-					GFGlyphTracer tracer(gfname, unitsPerEm()/ds, cb);
+					GFGlyphTracer tracer(gfname, unitsPerEm()/ds, callback);
 					tracer.setGlyph(glyph);
 					tracer.executeChar(c);
 					glyph.closeOpenSubPaths();
@@ -349,9 +350,6 @@
 					// @@ print error message
 				}
 			}
-			else {
-				Message::wstream(true) << "failed creating " << name() << ".gf\n";
-			}
 		}
 	}
 	else { // vector fonts (OTF, PFB, TTF, TTC)
@@ -369,14 +367,22 @@
 
 
 /** Creates a GF file for this font object.
- *  @param[out] gfname name of GF font file
+ *  @param[out] gfname name of the generated GF font file
  *  @return true on success */
 bool PhysicalFont::createGF (string &gfname) const {
-	SignalHandler::instance().check();
-	gfname = FileSystem::tmpdir()+name()+".gf";
-	MetafontWrapper mf(name(), FileSystem::tmpdir());
-	bool ok = mf.make("ljfour", METAFONT_MAG); // call Metafont if necessary
-	return ok && mf.success() && getMetrics();
+	static set<string> failed_fonts;
+	if (failed_fonts.find(name()) == failed_fonts.end()) {
+		SignalHandler::instance().check();
+		gfname = FileSystem::tmpdir()+name()+".gf";
+		MetafontWrapper mf(name(), FileSystem::tmpdir());
+		bool ok = mf.make("ljfour", METAFONT_MAG); // call Metafont if necessary
+		if (ok && mf.success() && getMetrics())
+			return true;
+		// report failure only once
+		failed_fonts.insert(name());
+		Message::wstream(true) << "failed to create " << name() << ".gf\n";
+	}
+	return false;
 }
 
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.hpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.hpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Font.hpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -71,7 +71,7 @@
 		virtual const char* path () const =0;
 		virtual const char* filename () const;
 		virtual const FontEncoding* encoding () const;
-		virtual bool getGlyph (int c, Glyph &glyph, GFGlyphTracer::Callback *cb=0) const =0;
+		virtual bool getGlyph (int c, Glyph &glyph, GFGlyphTracer::Callback *callback=0) const =0;
 		virtual void getGlyphMetrics (int c, bool vertical, GlyphMetrics &metrics) const;
 		virtual uint32_t unicode (uint32_t c) const;
 		virtual void tidy () const {}

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -45,16 +45,6 @@
 }
 
 
-FontCache::FontCache () : _changed(false)
-{
-}
-
-
-FontCache::~FontCache () {
-	clear();
-}
-
-
 /** Removes all data from the cache. This does not affect the cache files. */
 void FontCache::clear () {
 	_glyphs.clear();
@@ -377,10 +367,12 @@
 					<< endl;
 			}
 		}
-		for (const string &str : invalid_files) {
-			string path=string(dirname)+"/"+str;
-			if (FileSystem::remove(path))
-				os << "invalid cache file " << str << " removed\n";
+		if (purge) {
+			for (const string &str : invalid_files) {
+				string path=string(dirname)+"/"+str;
+				if (FileSystem::remove(path))
+					os << "invalid cache file " << str << " removed\n";
+			}
 		}
 		os.flags(osflags);  // restore format flags
 	}

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.hpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.hpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/FontCache.hpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -42,8 +42,8 @@
 		};
 
 	public:
-		FontCache ();
-		~FontCache ();
+		FontCache () : _changed(false) {}
+		~FontCache () {clear();}
 		bool read (const char *fontname, const char *dir);
 		bool read (const char *fontname, std::istream &is);
 		bool write (const char *dir) const;

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/GFReader.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -18,7 +18,7 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#include <config.h>
+#include <algorithm>
 #include <sstream>
 #include "FixWord.hpp"
 #include "GFReader.hpp"
@@ -62,22 +62,20 @@
 
 
 int32_t GFReader::readSigned (int bytes) {
-	int32_t ret = _in.get();
+	uint32_t ret = _in.get();
 	if (ret & 128)        // negative value?
 		ret |= 0xffffff00;
 	for (int i=bytes-2; i >= 0 && !_in.eof(); i--)
 		ret = (ret << 8) | _in.get();
-	return ret;
+	return int32_t(ret);
 }
 
 
 string GFReader::readString (int bytes) {
-	vector<char> buf(bytes+1);
-	if (bytes > 0)
-		_in.get(&buf[0], bytes+1);  // reads 'bytes' bytes (pos. bytes+1 is set to 0)
-	else
-		buf[0] = 0;
-	return &buf[0];
+	bytes = max(0, bytes);
+	string str(bytes, '\0');
+	_in.read(&str[0], bytes);
+	return str;
 }
 
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -137,7 +137,7 @@
 }
 
 
-bool InputReader::parseInt (int base, int &val) {
+bool InputReader::parseUInt (int base, unsigned &val) {
 	if (base < 2 || base > 32)
 		return false;
 
@@ -150,7 +150,7 @@
 	val = 0;
 	while (isalnum(c = tolower(peek())) && c <= maxdigit) {
 		get();
-		int digit = c - (c <= '9' ? '0' : 'a'-10);
+		unsigned digit = c - (c <= '9' ? '0' : 'a'-10);
 		val = val*base + digit;
 	}
 	return true;

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.hpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.hpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/InputReader.hpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -44,7 +44,7 @@
 		virtual void skipSpace ();
 		virtual int getInt ();
 		virtual bool parseInt (int &val, bool accept_sign=true);
-		virtual bool parseInt (int base, int &val);
+		virtual bool parseUInt (int base, unsigned &val);
 		virtual bool parseUInt (unsigned &val);
 		virtual char parseDouble (double &val);
 		virtual double getDouble ();

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.am	2017-02-13 17:57:19 UTC (rev 43208)
@@ -1,4 +1,4 @@
-:## This file is part of dvisvgm
+## This file is part of dvisvgm
 ## Copyright (C) 2005-2017 Martin Gieseking <martin.gieseking at uos.de>
 ##
 ## Process this file with automake.
@@ -11,7 +11,10 @@
 dvisvgm_LDADD = \
 	$(noinst_LIBRARIES) \
 	../libs/clipper/libclipper.a \
-	../libs/xxHash/libxxhash.a
+	../libs/xxHash/libxxhash.a \
+	$(FREETYPE_LIBS) \
+	$(FONTFORGE_LIBS) \
+	$(ZLIB_LIBS)
 
 if ENABLE_WOFF
 dvisvgm_LDADD += \
@@ -20,16 +23,7 @@
 	../libs/woff2/brotli/libbrotli.a
 endif
 
-dvisvgm_LDADD += \
-	$(KPATHSEA_LIBS) \
-	$(POTRACE_LIBS) \
-	$(FREETYPE2_LIBS) \
-	$(FONTFORGE_LIBS) \
-	$(ZLIB_LIBS) \
-	$(LIBGS_LIBS)
-
 dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES)
-dvisvgm_DEPENDENCIES += $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND)
 
 libdvisvgm_a_SOURCES = \
 	AGLTable.hpp \
@@ -237,42 +231,29 @@
 
 EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp
 
-dvisvgm_srcdir = $(top_srcdir)/dvisvgm-src
+AM_CFLAGS = -Wall \
+	$(ZLIB_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS)
 
-AM_CFLAGS = $(WARNING_CFLAGS) \
-	$(ZLIB_INCLUDES) \
+AM_CXXFLAGS = -Wall -Wnon-virtual-dtor \
+	-I$(top_srcdir)/libs/clipper \
+	-I$(top_srcdir)/libs/xxHash \
+	$(FREETYPE_CFLAGS) \
+	$(ZLIB_CFLAGS) \
 	$(CODE_COVERAGE_CFLAGS)
 
-AM_CXXFLAGS = $(WARNING_CFLAGS) -Wnon-virtual-dtor \
-	-I$(dvisvgm_srcdir)/libs/clipper \
-	-I$(dvisvgm_srcdir)/libs/xxHash
-
 if ENABLE_WOFF
 AM_CFLAGS +=  \
-	-I$(dvisvgm_srcdir)/libs/ff-woff/fontforge \
-	-I$(dvisvgm_srcdir)/libs/ff-woff/inc
+	-I$(top_srcdir)/libs/ff-woff/fontforge \
+	-I$(top_srcdir)/libs/ff-woff/inc
 
 AM_CXXFLAGS +=  \
-	-I$(dvisvgm_srcdir)/libs/woff2/brotli/enc \
-	-I$(dvisvgm_srcdir)/libs/woff2/src
+	-I$(top_srcdir)/libs/woff2/brotli/enc \
+	-I$(top_srcdir)/libs/woff2/src
 endif
 
-AM_CXXFLAGS += \
-	$(KPATHSEA_INCLUDES) \
-	$(POTRACE_INCLUDES) \
-	$(FREETYPE2_INCLUDES) \
-	$(ZLIB_INCLUDES) \
-	$(LIBGS_INCLUDES) \
-	$(CODE_COVERAGE_CFLAGS)
-
-if WIN32
-AM_CXXFLAGS += -DTEXLIVEWIN32
-endif WIN32
-
 AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
 
-if ! TEXLIVE_BUILD
-# TL: do not try to rebuild these source files.
 # the command-line parser class is generated from options.xml by opt2cpp
 $(srcdir)/CommandLine.hpp: options.xml
 	rm -f $@ $*.hpp
@@ -285,17 +266,7 @@
 	fi
 
 psdefs.ps: ;
-endif ! TEXLIVE_BUILD
 
 @CODE_COVERAGE_RULES@
 
 CLEANFILES = *.gcda *.gcno
-
-## Rebuild libkpathsea
- at KPATHSEA_RULE@
-## Rebuild libpotrace
- at POTRACE_RULE@
-## Rebuild libfreetype
- at FREETYPE2_RULE@
-## Rebuild libz
- at ZLIB_RULE@

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -89,6 +89,7 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+target_triplet = @target@
 bin_PROGRAMS = dvisvgm$(EXEEXT)
 @ENABLE_WOFF_TRUE at am__append_1 = \
 @ENABLE_WOFF_TRUE@	../libs/ff-woff/libfontforge.a \
@@ -97,31 +98,20 @@
 
 @ENABLE_WOFF_TRUE at am__append_2 = ffwrapper.c ffwrapper.h
 @ENABLE_WOFF_TRUE at am__append_3 = \
- at ENABLE_WOFF_TRUE@	-I$(dvisvgm_srcdir)/libs/ff-woff/fontforge \
- at ENABLE_WOFF_TRUE@	-I$(dvisvgm_srcdir)/libs/ff-woff/inc
+ at ENABLE_WOFF_TRUE@	-I$(top_srcdir)/libs/ff-woff/fontforge \
+ at ENABLE_WOFF_TRUE@	-I$(top_srcdir)/libs/ff-woff/inc
 
 @ENABLE_WOFF_TRUE at am__append_4 = \
- at ENABLE_WOFF_TRUE@	-I$(dvisvgm_srcdir)/libs/woff2/brotli/enc \
- at ENABLE_WOFF_TRUE@	-I$(dvisvgm_srcdir)/libs/woff2/src
+ at ENABLE_WOFF_TRUE@	-I$(top_srcdir)/libs/woff2/brotli/enc \
+ at ENABLE_WOFF_TRUE@	-I$(top_srcdir)/libs/woff2/src
 
- at WIN32_TRUE@am__append_5 = -DTEXLIVEWIN32
-subdir = dvisvgm-src/src
+subdir = src
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
-	$(top_srcdir)/../../m4/kpse-common.m4 \
-	$(top_srcdir)/../../m4/kpse-cxx-hack.m4 \
-	$(top_srcdir)/../../m4/kpse-freetype2-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-kpathsea-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-potrace-flags.m4 \
-	$(top_srcdir)/../../m4/kpse-warnings.m4 \
-	$(top_srcdir)/../../m4/kpse-win32.m4 \
-	$(top_srcdir)/../../m4/kpse-zlib-flags.m4 \
-	$(top_srcdir)/../../m4/libtool.m4 \
-	$(top_srcdir)/../../m4/ltoptions.m4 \
-	$(top_srcdir)/../../m4/ltsugar.m4 \
-	$(top_srcdir)/../../m4/ltversion.m4 \
-	$(top_srcdir)/../../m4/lt~obsolete.m4 $(top_srcdir)/version.ac \
-	$(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -258,7 +248,7 @@
 am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
+depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -289,6 +279,7 @@
 am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
 am__v_CXX_0 = @echo "  CXX     " $@;
 am__v_CXX_1 = 
+CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
 	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -323,13 +314,14 @@
 ETAGS = etags
 CTAGS = ctags
 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/version.hpp.in \
-	$(top_srcdir)/../../build-aux/depcomp
+	$(top_srcdir)/depcomp
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
 AR = @AR@
-AS = @AS@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -337,7 +329,12 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
-CODE_COVERAGE_RULES = @CODE_COVERAGE_RULES@
+CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
+CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
+CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
+CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
+CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
@@ -344,14 +341,13 @@
 CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
-CXXLD = @CXXLD@
 CYGPATH_W = @CYGPATH_W@
+DATE = @DATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
-DVISVGM_TREE = @DVISVGM_TREE@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
@@ -358,10 +354,10 @@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
-FREETYPE2_DEPEND = @FREETYPE2_DEPEND@
-FREETYPE2_INCLUDES = @FREETYPE2_INCLUDES@
-FREETYPE2_LIBS = @FREETYPE2_LIBS@
-FT2_CONFIG = @FT2_CONFIG@
+FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
+FREETYPE_LIBS = @FREETYPE_LIBS@
+GCOV = @GCOV@
+GENHTML = @GENHTML@
 GREP = @GREP@
 HAVE_CXX11 = @HAVE_CXX11@
 INSTALL = @INSTALL@
@@ -369,13 +365,9 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-KPATHSEA_DEPEND = @KPATHSEA_DEPEND@
-KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
-KPATHSEA_LIBS = @KPATHSEA_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
-LIBGS_INCLUDES = @LIBGS_INCLUDES@
-LIBGS_LIBS = @LIBGS_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -383,7 +375,6 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
-MAINT = @MAINT@
 MAKEINFO = @MAKEINFO@
 MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
@@ -402,9 +393,8 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-POTRACE_DEPEND = @POTRACE_DEPEND@
-POTRACE_INCLUDES = @POTRACE_INCLUDES@
-POTRACE_LIBS = @POTRACE_LIBS@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
 RANLIB = @RANLIB@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
@@ -411,10 +401,7 @@
 SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
-WARNING_CFLAGS = @WARNING_CFLAGS@
-WARNING_CXXFLAGS = @WARNING_CXXFLAGS@
-ZLIB_DEPEND = @ZLIB_DEPEND@
-ZLIB_INCLUDES = @ZLIB_INCLUDES@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
 ZLIB_LIBS = @ZLIB_LIBS@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -461,11 +448,16 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
 sysconfdir = @sysconfdir@
+target = @target@
 target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
@@ -472,11 +464,9 @@
 noinst_LIBRARIES = libdvisvgm.a
 dvisvgm_SOURCES = dvisvgm.cpp
 dvisvgm_LDADD = $(noinst_LIBRARIES) ../libs/clipper/libclipper.a \
-	../libs/xxHash/libxxhash.a $(am__append_1) $(KPATHSEA_LIBS) \
-	$(POTRACE_LIBS) $(FREETYPE2_LIBS) $(FONTFORGE_LIBS) \
-	$(ZLIB_LIBS) $(LIBGS_LIBS)
-dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) $(KPATHSEA_DEPEND) \
-	$(ZLIB_DEPEND) $(FREETYPE2_DEPEND)
+	../libs/xxHash/libxxhash.a $(FREETYPE_LIBS) $(FONTFORGE_LIBS) \
+	$(ZLIB_LIBS) $(am__append_1)
+dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES)
 libdvisvgm_a_SOURCES = AGLTable.hpp BasicDVIReader.cpp \
 	BasicDVIReader.hpp Bezier.cpp Bezier.hpp \
 	BgColorSpecialHandler.cpp BgColorSpecialHandler.hpp Bitmap.cpp \
@@ -537,22 +527,17 @@
 	XMLNode.hpp XMLString.cpp XMLString.hpp ZLibOutputStream.hpp \
 	$(am__append_2)
 EXTRA_DIST = options.xml options.dtd iapi.h ierrors.h MiKTeXCom.hpp MiKTeXCom.cpp
-dvisvgm_srcdir = $(top_srcdir)/dvisvgm-src
-AM_CFLAGS = $(WARNING_CFLAGS) $(ZLIB_INCLUDES) $(CODE_COVERAGE_CFLAGS) \
+AM_CFLAGS = -Wall $(ZLIB_CFLAGS) $(CODE_COVERAGE_CFLAGS) \
 	$(am__append_3)
-AM_CXXFLAGS = $(WARNING_CFLAGS) -Wnon-virtual-dtor \
-	-I$(dvisvgm_srcdir)/libs/clipper \
-	-I$(dvisvgm_srcdir)/libs/xxHash $(am__append_4) \
-	$(KPATHSEA_INCLUDES) $(POTRACE_INCLUDES) $(FREETYPE2_INCLUDES) \
-	$(ZLIB_INCLUDES) $(LIBGS_INCLUDES) $(CODE_COVERAGE_CFLAGS) \
-	$(am__append_5)
-AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
+AM_CXXFLAGS = -Wall -Wnon-virtual-dtor -I$(top_srcdir)/libs/clipper \
+	-I$(top_srcdir)/libs/xxHash $(FREETYPE_CFLAGS) $(ZLIB_CFLAGS) \
+	$(CODE_COVERAGE_CFLAGS) $(am__append_4)
 CLEANFILES = *.gcda *.gcno
 all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .c .cpp .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -561,9 +546,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign dvisvgm-src/src/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign dvisvgm-src/src/Makefile
+	  $(AUTOMAKE) --foreign src/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -576,9 +561,9 @@
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
+$(top_srcdir)/configure:  $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 version.hpp: $(top_builddir)/config.status $(srcdir)/version.hpp.in
@@ -1006,29 +991,22 @@
 
 .PRECIOUS: Makefile
 
-:## This file is part of dvisvgm
 
-# TL: do not try to rebuild these source files.
 # the command-line parser class is generated from options.xml by opt2cpp
- at TEXLIVE_BUILD_FALSE@$(srcdir)/CommandLine.hpp: options.xml
- at TEXLIVE_BUILD_FALSE@	rm -f $@ $*.hpp
- at TEXLIVE_BUILD_FALSE@	python $(srcdir)/opt2cpp.py $< >$@
+$(srcdir)/CommandLine.hpp: options.xml
+	rm -f $@ $*.hpp
+	python $(srcdir)/opt2cpp.py $< >$@
 
 # Create a C string definition containing the PostScript routines psdefs.ps needed by class PSInterpreter
- at TEXLIVE_BUILD_FALSE@$(srcdir)/psdefs.cpp: psdefs.ps
- at TEXLIVE_BUILD_FALSE@	if test -f $<; then \
- at TEXLIVE_BUILD_FALSE@		ps2c PSInterpreter::PSDEFS $< >$@; \
- at TEXLIVE_BUILD_FALSE@	fi
+$(srcdir)/psdefs.cpp: psdefs.ps
+	if test -f $<; then \
+		ps2c PSInterpreter::PSDEFS $< >$@; \
+	fi
 
- at TEXLIVE_BUILD_FALSE@psdefs.ps: ;
+psdefs.ps: ;
 
 @CODE_COVERAGE_RULES@
 
- at KPATHSEA_RULE@
- at POTRACE_RULE@
- at FREETYPE2_RULE@
- at ZLIB_RULE@
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -29,10 +29,13 @@
 using namespace std;
 
 
-/** Constructs a MapLine object by parsing a single mapline from the given stream. */
-MapLine::MapLine (istream &is)
-	: _sfd(0), _fontindex(0), _slant(0), _bold(0), _extend(1)
+MapLine::MapLine () : _sfd(0), _fontindex(0), _slant(0), _bold(0), _extend(1)
 {
+}
+
+
+/** Constructs a MapLine object by parsing a single map line from the given stream. */
+MapLine::MapLine (istream &is) : MapLine() {
 	char buf[256];
 	is.getline(buf, 256);
 	parse(buf);
@@ -39,6 +42,14 @@
 }
 
 
+MapLine::MapLine (string str) : MapLine() {
+	size_t pos = str.rfind('\n');
+	if (pos != string::npos)
+		str = str.substr(0, pos);
+	parse(str.c_str());
+}
+
+
 // Some of the following functions have been derived from the dvipdfmx source file fontmap.c:
 // http://cvs.ktug.or.kr/viewcvs/dvipdfmx/src/fontmap.c?revision=1.43&view=markup
 
@@ -87,17 +98,19 @@
  *  The line may either be given in dvips or dvipdfmx mapfile format.
  *  @param[in] line the mapline */
 void MapLine::parse (const char *line) {
-	CharInputBuffer ib(line, strlen(line));
-	BufferInputReader ir(ib);
-	_texname = ir.getString();
-	string sfdname;
-	split_fontname(_texname, sfdname);
-	if (!sfdname.empty())
-		_sfd = SubfontDefinition::lookup(sfdname);
-	if (isDVIPSFormat(line))
-		parseDVIPSLine(ir);
-	else
-		parseDVIPDFMLine(ir);
+	if (line) {
+		CharInputBuffer ib(line, strlen(line));
+		BufferInputReader ir(ib);
+		_texname = ir.getString();
+		string sfdname;
+		split_fontname(_texname, sfdname);
+		if (!sfdname.empty())
+			_sfd = SubfontDefinition::lookup(sfdname);
+		if (isDVIPSFormat(line))
+			parseDVIPSLine(ir);
+		else
+			parseDVIPDFMLine(ir);
+	}
 }
 
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.hpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.hpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/MapLine.hpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -22,6 +22,7 @@
 #define MAPLINE_HPP
 
 #include <istream>
+#include <sstream>
 #include <string>
 #include "MessageException.hpp"
 
@@ -40,6 +41,7 @@
 {
 	public:
 		MapLine (std::istream &is);
+		MapLine (std::string str);
 		const std::string& texname () const   {return _texname;}
 		const std::string& psname () const    {return _psname;}
 		const std::string& fontfname () const {return _fontfname;}
@@ -51,6 +53,7 @@
 		SubfontDefinition* sfd () const       {return _sfd;}
 
 	protected:
+		explicit MapLine ();
 		void init ();
 		bool isDVIPSFormat (const char *line) const;
 		void parse (const char *line);

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Matrix.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Matrix.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Matrix.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -276,7 +276,7 @@
 bool Matrix::operator == (const Matrix &m) const {
 	for (int i=0; i < 2; i++)
 		for (int j=0; j < 3; j++)
-			if (_values[i][j] != m._values[i][j])
+			if (std::abs(_values[i][j]-m._values[i][j]) >= numeric_limits<double>::epsilon())
 				return false;
 	return true;
 }
@@ -286,7 +286,7 @@
 bool Matrix::operator != (const Matrix &m) const {
 	for (int i=0; i < 2; i++)
 		for (int j=0; j < 3; j++)
-			if (_values[i][j] != m._values[i][j])
+			if (std::abs(_values[i][j]-m._values[i][j]) >= numeric_limits<double>::epsilon())
 				return true;
 	return false;
 }
@@ -390,7 +390,7 @@
 				if (c != 'X' && c != 'Y')
 					throw ParserException("transformation command 'K' must be followed by 'X' or 'Y'");
 				double a = getArgument(is, calc, 0, false, false);
-				if (fabs(cos(deg2rad(a))) <= numeric_limits<double>::epsilon()) {
+				if (std::abs(cos(deg2rad(a))) < numeric_limits<double>::epsilon()) {
 					ostringstream oss;
 					oss << "illegal skewing angle: " << a << " degrees";
 					throw ParserException(oss.str());

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/PapersizeSpecialHandler.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/PapersizeSpecialHandler.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/PapersizeSpecialHandler.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -49,7 +49,7 @@
 }
 
 
-bool PapersizeSpecialHandler::process (const char *, std::istream &, SpecialActions&) {
+bool PapersizeSpecialHandler::process (const char*, std::istream&, SpecialActions&) {
 	return true;
 }
 
@@ -58,7 +58,7 @@
 	if (actions.getBBoxFormatString() != "papersize")
 		return;
 
-	// find number of page with size change not lower than the current one
+	// find page n >= pageno that contains a papersize special
 	typedef vector<PageSize>::iterator Iterator;
 	Iterator lb_it = lower_bound(_pageSizes.begin(), _pageSizes.end(), PageSize(pageno, DoublePair()),
 		[](const PageSize &ps1, const PageSize &ps2) {
@@ -67,14 +67,14 @@
 		});
 	Iterator it = _pageSizes.end();
 	if (lb_it != _pageSizes.end() && lb_it->first == pageno)
-		it = lb_it;
-	else if (lb_it != _pageSizes.begin())
-		it = lb_it-1;
+		it = lb_it;                        // if current page contains a papersize special, use it
+	else if (lb_it != _pageSizes.begin()) // no papersize special on current page?
+		it = lb_it-1;                      // => use the one on the nearest preceding page
 	if (it == _pageSizes.end())
 		Message::wstream(true) << "no valid papersize special found\n";
 	else {
 		DoublePair size = it->second;
-		const double border = -72;
+		const double border = -72;  // DVI standard: coordinates of upper left paper corner are (-72bp, -72bp)
 		actions.bbox() = BoundingBox(border, border, size.first+border, size.second+border);
 	}
 }

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/PapersizeSpecialHandler.hpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/PapersizeSpecialHandler.hpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/PapersizeSpecialHandler.hpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -35,10 +35,10 @@
 		const char* info () const override {return "special to set the page size";}
 		const char* name () const override {return "papersize";}
 		const char**  prefixes () const override;
+		void reset () {_pageSizes.clear();}
 
 	protected:
 		void dviEndPage (unsigned pageno, SpecialActions &actions) override;
-		static bool isLess (const PageSize &ps1, const PageSize &ps2);
 
 	private:
 		std::vector<PageSize> _pageSizes;

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamReader.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamReader.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/StreamReader.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -18,7 +18,8 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#include <config.h>
+#include <algorithm>
+#include <vector>
 #include "CRC32.hpp"
 #include "StreamReader.hpp"
 
@@ -60,12 +61,12 @@
  *  @param[in] bytes number of bytes to read (max. 4)
  *  @return read integer */
 int32_t StreamReader::readSigned (int bytes) {
-	int32_t ret = int32_t(_is->get());
+	uint32_t ret = uint32_t(_is->get());
 	if (ret & 128)        // negative value?
 		ret |= 0xffffff00;
 	for (bytes-=2; bytes >= 0 && !_is->eof(); bytes--)
 		ret = (ret << 8) | _is->get();
-	return ret;
+	return int32_t(ret);
 }
 
 
@@ -111,16 +112,10 @@
 string StreamReader::readString (int length) {
 	if (!_is)
 		throw StreamReaderException("no stream assigned");
-	char *buf = new char[length+1];
-	if (length <= 0)
-		*buf = 0;
-	else {
-		_is->read(buf, length);  // reads 'length' bytes
-		buf[length] = 0;
-	}
-	string ret = buf;
-	delete [] buf;
-	return ret;
+	length = max(0, length);
+	string str(length, '\0');
+	_is->read(&str[0], length);  // reads 'length' bytes and appends \0
+	return str;
 }
 
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/Subfont.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -18,11 +18,11 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
-#include <config.h>
 #include <cstdlib>
 #include <cstring>
 #include <fstream>
 #include <limits>
+#include <memory>
 #include "FileFinder.hpp"
 #include "Message.hpp"
 #include "Subfont.hpp"
@@ -73,17 +73,16 @@
  *  @param[in] name name of subfont definition to lookup
  *  @return pointer to subfont definition object or 0 if it doesn't exist */
 SubfontDefinition* SubfontDefinition::lookup (const std::string &name) {
-	typedef map<string,SubfontDefinition*> SFDMap;
-	static SFDMap sfdMap;
-	SFDMap::iterator it = sfdMap.find(name);
+	static map<string,unique_ptr<SubfontDefinition>> sfdMap;
+	auto it = sfdMap.find(name);
 	if (it != sfdMap.end())
-		return it->second;
-	SubfontDefinition *sfd=0;
+		return it->second.get();
+	unique_ptr<SubfontDefinition> sfd;
 	if (const char *path = FileFinder::instance().lookup(name+".sfd", false)) {
-		sfd = new SubfontDefinition(name, path);
-		sfdMap[name] = sfd;
+		sfd.reset(new SubfontDefinition(name, path));
+		sfdMap[name] = std::move(sfd);
 	}
-	return sfd;
+	return sfd.get();
 }
 
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorIterator.hpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorIterator.hpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorIterator.hpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -97,6 +97,7 @@
 		bool operator > (const VectorIterator &it) const  {return _pos > it._pos;}
 		bool valid () const {return _pos >= 0 && _pos < _vector.size();}
 		void invalidate ()  {_pos = _vector.size();}
+		void reset ()       {_pos = 0;}
 
 	protected:
 		VectorIterator (std::vector<T> &vec, size_t pos) : _vector(vec), _pos(pos) {}

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorStream.hpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorStream.hpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/VectorStream.hpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -28,11 +28,24 @@
 class VectorStreamBuffer : public std::streambuf
 {
 	public:
-		VectorStreamBuffer (const std::vector<T> &v) : _begin(&v[0]), _end(&v[0]+v.size()), _curr(&v[0]) {}
+		VectorStreamBuffer (const std::vector<T> &v) {
+			if (v.empty())
+				_begin = _end = _curr = nullptr;
+			else {
+				_begin = _curr = &v[0];
+				_end = &v[0]+v.size();
+			}
+		}
 
 	protected:
-		int_type underflow () override {return _curr == _end ? traits_type::eof() : traits_type::to_int_type(*_curr);}
-		int_type uflow() override {return _curr == _end ? traits_type::eof() : traits_type::to_int_type(*_curr++);}
+		int_type underflow () override {
+			return _curr == _end ? traits_type::eof() : traits_type::to_int_type(*_curr);
+		}
+
+		int_type uflow() override {
+			return _curr == _end ? traits_type::eof() : traits_type::to_int_type(*_curr++);
+		}
+
 		std::streamsize showmanyc () override {return _end-_curr;}
 
 		int_type pbackfail (int_type c) override {

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLNode.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLNode.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLNode.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -83,14 +83,14 @@
 	if (!child)
 		return;
 	XMLTextNode *textNode1 = dynamic_cast<XMLTextNode*>(child);
-	if (!textNode1 || _children.empty())
-		_children.emplace_front(unique_ptr<XMLNode>(child));
-	else {
-		if (XMLTextNode *textNode2 = dynamic_cast<XMLTextNode*>(_children.front().get()))
+	unique_ptr<XMLNode> child_uptr(child);
+	if (textNode1 && !_children.empty()) {
+		if (XMLTextNode *textNode2 = dynamic_cast<XMLTextNode*>(_children.front().get())) {
 			textNode2->prepend(textNode1);  // merge two consecutive text nodes
-		else
-			_children.emplace_front(unique_ptr<XMLNode>(child));
+			return;
+		}
 	}
+	_children.emplace_front(std::move(child_uptr));
 }
 
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLString.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLString.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/XMLString.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -91,12 +91,13 @@
 
 XMLString::XMLString (double x) {
 	stringstream ss;
-	if (fabs(x) < 1e-8)
+	if (DECIMAL_PLACES > 0) {
+		// don't use fixed and setprecision() manipulators here to avoid
+		// banker's rounding applied in some STL implementations
+		x = round(x, DECIMAL_PLACES);
+	}
+	if (std::abs(x) < 1e-7)
 		x = 0;
-	if (DECIMAL_PLACES > 0)
-		x = round(x, DECIMAL_PLACES);
-	// don't use fixed and setprecision() manipulators here to avoid
-	// banker's rounding applied in some STL implementations
 	ss << x;
 	ss >> *this;
 }

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/dvisvgm.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -335,7 +335,7 @@
 		Message::wstream().clearline();
 		Message::wstream(true) << "execution interrupted by user\n";
 	}
-	catch (MessageException &e) {
+	catch (exception &e) {
 		Message::estream(true) << e.what() << '\n';
 	}
 	return 0;

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/options.xml
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/options.xml	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/options.xml	2017-02-13 17:57:19 UTC (rev 43208)
@@ -24,7 +24,7 @@
 	<program>
 		<usage>[options] dvifile</usage>
 		<usage>-E [options] epsfile</usage>
-      <description>This program converts DVI files, as created by TeX/LaTeX, to\nthe XML-based scalable vector graphics format SVG.</description>
+		<description>This program converts DVI files, as created by TeX/LaTeX, to\nthe XML-based scalable vector graphics format SVG.</description>
 		<copyright>Copyright (C) 2005-2017 Martin Gieseking <martin.gieseking at uos.de></copyright>
 	</program>
 	<options>
@@ -134,13 +134,13 @@
 				<arg type="string" name="dir" optional="yes"/>
 				<description>set/print path of cache directory</description>
 			</option>
-         <option long="exact" short="e">
-            <description>compute exact glyph boxes</description>
-         </option>
-		   <option long="keep">
-		      <description>keep temporary files</description>
-		   </option>
-		   <option long="libgs" if="!defined(HAVE_LIBGS) && !defined(DISABLE_GS)">
+			<option long="exact" short="e">
+				<description>compute exact glyph boxes</description>
+			</option>
+			<option long="keep">
+				<description>keep temporary files</description>
+			</option>
+			<option long="libgs" if="!defined(HAVE_LIBGS) && !defined(DISABLE_GS)">
 				<arg name="filename" type="string"/>
 				<description>set name of Ghostscript shared library</description>
 			</option>
@@ -156,7 +156,7 @@
 				<description>don't process [selected] specials</description>
 			</option>
 			<option long="trace-all" short="a">
-            <arg name="retrace" type="bool" optional="yes" default="false"/>
+				<arg name="retrace" type="bool" optional="yes" default="false"/>
 				<description>trace all glyphs of bitmap fonts</description>
 			</option>
 		</section>
@@ -172,7 +172,7 @@
 				<description>print supported special sets and exit</description>
 			</option>
 			<option long="progress" short="P">
-            <arg name="delay" type="double" optional="yes" default="0.5"/>
+				<arg name="delay" type="double" optional="yes" default="0.5"/>
 				<description>enable progress indicator</description>
 			</option>
 			<option long="verbosity" short="v">

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/version.hpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/version.hpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/src/version.hpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -22,7 +22,7 @@
 #define VERSION_HPP
 
 constexpr const char *PROGRAM_NAME = "dvisvgm";
-constexpr const char *PROGRAM_VERSION = "2.1";
+constexpr const char *PROGRAM_VERSION = "2.1.2";
 
 #endif
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CMapManagerTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CMapManagerTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CMapManagerTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -33,7 +33,7 @@
 class CMapManagerTest : public ::testing::Test
 {
 	protected:
-		void SetUp () {
+		void SetUp () override {
 			FileFinder::init("CMapManagerTest", "CMapManagerTest", false);
 			FileFinder::instance().addLookupDir(SRCDIR"/data");
 		}

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CMapReaderTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CMapReaderTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CMapReaderTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -19,6 +19,7 @@
 *************************************************************************/
 
 #include <gtest/gtest.h>
+#include <memory>
 #include "CMap.hpp"
 #include "CMapReader.hpp"
 
@@ -28,14 +29,14 @@
 class CMapReaderTest : public ::testing::Test
 {
 	protected:
-		void SetUp () {
+		CMapReaderTest () {
 			istringstream iss(cmapsrc);
 			CMapReader reader;
-			cmap = reader.read(iss, "Test-Map");
+			cmap.reset(reader.read(iss, "Test-Map"));
 		}
 
 		static const char *cmapsrc;
-		CMap *cmap;
+		unique_ptr<CMap> cmap;
 };
 
 
@@ -105,7 +106,7 @@
 }
 
 TEST_F(CMapReaderTest, cid) {
-	SegmentedCMap *seg_cmap = dynamic_cast<SegmentedCMap*>(cmap);
+	const SegmentedCMap *seg_cmap = dynamic_cast<const SegmentedCMap*>(cmap.get());
 	ASSERT_TRUE(seg_cmap != 0);
 	ASSERT_EQ(seg_cmap->numBFRanges(), 9);
 	ASSERT_EQ(seg_cmap->numCIDRanges(), 2);

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/ColorSpecialTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/ColorSpecialTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/ColorSpecialTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -23,6 +23,8 @@
 #include "ColorSpecialHandler.hpp"
 #include "SpecialActions.hpp"
 
+using namespace std;
+
 class ColorSpecialTest : public ::testing::Test
 {
 	protected:
@@ -38,6 +40,15 @@
 };
 
 
+TEST_F(ColorSpecialTest, info) {
+	EXPECT_EQ(handler.name(), "color");
+	EXPECT_STREQ(handler.prefixes()[0], "color");
+	EXPECT_EQ(handler.prefixes()[1], nullptr);
+	ASSERT_NE(handler.info(), nullptr);
+	EXPECT_FALSE(string(handler.info()).empty());
+}
+
+
 TEST_F(ColorSpecialTest, readColor) {
 	std::istringstream iss("rgb 1 0 1");
 	EXPECT_EQ(ColorSpecialHandler::readColor(iss).rgbString(), "#ff00ff");
@@ -53,6 +64,13 @@
 }
 
 
+TEST_F(ColorSpecialTest, gray) {
+	std::istringstream iss("gray 0.2");
+	handler.process(0, iss, actions);
+	EXPECT_TRUE(actions.equals(0x333333));
+}
+
+
 TEST_F(ColorSpecialTest, rgb) {
 	std::istringstream iss("rgb 1 0 1");
 	handler.process(0, iss, actions);
@@ -74,7 +92,7 @@
 }
 
 
-TEST_F(ColorSpecialTest, stack) {
+TEST_F(ColorSpecialTest, stack1) {
 	std::istringstream iss("push rgb 1 0 0");
 	handler.process(0, iss, actions);
 	EXPECT_TRUE(actions.equals(0xff0000));
@@ -86,9 +104,31 @@
 	iss.str("pop");
 	handler.process(0, iss, actions);
 	EXPECT_TRUE(actions.equals(0xff0000));
+	iss.clear();
+	iss.str("pop");
+	handler.process(0, iss, actions);
+	EXPECT_TRUE(actions.equals(0x000000));
 }
 
 
+TEST_F(ColorSpecialTest, stack2) {
+	std::istringstream iss("push rgb 1 0 0");
+	handler.process(0, iss, actions);
+	EXPECT_TRUE(actions.equals(0xff0000));
+	iss.clear();
+	iss.str("push rgb 0 1 0");
+	handler.process(0, iss, actions);
+	iss.clear();
+	iss.str("gray 0.2");  // clear color stack implicitly
+	handler.process(0, iss, actions);
+	EXPECT_TRUE(actions.equals(0x333333));
+	iss.clear();
+	iss.str("pop");
+	handler.process(0, iss, actions);
+	EXPECT_TRUE(actions.equals(0x000000));
+}
+
+
 TEST_F(ColorSpecialTest, constant) {
 	std::istringstream iss("RedViolet");
 	handler.process(0, iss, actions);
@@ -102,5 +142,8 @@
 	iss.clear();
 	iss.str("blue");
 	EXPECT_THROW(handler.process(0, iss, actions), SpecialException);
+	iss.clear();
+	iss.str("rgb black");
+	EXPECT_THROW(handler.process(0, iss, actions), SpecialException);
 }
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/ColorTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/ColorTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/ColorTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -24,14 +24,11 @@
 using namespace std;
 
 TEST(ColorTest, construct) {
-	Color c1(uint8_t(1), uint8_t(2), uint8_t(3));
-	EXPECT_EQ(c1.rgbString(), "#010203");
-	Color c2(1.0/255, 2.0/255, 3.0/255);
-	EXPECT_EQ(c2.rgbString(), "#010203");
-	Color c3 = "Blue";
-	EXPECT_EQ(c3.rgbString(), "#0000ff");
-	Color c4 = "blue";
-	EXPECT_EQ(c4.rgbString(), "#0000ff");
+	EXPECT_EQ(Color(uint8_t(1), uint8_t(2), uint8_t(3)).rgbString(), "#010203");
+	EXPECT_EQ(Color(1.0/255, 2.0/255, 3.0/255).rgbString(), "#010203");
+	EXPECT_EQ(Color("Blue").rgbString(), "#0000ff");
+	EXPECT_EQ(Color("blue").rgbString(), "#0000ff");
+	EXPECT_EQ(Color("invalid").rgbString(), "#000000");
 }
 
 
@@ -46,19 +43,42 @@
 
 TEST(ColorTest, hsb) {
 	Color c;
+	c.setHSB(20.0/360, 0.75, 0.8);        // i==0
+	EXPECT_EQ(c.rgbString(), "#cc6633");
+	c.setHSB(60.0/360, 0.75, 0.8);        // i==1
+	EXPECT_EQ(c.rgbString(), "#cccc33");
+	c.setHSB(120.0/360, 1.0, 1.0);        // i==2
+	EXPECT_EQ(c.rgbString(), "#00ff00");
+	c.setHSB(180.0/360, 1.0, 1.0);        // i==3
+	EXPECT_EQ(c.rgbString(), "#00ffff");
+	c.setHSB(240.0/360, 0.75, 0.8);       // i==4
+	EXPECT_EQ(c.rgbString(), "#3333cc");
+	c.setHSB(300.0/360, 0.75, 0.8);       // i==5
+	EXPECT_EQ(c.rgbString(), "#cc33cc");
 	c.setHSB(0.0, 1.0, 1.0);
 	EXPECT_EQ(c.rgbString(), "#ff0000");
-	c.setHSB(120.0/360, 1.0, 1.0);
-	EXPECT_EQ(c.rgbString(), "#00ff00");
-	c.setHSB(20.0/360, 0.75, 0.8);
-	EXPECT_EQ(c.rgbString(), "#cc6633");
+	c.setHSB(20.0/360, 0, 0.2);           // s==0
+	EXPECT_EQ(c.rgbString(), "#333333");
 }
 
 
 TEST(ColorTest, cmyk) {
-	Color c;
-	c.setCMYK(0.5, 0.4, 0.6, 0.2);
-	EXPECT_EQ(c.rgbString(), "#667a52");
+	Color color;
+	color.setCMYK(0.5, 0.4, 0.6, 0.2);
+	EXPECT_EQ(color.rgbString(), "#667a52");
+	double c, m, y, k;
+	color.setRGB(0.0, 0.0, 0.0);
+	color.getCMYK(c, m, y, k);
+	EXPECT_DOUBLE_EQ(c, 0.0);
+	EXPECT_DOUBLE_EQ(m, 0.0);
+	EXPECT_DOUBLE_EQ(y, 0.0);
+	EXPECT_DOUBLE_EQ(k, 1.0);
+	color.setRGB(1.0, 0.0, 0.0);
+	color.getCMYK(c, m, y, k);
+	EXPECT_DOUBLE_EQ(c, 0.0);
+	EXPECT_DOUBLE_EQ(m, 1.0);
+	EXPECT_DOUBLE_EQ(y, 1.0);
+	EXPECT_DOUBLE_EQ(k, 0.0);
 }
 
 
@@ -76,6 +96,8 @@
 	EXPECT_EQ(c.rgbString(), "#abcdef");
 	EXPECT_TRUE(c.setPSName("#89A"));
 	EXPECT_EQ(c.rgbString(), "#00089a");
+	EXPECT_TRUE(c.setPSName("#A98 \n "));
+	EXPECT_EQ(c.rgbString(), "#000a98");
 }
 
 
@@ -155,4 +177,38 @@
 	EXPECT_EQ(Color(uint32_t(0xff0000)).svgColorString(true), "#ff0000");
 	EXPECT_EQ(Color(uint32_t(0x9400d3)).svgColorString(true), "#9400d3");
 	EXPECT_EQ(Color(uint32_t(0x000001)).svgColorString(true), "#000001");
-}
\ No newline at end of file
+}
+
+
+TEST(ColorTest, components) {
+	EXPECT_EQ(Color::numComponents(Color::ColorSpace::GRAY), 1);
+	EXPECT_EQ(Color::numComponents(Color::ColorSpace::RGB), 3);
+	EXPECT_EQ(Color::numComponents(Color::ColorSpace::LAB), 3);
+	EXPECT_EQ(Color::numComponents(Color::ColorSpace::CMYK), 4);
+}
+
+
+TEST(ColorTest, scale) {
+	EXPECT_EQ((Color(uint32_t(0x123456)) *= 0.0).rgbString(), "#000000");
+	EXPECT_EQ((Color(uint32_t(0x123456)) *= 1.0).rgbString(), "#123456");
+	EXPECT_EQ((Color(uint32_t(0x123456)) *= 3.0).rgbString(), "#369d02");
+	EXPECT_EQ((Color(uint32_t(0x123456)) *= 0.5).rgbString(), "#091a2b");
+}
+
+
+TEST(ColorTest, set) {
+	Color color;
+	vector<double> vec{0.1, 0.2, 0.3, 0.4};
+	VectorIterator<double> it(vec);
+	color.set(Color::ColorSpace::GRAY, it);
+	EXPECT_EQ(uint32_t(color), 0x1a1a1a);
+	it.reset();
+	color.set(Color::ColorSpace::RGB, it);
+	EXPECT_EQ(uint32_t(color), 0x1a334d);
+	it.reset();
+	color.set(Color::ColorSpace::CMYK, it);
+	EXPECT_EQ(uint32_t(color), 0x8a7a6b);
+	it.reset();
+	color.set(Color::ColorSpace::LAB, it);
+	EXPECT_EQ(uint32_t(color), 0x010000);
+}

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CommandLineTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CommandLineTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/CommandLineTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -233,8 +233,6 @@
 }
 
 
-static void out (const char *) {}
-
 TEST(CommandLineTest, help) {
 	// only check whether help() succeeds
 	CommandLine cmd;

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/DirectoryTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/DirectoryTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/DirectoryTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -35,11 +35,11 @@
 TEST(DirectoryTest, dirs) {
 	const char *dirs_to_find[] = {"doc", "src", 0};
 	set<string> found_dirs;
-	Directory dir("..");
+	Directory dir(string(SRCDIR)+"/..");
 	while (const char *dname = dir.read(Directory::ET_DIR))
 		found_dirs.insert(dname);
 	for (const char **p=dirs_to_find; *p; ++p) {
-		EXPECT_TRUE(found_dirs.find(*p) != found_dirs.end());
+		EXPECT_TRUE(found_dirs.find(*p) != found_dirs.end()) << *p;
 	}
 }
 
@@ -59,7 +59,7 @@
 	while (const char *fname = dir.read(Directory::ET_FILE))
 		found_files.insert(fname);
 	for (const char **p=files_to_find; *p; ++p) {
-		EXPECT_TRUE(found_files.find(*p) != found_files.end());
+		EXPECT_TRUE(found_files.find(*p) != found_files.end()) << *p;
 	}
 	EXPECT_TRUE(found_files.find("tests") == found_files.end());
 }

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/DvisvgmSpecialTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/DvisvgmSpecialTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/DvisvgmSpecialTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -66,7 +66,7 @@
 				BoundingBox bbox;
 		};
 
-		void SetUp () {
+		void SetUp () override {
 			recorder.clear();
 		}
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/EmSpecialTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/EmSpecialTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/EmSpecialTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -74,7 +74,8 @@
 	public:
 		EmSpecialTest () : handler(recorder) {}
 
-		void SetUp () {
+		void SetUp () override {
+			XMLString::DECIMAL_PLACES=2;
 			recorder.clear();
 		}
 
@@ -147,7 +148,6 @@
 
 
 TEST_F(EmSpecialTest, vline) {
-	XMLString::DECIMAL_PLACES=2;
 	handler.processSpecial("point 1, 10, 10");
 	handler.processSpecial("point 2, 100, 100");
 	handler.processSpecial("line 1v, 2v, 10bp");  // cut line ends vertically
@@ -156,7 +156,6 @@
 
 
 TEST_F(EmSpecialTest, hline) {
-	XMLString::DECIMAL_PLACES=2;
 	handler.processSpecial("point 1, 10, 10");
 	handler.processSpecial("point 2, 100, 100");
 	handler.processSpecial("line 1h, 2h, 10bp");  // cut line ends horizontally
@@ -165,7 +164,6 @@
 
 
 TEST_F(EmSpecialTest, hvline) {
-	XMLString::DECIMAL_PLACES=2;
 	handler.processSpecial("point 1, 10, 10");
 	handler.processSpecial("point 2, 100, 100");
 	handler.processSpecial("line 1h, 2v, 10bp");  // cut line ends horizontally

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FileFinderTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FileFinderTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FileFinderTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -32,7 +32,7 @@
 class FileFinderTest : public ::testing::Test
 {
 	protected:
-		void SetUp () {
+		void SetUp () override {
 			FileFinder::init("FileFinderTest", "FileFinderTest", false);
 			FileFinder::instance().addLookupDir(SRCDIR"/data");
 		}

Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontCacheTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontCacheTest.cpp	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontCacheTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,155 @@
+/*************************************************************************
+** FontCacheTest.cpp                                                    **
+**                                                                      **
+** This file is part of dvisvgm -- a fast DVI to SVG converter          **
+** Copyright (C) 2005-2017 Martin Gieseking <martin.gieseking at uos.de>   **
+**                                                                      **
+** 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 3 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, see <http://www.gnu.org/licenses/>. **
+*************************************************************************/
+
+#include <gtest/gtest.h>
+#include <fstream>
+#include <sstream>
+#include "FileSystem.hpp"
+#include "FontCache.hpp"
+
+#ifndef SRCDIR
+#define SRCDIR "."
+#endif
+
+using namespace std;
+
+class FontCacheTest : public testing::Test
+{
+	protected:
+		FontCacheTest () : testing::Test(), cachedir("data") {
+			glyph1.moveto(0, 0);
+			glyph1.lineto(10, 0);
+			glyph1.lineto(10, 10);
+			glyph1.lineto(0, 10);
+			glyph1.closepath();
+
+			glyph2.moveto(0, 0);
+			glyph2.cubicto(10, 10, 20, 0, 50, 50);
+			glyph2.lineto(30, 20);
+			glyph2.conicto(20, 40, 20, 20);
+			glyph2.closepath();
+		}
+
+		~FontCacheTest () {
+			FileSystem::remove(cachedir+"/testfont.fgd");
+		}
+
+		Glyph glyph1, glyph2;
+		FontCache cache;
+		string cachedir;
+};
+
+
+static string toSVG (const Glyph &glyph) {
+	ostringstream oss;
+	glyph.writeSVG(oss, false);
+	return oss.str();
+}
+
+
+static bool operator == (const Glyph &glyph1, const Glyph &glyph2) {
+	return toSVG(glyph1) == toSVG(glyph2);
+}
+
+
+TEST_F(FontCacheTest, glyph) {
+	EXPECT_EQ(toSVG(glyph1), "M0 0H10V10H0Z");
+	EXPECT_EQ(toSVG(glyph2), "M0 0C10 10 20 0 50 50L30 20Q20 40 20 20Z");
+	cache.setGlyph(1, glyph1);
+	cache.setGlyph(10, glyph2);
+	ASSERT_NE(cache.getGlyph(1), nullptr);
+	ASSERT_EQ(cache.getGlyph(2), nullptr);
+	ASSERT_NE(cache.getGlyph(10), nullptr);
+	ASSERT_EQ(*cache.getGlyph(1), glyph1);
+	ASSERT_EQ(*cache.getGlyph(10), glyph2);
+}
+
+
+TEST_F(FontCacheTest, write1) {
+	cache.setGlyph(1, glyph1);
+	ASSERT_TRUE(cache.fontname().empty());
+	ASSERT_FALSE(cache.write(cachedir.c_str()));
+}
+
+
+TEST_F(FontCacheTest, write2) {
+	cache.setGlyph(1, glyph1);
+	ASSERT_TRUE(FileSystem::exists(cachedir));
+	ASSERT_TRUE(cache.write("testfont", cachedir.c_str()));
+	cache.setGlyph(10, glyph2);
+	ASSERT_TRUE(cache.write("testfont", cachedir.c_str()));
+	ASSERT_TRUE(cache.fontname().empty());
+}
+
+
+TEST_F(FontCacheTest, read) {
+	cache.setGlyph(1, glyph1);
+	cache.setGlyph(10, glyph2);
+	ASSERT_TRUE(cache.write("testfont", cachedir.c_str()));
+	// clear cache object
+	cache.clear();
+	ASSERT_EQ(cache.getGlyph(1), nullptr);
+	ASSERT_EQ(cache.getGlyph(2), nullptr);
+	ASSERT_EQ(cache.getGlyph(10), nullptr);
+	// read glyph data from cache file
+	ASSERT_TRUE(cache.read("testfont", cachedir.c_str()));
+	ASSERT_EQ(cache.fontname(), "testfont");
+	ASSERT_NE(cache.getGlyph(1), nullptr);
+	ASSERT_EQ(cache.getGlyph(2), nullptr);
+	ASSERT_NE(cache.getGlyph(10), nullptr);
+	ASSERT_EQ(*cache.getGlyph(1), glyph1);
+	ASSERT_EQ(*cache.getGlyph(10), glyph2);
+}
+
+
+TEST_F(FontCacheTest, fontinfo1) {
+	ostringstream oss;
+	cache.clear();
+	FileSystem::remove(cachedir+"/testfont.fgd");
+	cache.fontinfo(cachedir.c_str(), oss);
+	ASSERT_EQ(oss.str(), "cache is empty\n");
+
+	// check removal of invalid cache files
+	ofstream cachefile(cachedir+"/invalid.fgd");
+	cachefile << "invalid cache file";
+	cachefile.close();
+	ASSERT_TRUE(FileSystem::exists(cachedir+"/invalid.fgd"));
+	oss.str("");
+	cache.fontinfo(cachedir.c_str(), oss, true);
+	ASSERT_EQ(oss.str(),
+		"cache is empty\n"
+		"invalid cache file invalid.fgd removed\n"
+	);
+	ASSERT_FALSE(FileSystem::exists(cachedir+"/invalid.fgd"));
+}
+
+
+TEST_F(FontCacheTest, fontinfo2) {
+	cache.setGlyph(1, glyph1);
+	cache.setGlyph(10, glyph2);
+	ASSERT_TRUE(cache.write("testfont", cachedir.c_str()));
+
+	ostringstream oss;
+	cache.fontinfo(cachedir.c_str(), oss);
+	ASSERT_EQ(oss.str(),
+		"cache format version 5\n"
+		"testfont      2 glyphs        10 cmds          58 bytes  crc:38cb5c67\n"
+	);
+}


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontCacheTest.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontManagerTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontManagerTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontManagerTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -24,21 +24,28 @@
 #include "FontManager.hpp"
 #include "FileFinder.hpp"
 
+#ifndef SRCDIR
+#define SRCDIR "."
+#endif
+
+
 class FontManagerTest : public ::testing::Test
 {
-	protected:
-		void SetUp () {
+	public:
+		FontManagerTest () : fm(FontManager::instance()) {
 			FileFinder::init("FontManagerTest", "FontManagerTest", false);
-			FontManager &fm = FontManager::instance();
+			FileFinder::instance().addLookupDir(SRCDIR"/data");
 			fm.registerFont(10, "cmr10", 1274110073, 10, 10);
 			fm.registerFont(11, "cmr10", 1274110073, 10, 12);
 			fm.registerFont( 9, "cmr10", 1274110073, 10, 14);
 		}
+
+	protected:
+		FontManager &fm;
 };
 
 
 TEST_F(FontManagerTest, fontID1) {
-	FontManager &fm = FontManager::instance();
 	EXPECT_EQ(fm.fontID(10), 0);
 	EXPECT_EQ(fm.fontID(11), 1);
 	EXPECT_EQ(fm.fontID(9), 2);
@@ -47,13 +54,11 @@
 
 
 TEST_F(FontManagerTest, font_ID2) {
-	FontManager &fm = FontManager::instance();
 	EXPECT_EQ(fm.fontID("cmr10"), 0);
 }
 
 
 TEST_F(FontManagerTest, getFont) {
-	FontManager &fm = FontManager::instance();
 	const Font *f1 = fm.getFont(10);
 	EXPECT_TRUE(f1);
 	EXPECT_EQ(f1->name(), "cmr10");
@@ -69,7 +74,6 @@
 
 
 TEST_F(FontManagerTest, getFontById) {
-	FontManager &fm = FontManager::instance();
 	EXPECT_EQ(fm.getFont(10), fm.getFontById(0));
 	EXPECT_EQ(fm.getFont("cmr10"), fm.getFontById(0));
 }

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontMapTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontMapTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/FontMapTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -22,49 +22,48 @@
 #include <fstream>
 #include "FontMap.hpp"
 
-using std::ifstream;
+#ifndef SRCDIR
+#define SRCDIR "."
+#endif
 
+using namespace std;
+
+
 TEST(FontMapTest, pdf_map) {
-	const char *fname = "tests/dvipdfm_test.map";
-	ifstream ifs(fname);
-	if (ifs) {
-		FontMap &fm = FontMap::instance();
-		fm.read(fname);
-		const FontMap::Entry *entry;
-		ASSERT_TRUE((entry = fm.lookup("MyriadPro-Bold-8t")) != 0);
-		EXPECT_EQ(entry->fontname, "MyriadPro-Bold");
-		EXPECT_EQ(entry->encname, "my-lf-t1");
-		ASSERT_TRUE((entry = fm.lookup("cmbsy8")) != 0);
-		EXPECT_EQ(entry->fontname, "cmbsy7");
-		EXPECT_EQ(entry->encname, "");
+	string fname = string(SRCDIR)+"/data/dvipdfm_test.map";
+	FontMap &fm = FontMap::instance();
+	fm.read(fname);
+	const FontMap::Entry *entry;
+	ASSERT_NE(entry = fm.lookup("MyriadPro-Bold-8t"), nullptr);
+	EXPECT_EQ(entry->fontname, "MyriadPro-Bold");
+	EXPECT_EQ(entry->encname, "my-lf-t1");
+	ASSERT_NE(entry = fm.lookup("cmbsy8"), nullptr);
+	EXPECT_EQ(entry->fontname, "cmbsy7");
+	EXPECT_EQ(entry->encname, "");
 
-		// entry without mapped name
-		EXPECT_TRUE(fm.lookup("msam10") == 0);
-		EXPECT_TRUE(fm.lookup("msbm10") == 0);
-		EXPECT_TRUE(fm.lookup("msbm10") == 0);
-		EXPECT_TRUE(fm.lookup("i don't exist") ==  0);
-	}
+	// entry without mapped name
+	EXPECT_EQ(fm.lookup("msam10"), nullptr);
+	EXPECT_EQ(fm.lookup("msbm10"), nullptr);
+	EXPECT_EQ(fm.lookup("msbm10"), nullptr);
+	EXPECT_EQ(fm.lookup("i don't exist"), nullptr);
 }
 
 
 TEST(FontMapTest, ps_map) {
-	const char *fname = "tests/dvips_test.map";
-	ifstream ifs(fname);
-	if (ifs) {
-		FontMap &fm = FontMap::instance();
-		fm.read(fname);
-		const FontMap::Entry *entry;
-		ASSERT_TRUE((entry = fm.lookup("MyriadPro-Bold-8t")) != 0);
-		EXPECT_EQ(entry->fontname, "MyriadPro-Bold");
-		EXPECT_EQ(entry->encname, "my-lf-t1");
-		ASSERT_TRUE((entry = fm.lookup("cmbsy8")) != 0);
-		EXPECT_EQ(entry->fontname, "cmbsy7");
-		EXPECT_EQ(entry->encname, "");
+	string fname = string(SRCDIR)+"/data/dvips_test.map";
+	FontMap &fm = FontMap::instance();
+	fm.read(fname);
+	const FontMap::Entry *entry;
+	ASSERT_NE(entry = fm.lookup("MyriadPro-Bold-8t"), nullptr);
+	EXPECT_EQ(entry->fontname, "MyriadPro-Bold");
+	EXPECT_EQ(entry->encname, "my-lf-t1");
+	ASSERT_NE(entry = fm.lookup("cmbsy8"), nullptr);
+	EXPECT_EQ(entry->fontname, "cmbsy7");
+	EXPECT_EQ(entry->encname, "");
 
-		// entry without mapped name
-		EXPECT_TRUE(fm.lookup("msam10") == 0);
-		EXPECT_TRUE(fm.lookup("msbm10") == 0);
-		EXPECT_TRUE(fm.lookup("msbm10") == 0);
-		EXPECT_TRUE(fm.lookup("i don't exist") ==  0);
-	}
+	// entry without mapped name
+	EXPECT_EQ(fm.lookup("msam10"), nullptr);
+	EXPECT_EQ(fm.lookup("msbm10"), nullptr);
+	EXPECT_EQ(fm.lookup("msbm10"), nullptr);
+	EXPECT_EQ(fm.lookup("i don't exist"), nullptr);
 }

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFGlyphTracerTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFGlyphTracerTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFGlyphTracerTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -76,7 +76,7 @@
 	glyph.closeOpenSubPaths();
 	EXPECT_EQ(scaled_pathstr(glyph),
 		"M3.5 4.3C3.2 4.1 3.1 4.1 2.9 4.3C1.9 4.8 0.6 4 0.6 3C0.6 2.8 0.7 2.4 0.8 2.3C0.9 2.1 1 2 0.9 1.7"
-		"C0.7 1.3 0.7 0.8 0.9 0.5C1 0.3 1 0.3 0.6 -0.1C-0 -0.7 0.1 -1.4 1.1 -1.9C1.7 -2.2 3.3 -2.2 3.8 -1.9"
+		"C0.7 1.3 0.7 0.8 0.9 0.5C1 0.3 1 0.3 0.6 -0.1C0 -0.7 0.1 -1.4 1.1 -1.9C1.7 -2.2 3.3 -2.2 3.8 -1.9"
 		"C4.4 -1.6 4.7 -1.2 4.7 -0.8C4.7 0.2 3.9 0.7 2.4 0.7C1.3 0.7 1 0.9 1.1 1.4C1.1 1.7 1.2 1.7 1.4 1.7"
 		"C1.5 1.7 1.8 1.6 2 1.6C3.2 1.4 4.2 2.8 3.5 3.7C3.4 3.9 3.4 4 3.6 4.1C4 4.4 4.3 4.4 4.2 4.1"
 		"C4.2 3.9 4.4 3.7 4.6 3.8C4.7 3.8 4.8 4 4.8 4.1C4.8 4.6 4.2 4.7 3.5 4.3Z"

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFReaderTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFReaderTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/GFReaderTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -224,7 +224,7 @@
 class LoggingGFReader : public GFReader {
 	public:
 		LoggingGFReader (istream &is) : GFReader(is) {}
-		void preamble (const string &str) {_info = str;}
+		void preamble (const string &str) override {_info = str;}
 		string getInfo () const {return _info;}
 
 	private:

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/JFMReaderTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/JFMReaderTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/JFMReaderTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -37,7 +37,7 @@
 	public:
 		JFMReaderTest () : jfm(0) {}
 
-		void SetUp () {
+		void SetUp () override {
 			string fname = string(SRCDIR)+"/data/cidjmgr0-h.tfm";
 			ifstream ifs(fname.c_str(), ios::binary);
 			ASSERT_TRUE(ifs.is_open()) << "failed opening " << fname;
@@ -44,7 +44,7 @@
 			jfm = new JFM(ifs);
 		}
 
-		void TearDown () {
+		void TearDown () override {
 			delete jfm;
 		}
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/LengthTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/LengthTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/LengthTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -39,6 +39,7 @@
 
 	len.set(1, Length::Unit::PC);
 	EXPECT_DOUBLE_EQ(len.pt(), 12);
+	EXPECT_DOUBLE_EQ(len.pc(), 1);
 
 	len.set(2.54, Length::Unit::CM);
 	EXPECT_DOUBLE_EQ(len.pt(), 72.27);
@@ -55,9 +56,11 @@
 
 	len.set(1, Length::Unit::CC);
 	EXPECT_DOUBLE_EQ(len.dd(), 12.0);
+	EXPECT_DOUBLE_EQ(len.cc(), 1);
 
 	len.set(1, Length::Unit::SP);
 	EXPECT_DOUBLE_EQ(len.pt(), 1.0/65536);
+	EXPECT_DOUBLE_EQ(len.sp(), 1);
 }
 
 
@@ -149,6 +152,44 @@
 }
 
 
+TEST(LengthTest, get) {
+	Length len;
+	len.set("1pt");
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::PT), 1);
+
+	len.set("72bp");
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::PT), 72.27);
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::BP), 72);
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::IN), 1);
+
+	len.set("1in");
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::PT), 72.27);
+
+	len.set("1pc");
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::PT), 12);
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::PC), 1);
+
+	len.set("2.54cm");
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::PT), 72.27);
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::CM), 2.54);
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::MM), 25.4);
+
+	len.set("10mm");
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::CM), 1);
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::MM), 10);
+
+	len.set("10dd");
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::PT), 12380.0/1157);
+
+	len.set("10cc");
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::DD), 120.0);
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::CC), 10.0);
+
+	len.set("10sp");
+	EXPECT_DOUBLE_EQ(len.get(Length::Unit::SP), 10.0);
+}
+
+
 TEST(LengthTest, str2unit) {
 	EXPECT_EQ(Length::stringToUnit("pt"), Length::Unit::PT);
 	EXPECT_EQ(Length::stringToUnit("bp"), Length::Unit::BP);
@@ -180,3 +221,15 @@
 	EXPECT_EQ(Length::unitToString(Length::Unit(300)), string("??"));
 }
 
+
+TEST(LengthTest, toString) {
+	EXPECT_EQ(Length(10, Length::Unit::PT).toString(Length::Unit::PT), "10pt");
+	EXPECT_EQ(Length(10, Length::Unit::BP).toString(Length::Unit::BP), "10bp");
+	EXPECT_EQ(Length(10, Length::Unit::IN).toString(Length::Unit::IN), "10in");
+	EXPECT_EQ(Length(10, Length::Unit::CM).toString(Length::Unit::CM), "10cm");
+	EXPECT_EQ(Length(10, Length::Unit::MM).toString(Length::Unit::MM), "10mm");
+	EXPECT_EQ(Length(10, Length::Unit::PC).toString(Length::Unit::PC), "10pc");
+	EXPECT_EQ(Length(10, Length::Unit::DD).toString(Length::Unit::DD), "10dd");
+	EXPECT_EQ(Length(10, Length::Unit::CC).toString(Length::Unit::CC), "10cc");
+	EXPECT_EQ(Length(10, Length::Unit::SP).toString(Length::Unit::SP), "10sp");
+}
\ No newline at end of file

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/Makefile.am
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/Makefile.am	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/Makefile.am	2017-02-13 17:57:19 UTC (rev 43208)
@@ -5,6 +5,21 @@
 
 SUBDIRS = data
 
+check_LTLIBRARIES = libgtest.la
+libgtest_la_SOURCES = gtest/src/gtest-all.cc gtest/src/gtest_main.cc
+libgtest_la_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include -I$(top_srcdir)/tests/gtest
+libgtest_la_LDFLAGS = -pthread
+EXTRA_DIST = gtest/LICENSE \
+	gtest/include \
+	gtest/src/gtest.cc \
+	gtest/src/gtest-death-test.cc \
+	gtest/src/gtest-filepath.cc \
+	gtest/src/gtest-internal-inl.h \
+	gtest/src/gtest-port.cc \
+	gtest/src/gtest-printers.cc \
+	gtest/src/gtest-test-part.cc \
+	gtest/src/gtest-typed-test.cc
+
 AM_CXXFLAGS = -I$(top_srcdir)/src -Wall -DSRCDIR='"$(srcdir)"' $(CODE_COVERAGE_CFLAGS)
 
 TESTS = hashcheck
@@ -12,6 +27,7 @@
 nodist_hashcheck_SOURCES = hashcheck.cpp
 hashcheck_LDADD = ../libs/xxHash/libxxhash.a
 hashcheck_CPPFLAGS = -I$(top_srcdir)/libs/xxHash
+
 hashcheck.cpp: genhashcheck.py $(top_srcdir)/src/AGLTable.hpp $(top_srcdir)/libs/xxHash/xxhash.h
 	python $^ >$@
 
@@ -18,259 +34,322 @@
 TESTS += BezierTest
 check_PROGRAMS += BezierTest
 BezierTest_SOURCES = BezierTest.cpp
-BezierTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+BezierTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+BezierTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += BitmapTest
 check_PROGRAMS += BitmapTest
 BitmapTest_SOURCES = BitmapTest.cpp
-BitmapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+BitmapTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+BitmapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += BoundingBoxTest
 check_PROGRAMS += BoundingBoxTest
 BoundingBoxTest_SOURCES = BoundingBoxTest.cpp
-BoundingBoxTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+BoundingBoxTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+BoundingBoxTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
-TESTS += CalculatorTest
-check_PROGRAMS += CalculatorTest
-CalculatorTest_SOURCES = CalculatorTest.cpp
-CalculatorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
-
 TESTS += CMapManagerTest
 check_PROGRAMS += CMapManagerTest
 CMapManagerTest_SOURCES = CMapManagerTest.cpp
-CMapManagerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+CMapManagerTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CMapManagerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += CMapReaderTest
 check_PROGRAMS += CMapReaderTest
 CMapReaderTest_SOURCES = CMapReaderTest.cpp
-CMapReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+CMapReaderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CMapReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += CMapTest
 check_PROGRAMS += CMapTest
 CMapTest_SOURCES = CMapTest.cpp
-CMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+CMapTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
+TESTS += CRC32Test
+check_PROGRAMS += CRC32Test
+CRC32Test_SOURCES = CRC32Test.cpp
+CRC32Test_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CRC32Test_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+
+TESTS += CalculatorTest
+check_PROGRAMS += CalculatorTest
+CalculatorTest_SOURCES = CalculatorTest.cpp
+CalculatorTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CalculatorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+
 TESTS += ColorSpecialTest
 check_PROGRAMS += ColorSpecialTest
 ColorSpecialTest_SOURCES = ColorSpecialTest.cpp
-ColorSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+ColorSpecialTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+ColorSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += ColorTest
 check_PROGRAMS += ColorTest
 ColorTest_SOURCES = ColorTest.cpp
-ColorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+ColorTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+ColorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += CommandLineTest
 check_PROGRAMS += CommandLineTest
 CommandLineTest_SOURCES = CommandLineTest.cpp
-CommandLineTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+CommandLineTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CommandLineTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
-TESTS += CRC32Test
-check_PROGRAMS += CRC32Test
-CRC32Test_SOURCES = CRC32Test.cpp
-CRC32Test_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
-
 TESTS += DependencyGraphTest
 check_PROGRAMS += DependencyGraphTest
 DependencyGraphTest_SOURCES = DependencyGraphTest.cpp
-DependencyGraphTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+DependencyGraphTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+DependencyGraphTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += DirectoryTest
 check_PROGRAMS += DirectoryTest
 DirectoryTest_SOURCES = DirectoryTest.cpp
-DirectoryTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+DirectoryTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+DirectoryTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += DvisvgmSpecialTest
 check_PROGRAMS += DvisvgmSpecialTest
 DvisvgmSpecialTest_SOURCES = DvisvgmSpecialTest.cpp
-DvisvgmSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+DvisvgmSpecialTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+DvisvgmSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += EmSpecialTest
 check_PROGRAMS += EmSpecialTest
 EmSpecialTest_SOURCES = EmSpecialTest.cpp
-EmSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+EmSpecialTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+EmSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += FileFinderTest
 check_PROGRAMS += FileFinderTest
 FileFinderTest_SOURCES = FileFinderTest.cpp
-FileFinderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+FileFinderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FileFinderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += FilePathTest
 check_PROGRAMS += FilePathTest
 FilePathTest_SOURCES = FilePathTest.cpp
-FilePathTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+FilePathTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FilePathTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += FileSystemTest
 check_PROGRAMS += FileSystemTest
 FileSystemTest_SOURCES = FileSystemTest.cpp
-FileSystemTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+FileSystemTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FileSystemTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
+TESTS += FontCacheTest
+check_PROGRAMS += FontCacheTest
+FontCacheTest_SOURCES = FontCacheTest.cpp
+FontCacheTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FontCacheTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+
 TESTS += FontManagerTest
 check_PROGRAMS += FontManagerTest
 FontManagerTest_SOURCES = FontManagerTest.cpp
-FontManagerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+FontManagerTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FontManagerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += FontMapTest
 check_PROGRAMS += FontMapTest
 FontMapTest_SOURCES = FontMapTest.cpp
-FontMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+FontMapTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FontMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += GFGlyphTracerTest
 check_PROGRAMS += GFGlyphTracerTest
 GFGlyphTracerTest_SOURCES = GFGlyphTracerTest.cpp
-GFGlyphTracerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+GFGlyphTracerTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+GFGlyphTracerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += GFReaderTest
 check_PROGRAMS += GFReaderTest
 GFReaderTest_SOURCES = GFReaderTest.cpp
-GFReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+GFReaderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+GFReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += GhostscriptTest
 check_PROGRAMS += GhostscriptTest
 GhostscriptTest_SOURCES = GhostscriptTest.cpp
-GhostscriptTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+GhostscriptTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+GhostscriptTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += GraphicsPathTest
 check_PROGRAMS += GraphicsPathTest
 GraphicsPathTest_SOURCES = GraphicsPathTest.cpp
-GraphicsPathTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+GraphicsPathTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+GraphicsPathTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += JFMReaderTest
 check_PROGRAMS += JFMReaderTest
 JFMReaderTest_SOURCES = JFMReaderTest.cpp
-JFMReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+JFMReaderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+JFMReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += LengthTest
 check_PROGRAMS += LengthTest
 LengthTest_SOURCES = LengthTest.cpp
-LengthTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+LengthTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+LengthTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += MapLineTest
 check_PROGRAMS += MapLineTest
 MapLineTest_SOURCES = MapLineTest.cpp
-MapLineTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+MapLineTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+MapLineTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += MatrixTest
 check_PROGRAMS += MatrixTest
 MatrixTest_SOURCES = MatrixTest.cpp
-MatrixTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+MatrixTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+MatrixTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += MessageExceptionTest
 check_PROGRAMS += MessageExceptionTest
 MessageExceptionTest_SOURCES = MessageExceptionTest.cpp
-MessageExceptionTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+MessageExceptionTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+MessageExceptionTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
+TESTS += PSInterpreterTest
+check_PROGRAMS += PSInterpreterTest
+PSInterpreterTest_SOURCES = PSInterpreterTest.cpp
+PSInterpreterTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+PSInterpreterTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+
 TESTS += PageRagesTest
 check_PROGRAMS += PageRagesTest
 PageRagesTest_SOURCES = PageRagesTest.cpp
-PageRagesTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+PageRagesTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+PageRagesTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += PageSizeTest
 check_PROGRAMS += PageSizeTest
 PageSizeTest_SOURCES = PageSizeTest.cpp
-PageSizeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+PageSizeTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+PageSizeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += PairTest
 check_PROGRAMS += PairTest
 PairTest_SOURCES = PairTest.cpp
-PairTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+PairTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+PairTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
-TESTS += PSInterpreterTest
-check_PROGRAMS += PSInterpreterTest
-PSInterpreterTest_SOURCES = PSInterpreterTest.cpp
-PSInterpreterTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+TESTS += PapersizeSpecialTest
+check_PROGRAMS += PapersizeSpecialTest
+PapersizeSpecialTest_SOURCES = PapersizeSpecialTest.cpp
+PapersizeSpecialTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+PapersizeSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += RangeMapTest
 check_PROGRAMS += RangeMapTest
 RangeMapTest_SOURCES = RangeMapTest.cpp
-RangeMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+RangeMapTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+RangeMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
+TESTS += SVGOutputTest
+check_PROGRAMS += SVGOutputTest
+SVGOutputTest_SOURCES = SVGOutputTest.cpp
+SVGOutputTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+SVGOutputTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+
 TESTS += ShadingPatchTest
 check_PROGRAMS += ShadingPatchTest
 ShadingPatchTest_SOURCES = ShadingPatchTest.cpp
-ShadingPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+ShadingPatchTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+ShadingPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += SplittedCharInputBufferTest
 check_PROGRAMS += SplittedCharInputBufferTest
 SplittedCharInputBufferTest_SOURCES = SplittedCharInputBufferTest.cpp
-SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+SplittedCharInputBufferTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += StreamInputBufferTest
 check_PROGRAMS += StreamInputBufferTest
 StreamInputBufferTest_SOURCES = StreamInputBufferTest.cpp
-StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+StreamInputBufferTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += StreamReaderTest
 check_PROGRAMS += StreamReaderTest
 StreamReaderTest_SOURCES = StreamReaderTest.cpp
-StreamReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+StreamReaderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+StreamReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += StreamWriterTest
 check_PROGRAMS += StreamWriterTest
 StreamWriterTest_SOURCES = StreamWriterTest.cpp
-StreamWriterTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+StreamWriterTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+StreamWriterTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += SubfontTest
 check_PROGRAMS += SubfontTest
 SubfontTest_SOURCES = SubfontTest.cpp
-SubfontTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+SubfontTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+SubfontTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
-TESTS += SVGOutputTest
-check_PROGRAMS += SVGOutputTest
-SVGOutputTest_SOURCES = SVGOutputTest.cpp
-SVGOutputTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+TESTS += TFMReaderTest
+check_PROGRAMS += TFMReaderTest
+TFMReaderTest_SOURCES = TFMReaderTest.cpp
+TFMReaderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+TFMReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += TensorProductPatchTest
 check_PROGRAMS += TensorProductPatchTest
 TensorProductPatchTest_SOURCES = TensorProductPatchTest.cpp
-TensorProductPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+TensorProductPatchTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+TensorProductPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
-TESTS += TFMReaderTest
-check_PROGRAMS += TFMReaderTest
-TFMReaderTest_SOURCES = TFMReaderTest.cpp
-TFMReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
-
 TESTS += ToUnicodeMapTest
 check_PROGRAMS += ToUnicodeMapTest
 ToUnicodeMapTest_SOURCES = ToUnicodeMapTest.cpp
-ToUnicodeMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+ToUnicodeMapTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+ToUnicodeMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += TriangularPatchTest
 check_PROGRAMS += TriangularPatchTest
 TriangularPatchTest_SOURCES = TriangularPatchTest.cpp
-TriangularPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+TriangularPatchTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+TriangularPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += UnicodeTest
 check_PROGRAMS += UnicodeTest
 UnicodeTest_SOURCES = UnicodeTest.cpp
-UnicodeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+UnicodeTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+UnicodeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += UtilityTest
 check_PROGRAMS += UtilityTest
 UtilityTest_SOURCES = UtilityTest.cpp
-UtilityTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+UtilityTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+UtilityTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += VectorIteratorTest
 check_PROGRAMS += VectorIteratorTest
 VectorIteratorTest_SOURCES = VectorIteratorTest.cpp
-VectorIteratorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+VectorIteratorTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+VectorIteratorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += VectorStreamTest
 check_PROGRAMS += VectorStreamTest
 VectorStreamTest_SOURCES = VectorStreamTest.cpp
-VectorStreamTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+VectorStreamTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+VectorStreamTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += XMLNodeTest
 check_PROGRAMS += XMLNodeTest
 XMLNodeTest_SOURCES = XMLNodeTest.cpp
-XMLNodeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+XMLNodeTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+XMLNodeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
 TESTS += XMLStringTest
 check_PROGRAMS += XMLStringTest
 XMLStringTest_SOURCES = XMLStringTest.cpp
-XMLStringTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+XMLStringTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+XMLStringTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 
-EXTRA_DIST = check-conv genhashcheck.py normalize.xsl
+EXTRA_DIST += check-conv genhashcheck.py normalize.xsl
 TESTS += check-conv
 
 @CODE_COVERAGE_RULES@

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -89,59 +89,64 @@
 host_triplet = @host@
 target_triplet = @target@
 TESTS = hashcheck$(EXEEXT) BezierTest$(EXEEXT) BitmapTest$(EXEEXT) \
-	BoundingBoxTest$(EXEEXT) CalculatorTest$(EXEEXT) \
-	CMapManagerTest$(EXEEXT) CMapReaderTest$(EXEEXT) \
-	CMapTest$(EXEEXT) ColorSpecialTest$(EXEEXT) ColorTest$(EXEEXT) \
-	CommandLineTest$(EXEEXT) CRC32Test$(EXEEXT) \
+	BoundingBoxTest$(EXEEXT) CMapManagerTest$(EXEEXT) \
+	CMapReaderTest$(EXEEXT) CMapTest$(EXEEXT) CRC32Test$(EXEEXT) \
+	CalculatorTest$(EXEEXT) ColorSpecialTest$(EXEEXT) \
+	ColorTest$(EXEEXT) CommandLineTest$(EXEEXT) \
 	DependencyGraphTest$(EXEEXT) DirectoryTest$(EXEEXT) \
 	DvisvgmSpecialTest$(EXEEXT) EmSpecialTest$(EXEEXT) \
 	FileFinderTest$(EXEEXT) FilePathTest$(EXEEXT) \
-	FileSystemTest$(EXEEXT) FontManagerTest$(EXEEXT) \
-	FontMapTest$(EXEEXT) GFGlyphTracerTest$(EXEEXT) \
-	GFReaderTest$(EXEEXT) GhostscriptTest$(EXEEXT) \
-	GraphicsPathTest$(EXEEXT) JFMReaderTest$(EXEEXT) \
-	LengthTest$(EXEEXT) MapLineTest$(EXEEXT) MatrixTest$(EXEEXT) \
-	MessageExceptionTest$(EXEEXT) PageRagesTest$(EXEEXT) \
-	PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
-	PSInterpreterTest$(EXEEXT) RangeMapTest$(EXEEXT) \
-	ShadingPatchTest$(EXEEXT) SplittedCharInputBufferTest$(EXEEXT) \
+	FileSystemTest$(EXEEXT) FontCacheTest$(EXEEXT) \
+	FontManagerTest$(EXEEXT) FontMapTest$(EXEEXT) \
+	GFGlyphTracerTest$(EXEEXT) GFReaderTest$(EXEEXT) \
+	GhostscriptTest$(EXEEXT) GraphicsPathTest$(EXEEXT) \
+	JFMReaderTest$(EXEEXT) LengthTest$(EXEEXT) \
+	MapLineTest$(EXEEXT) MatrixTest$(EXEEXT) \
+	MessageExceptionTest$(EXEEXT) PSInterpreterTest$(EXEEXT) \
+	PageRagesTest$(EXEEXT) PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
+	PapersizeSpecialTest$(EXEEXT) RangeMapTest$(EXEEXT) \
+	SVGOutputTest$(EXEEXT) ShadingPatchTest$(EXEEXT) \
+	SplittedCharInputBufferTest$(EXEEXT) \
 	StreamInputBufferTest$(EXEEXT) StreamReaderTest$(EXEEXT) \
 	StreamWriterTest$(EXEEXT) SubfontTest$(EXEEXT) \
-	SVGOutputTest$(EXEEXT) TensorProductPatchTest$(EXEEXT) \
-	TFMReaderTest$(EXEEXT) ToUnicodeMapTest$(EXEEXT) \
-	TriangularPatchTest$(EXEEXT) UnicodeTest$(EXEEXT) \
-	UtilityTest$(EXEEXT) VectorIteratorTest$(EXEEXT) \
-	VectorStreamTest$(EXEEXT) XMLNodeTest$(EXEEXT) \
-	XMLStringTest$(EXEEXT) check-conv
+	TFMReaderTest$(EXEEXT) TensorProductPatchTest$(EXEEXT) \
+	ToUnicodeMapTest$(EXEEXT) TriangularPatchTest$(EXEEXT) \
+	UnicodeTest$(EXEEXT) UtilityTest$(EXEEXT) \
+	VectorIteratorTest$(EXEEXT) VectorStreamTest$(EXEEXT) \
+	XMLNodeTest$(EXEEXT) XMLStringTest$(EXEEXT) check-conv
 check_PROGRAMS = hashcheck$(EXEEXT) BezierTest$(EXEEXT) \
 	BitmapTest$(EXEEXT) BoundingBoxTest$(EXEEXT) \
-	CalculatorTest$(EXEEXT) CMapManagerTest$(EXEEXT) \
-	CMapReaderTest$(EXEEXT) CMapTest$(EXEEXT) \
+	CMapManagerTest$(EXEEXT) CMapReaderTest$(EXEEXT) \
+	CMapTest$(EXEEXT) CRC32Test$(EXEEXT) CalculatorTest$(EXEEXT) \
 	ColorSpecialTest$(EXEEXT) ColorTest$(EXEEXT) \
-	CommandLineTest$(EXEEXT) CRC32Test$(EXEEXT) \
-	DependencyGraphTest$(EXEEXT) DirectoryTest$(EXEEXT) \
-	DvisvgmSpecialTest$(EXEEXT) EmSpecialTest$(EXEEXT) \
-	FileFinderTest$(EXEEXT) FilePathTest$(EXEEXT) \
-	FileSystemTest$(EXEEXT) FontManagerTest$(EXEEXT) \
+	CommandLineTest$(EXEEXT) DependencyGraphTest$(EXEEXT) \
+	DirectoryTest$(EXEEXT) DvisvgmSpecialTest$(EXEEXT) \
+	EmSpecialTest$(EXEEXT) FileFinderTest$(EXEEXT) \
+	FilePathTest$(EXEEXT) FileSystemTest$(EXEEXT) \
+	FontCacheTest$(EXEEXT) FontManagerTest$(EXEEXT) \
 	FontMapTest$(EXEEXT) GFGlyphTracerTest$(EXEEXT) \
 	GFReaderTest$(EXEEXT) GhostscriptTest$(EXEEXT) \
 	GraphicsPathTest$(EXEEXT) JFMReaderTest$(EXEEXT) \
 	LengthTest$(EXEEXT) MapLineTest$(EXEEXT) MatrixTest$(EXEEXT) \
-	MessageExceptionTest$(EXEEXT) PageRagesTest$(EXEEXT) \
-	PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
-	PSInterpreterTest$(EXEEXT) RangeMapTest$(EXEEXT) \
-	ShadingPatchTest$(EXEEXT) SplittedCharInputBufferTest$(EXEEXT) \
+	MessageExceptionTest$(EXEEXT) PSInterpreterTest$(EXEEXT) \
+	PageRagesTest$(EXEEXT) PageSizeTest$(EXEEXT) PairTest$(EXEEXT) \
+	PapersizeSpecialTest$(EXEEXT) RangeMapTest$(EXEEXT) \
+	SVGOutputTest$(EXEEXT) ShadingPatchTest$(EXEEXT) \
+	SplittedCharInputBufferTest$(EXEEXT) \
 	StreamInputBufferTest$(EXEEXT) StreamReaderTest$(EXEEXT) \
 	StreamWriterTest$(EXEEXT) SubfontTest$(EXEEXT) \
-	SVGOutputTest$(EXEEXT) TensorProductPatchTest$(EXEEXT) \
-	TFMReaderTest$(EXEEXT) ToUnicodeMapTest$(EXEEXT) \
-	TriangularPatchTest$(EXEEXT) UnicodeTest$(EXEEXT) \
-	UtilityTest$(EXEEXT) VectorIteratorTest$(EXEEXT) \
-	VectorStreamTest$(EXEEXT) XMLNodeTest$(EXEEXT) \
-	XMLStringTest$(EXEEXT)
+	TFMReaderTest$(EXEEXT) TensorProductPatchTest$(EXEEXT) \
+	ToUnicodeMapTest$(EXEEXT) TriangularPatchTest$(EXEEXT) \
+	UnicodeTest$(EXEEXT) UtilityTest$(EXEEXT) \
+	VectorIteratorTest$(EXEEXT) VectorStreamTest$(EXEEXT) \
+	XMLNodeTest$(EXEEXT) XMLStringTest$(EXEEXT)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -149,213 +154,254 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am_BezierTest_OBJECTS = BezierTest.$(OBJEXT)
+libgtest_la_LIBADD =
+am__dirstamp = $(am__leading_dot)dirstamp
+am_libgtest_la_OBJECTS = gtest/src/libgtest_la-gtest-all.lo \
+	gtest/src/libgtest_la-gtest_main.lo
+libgtest_la_OBJECTS = $(am_libgtest_la_OBJECTS)
+AM_V_lt = $(am__v_lt_ at AM_V@)
+am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+libgtest_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(libgtest_la_LDFLAGS) $(LDFLAGS) -o $@
+am_BezierTest_OBJECTS = BezierTest-BezierTest.$(OBJEXT)
 BezierTest_OBJECTS = $(am_BezierTest_OBJECTS)
 am__DEPENDENCIES_1 =
 BezierTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_BitmapTest_OBJECTS = BitmapTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_BitmapTest_OBJECTS = BitmapTest-BitmapTest.$(OBJEXT)
 BitmapTest_OBJECTS = $(am_BitmapTest_OBJECTS)
 BitmapTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_BoundingBoxTest_OBJECTS = BoundingBoxTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_BoundingBoxTest_OBJECTS =  \
+	BoundingBoxTest-BoundingBoxTest.$(OBJEXT)
 BoundingBoxTest_OBJECTS = $(am_BoundingBoxTest_OBJECTS)
 BoundingBoxTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_CMapManagerTest_OBJECTS = CMapManagerTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_CMapManagerTest_OBJECTS =  \
+	CMapManagerTest-CMapManagerTest.$(OBJEXT)
 CMapManagerTest_OBJECTS = $(am_CMapManagerTest_OBJECTS)
 CMapManagerTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_CMapReaderTest_OBJECTS = CMapReaderTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_CMapReaderTest_OBJECTS = CMapReaderTest-CMapReaderTest.$(OBJEXT)
 CMapReaderTest_OBJECTS = $(am_CMapReaderTest_OBJECTS)
 CMapReaderTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_CMapTest_OBJECTS = CMapTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_CMapTest_OBJECTS = CMapTest-CMapTest.$(OBJEXT)
 CMapTest_OBJECTS = $(am_CMapTest_OBJECTS)
 CMapTest_DEPENDENCIES = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a \
-	$(am__DEPENDENCIES_1)
-am_CRC32Test_OBJECTS = CRC32Test.$(OBJEXT)
+	libgtest.la $(am__DEPENDENCIES_1)
+am_CRC32Test_OBJECTS = CRC32Test-CRC32Test.$(OBJEXT)
 CRC32Test_OBJECTS = $(am_CRC32Test_OBJECTS)
 CRC32Test_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_CalculatorTest_OBJECTS = CalculatorTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_CalculatorTest_OBJECTS = CalculatorTest-CalculatorTest.$(OBJEXT)
 CalculatorTest_OBJECTS = $(am_CalculatorTest_OBJECTS)
 CalculatorTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_ColorSpecialTest_OBJECTS = ColorSpecialTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_ColorSpecialTest_OBJECTS =  \
+	ColorSpecialTest-ColorSpecialTest.$(OBJEXT)
 ColorSpecialTest_OBJECTS = $(am_ColorSpecialTest_OBJECTS)
 ColorSpecialTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_ColorTest_OBJECTS = ColorTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_ColorTest_OBJECTS = ColorTest-ColorTest.$(OBJEXT)
 ColorTest_OBJECTS = $(am_ColorTest_OBJECTS)
 ColorTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_CommandLineTest_OBJECTS = CommandLineTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_CommandLineTest_OBJECTS =  \
+	CommandLineTest-CommandLineTest.$(OBJEXT)
 CommandLineTest_OBJECTS = $(am_CommandLineTest_OBJECTS)
 CommandLineTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_DependencyGraphTest_OBJECTS = DependencyGraphTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_DependencyGraphTest_OBJECTS =  \
+	DependencyGraphTest-DependencyGraphTest.$(OBJEXT)
 DependencyGraphTest_OBJECTS = $(am_DependencyGraphTest_OBJECTS)
 DependencyGraphTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_DirectoryTest_OBJECTS = DirectoryTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_DirectoryTest_OBJECTS = DirectoryTest-DirectoryTest.$(OBJEXT)
 DirectoryTest_OBJECTS = $(am_DirectoryTest_OBJECTS)
 DirectoryTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_DvisvgmSpecialTest_OBJECTS = DvisvgmSpecialTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_DvisvgmSpecialTest_OBJECTS =  \
+	DvisvgmSpecialTest-DvisvgmSpecialTest.$(OBJEXT)
 DvisvgmSpecialTest_OBJECTS = $(am_DvisvgmSpecialTest_OBJECTS)
 DvisvgmSpecialTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_EmSpecialTest_OBJECTS = EmSpecialTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_EmSpecialTest_OBJECTS = EmSpecialTest-EmSpecialTest.$(OBJEXT)
 EmSpecialTest_OBJECTS = $(am_EmSpecialTest_OBJECTS)
 EmSpecialTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_FileFinderTest_OBJECTS = FileFinderTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_FileFinderTest_OBJECTS = FileFinderTest-FileFinderTest.$(OBJEXT)
 FileFinderTest_OBJECTS = $(am_FileFinderTest_OBJECTS)
 FileFinderTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_FilePathTest_OBJECTS = FilePathTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_FilePathTest_OBJECTS = FilePathTest-FilePathTest.$(OBJEXT)
 FilePathTest_OBJECTS = $(am_FilePathTest_OBJECTS)
 FilePathTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_FileSystemTest_OBJECTS = FileSystemTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_FileSystemTest_OBJECTS = FileSystemTest-FileSystemTest.$(OBJEXT)
 FileSystemTest_OBJECTS = $(am_FileSystemTest_OBJECTS)
 FileSystemTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_FontManagerTest_OBJECTS = FontManagerTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_FontCacheTest_OBJECTS = FontCacheTest-FontCacheTest.$(OBJEXT)
+FontCacheTest_OBJECTS = $(am_FontCacheTest_OBJECTS)
+FontCacheTest_DEPENDENCIES = ../src/libdvisvgm.a \
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_FontManagerTest_OBJECTS =  \
+	FontManagerTest-FontManagerTest.$(OBJEXT)
 FontManagerTest_OBJECTS = $(am_FontManagerTest_OBJECTS)
 FontManagerTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_FontMapTest_OBJECTS = FontMapTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_FontMapTest_OBJECTS = FontMapTest-FontMapTest.$(OBJEXT)
 FontMapTest_OBJECTS = $(am_FontMapTest_OBJECTS)
 FontMapTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_GFGlyphTracerTest_OBJECTS = GFGlyphTracerTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_GFGlyphTracerTest_OBJECTS =  \
+	GFGlyphTracerTest-GFGlyphTracerTest.$(OBJEXT)
 GFGlyphTracerTest_OBJECTS = $(am_GFGlyphTracerTest_OBJECTS)
 GFGlyphTracerTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_GFReaderTest_OBJECTS = GFReaderTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_GFReaderTest_OBJECTS = GFReaderTest-GFReaderTest.$(OBJEXT)
 GFReaderTest_OBJECTS = $(am_GFReaderTest_OBJECTS)
 GFReaderTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_GhostscriptTest_OBJECTS = GhostscriptTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_GhostscriptTest_OBJECTS =  \
+	GhostscriptTest-GhostscriptTest.$(OBJEXT)
 GhostscriptTest_OBJECTS = $(am_GhostscriptTest_OBJECTS)
 GhostscriptTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_GraphicsPathTest_OBJECTS = GraphicsPathTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_GraphicsPathTest_OBJECTS =  \
+	GraphicsPathTest-GraphicsPathTest.$(OBJEXT)
 GraphicsPathTest_OBJECTS = $(am_GraphicsPathTest_OBJECTS)
 GraphicsPathTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_JFMReaderTest_OBJECTS = JFMReaderTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_JFMReaderTest_OBJECTS = JFMReaderTest-JFMReaderTest.$(OBJEXT)
 JFMReaderTest_OBJECTS = $(am_JFMReaderTest_OBJECTS)
 JFMReaderTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_LengthTest_OBJECTS = LengthTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_LengthTest_OBJECTS = LengthTest-LengthTest.$(OBJEXT)
 LengthTest_OBJECTS = $(am_LengthTest_OBJECTS)
 LengthTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_MapLineTest_OBJECTS = MapLineTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_MapLineTest_OBJECTS = MapLineTest-MapLineTest.$(OBJEXT)
 MapLineTest_OBJECTS = $(am_MapLineTest_OBJECTS)
 MapLineTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_MatrixTest_OBJECTS = MatrixTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_MatrixTest_OBJECTS = MatrixTest-MatrixTest.$(OBJEXT)
 MatrixTest_OBJECTS = $(am_MatrixTest_OBJECTS)
 MatrixTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_MessageExceptionTest_OBJECTS = MessageExceptionTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_MessageExceptionTest_OBJECTS =  \
+	MessageExceptionTest-MessageExceptionTest.$(OBJEXT)
 MessageExceptionTest_OBJECTS = $(am_MessageExceptionTest_OBJECTS)
 MessageExceptionTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_PSInterpreterTest_OBJECTS = PSInterpreterTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_PSInterpreterTest_OBJECTS =  \
+	PSInterpreterTest-PSInterpreterTest.$(OBJEXT)
 PSInterpreterTest_OBJECTS = $(am_PSInterpreterTest_OBJECTS)
 PSInterpreterTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_PageRagesTest_OBJECTS = PageRagesTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_PageRagesTest_OBJECTS = PageRagesTest-PageRagesTest.$(OBJEXT)
 PageRagesTest_OBJECTS = $(am_PageRagesTest_OBJECTS)
 PageRagesTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_PageSizeTest_OBJECTS = PageSizeTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_PageSizeTest_OBJECTS = PageSizeTest-PageSizeTest.$(OBJEXT)
 PageSizeTest_OBJECTS = $(am_PageSizeTest_OBJECTS)
 PageSizeTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_PairTest_OBJECTS = PairTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_PairTest_OBJECTS = PairTest-PairTest.$(OBJEXT)
 PairTest_OBJECTS = $(am_PairTest_OBJECTS)
 PairTest_DEPENDENCIES = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a \
-	$(am__DEPENDENCIES_1)
-am_RangeMapTest_OBJECTS = RangeMapTest.$(OBJEXT)
+	libgtest.la $(am__DEPENDENCIES_1)
+am_PapersizeSpecialTest_OBJECTS =  \
+	PapersizeSpecialTest-PapersizeSpecialTest.$(OBJEXT)
+PapersizeSpecialTest_OBJECTS = $(am_PapersizeSpecialTest_OBJECTS)
+PapersizeSpecialTest_DEPENDENCIES = ../src/libdvisvgm.a \
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_RangeMapTest_OBJECTS = RangeMapTest-RangeMapTest.$(OBJEXT)
 RangeMapTest_OBJECTS = $(am_RangeMapTest_OBJECTS)
 RangeMapTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_SVGOutputTest_OBJECTS = SVGOutputTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_SVGOutputTest_OBJECTS = SVGOutputTest-SVGOutputTest.$(OBJEXT)
 SVGOutputTest_OBJECTS = $(am_SVGOutputTest_OBJECTS)
 SVGOutputTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_ShadingPatchTest_OBJECTS = ShadingPatchTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_ShadingPatchTest_OBJECTS =  \
+	ShadingPatchTest-ShadingPatchTest.$(OBJEXT)
 ShadingPatchTest_OBJECTS = $(am_ShadingPatchTest_OBJECTS)
 ShadingPatchTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_SplittedCharInputBufferTest_OBJECTS =  \
-	SplittedCharInputBufferTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_SplittedCharInputBufferTest_OBJECTS = SplittedCharInputBufferTest-SplittedCharInputBufferTest.$(OBJEXT)
 SplittedCharInputBufferTest_OBJECTS =  \
 	$(am_SplittedCharInputBufferTest_OBJECTS)
 SplittedCharInputBufferTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_StreamInputBufferTest_OBJECTS = StreamInputBufferTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_StreamInputBufferTest_OBJECTS =  \
+	StreamInputBufferTest-StreamInputBufferTest.$(OBJEXT)
 StreamInputBufferTest_OBJECTS = $(am_StreamInputBufferTest_OBJECTS)
 StreamInputBufferTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_StreamReaderTest_OBJECTS = StreamReaderTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_StreamReaderTest_OBJECTS =  \
+	StreamReaderTest-StreamReaderTest.$(OBJEXT)
 StreamReaderTest_OBJECTS = $(am_StreamReaderTest_OBJECTS)
 StreamReaderTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_StreamWriterTest_OBJECTS = StreamWriterTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_StreamWriterTest_OBJECTS =  \
+	StreamWriterTest-StreamWriterTest.$(OBJEXT)
 StreamWriterTest_OBJECTS = $(am_StreamWriterTest_OBJECTS)
 StreamWriterTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_SubfontTest_OBJECTS = SubfontTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_SubfontTest_OBJECTS = SubfontTest-SubfontTest.$(OBJEXT)
 SubfontTest_OBJECTS = $(am_SubfontTest_OBJECTS)
 SubfontTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_TFMReaderTest_OBJECTS = TFMReaderTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_TFMReaderTest_OBJECTS = TFMReaderTest-TFMReaderTest.$(OBJEXT)
 TFMReaderTest_OBJECTS = $(am_TFMReaderTest_OBJECTS)
 TFMReaderTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_TensorProductPatchTest_OBJECTS = TensorProductPatchTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_TensorProductPatchTest_OBJECTS =  \
+	TensorProductPatchTest-TensorProductPatchTest.$(OBJEXT)
 TensorProductPatchTest_OBJECTS = $(am_TensorProductPatchTest_OBJECTS)
 TensorProductPatchTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_ToUnicodeMapTest_OBJECTS = ToUnicodeMapTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_ToUnicodeMapTest_OBJECTS =  \
+	ToUnicodeMapTest-ToUnicodeMapTest.$(OBJEXT)
 ToUnicodeMapTest_OBJECTS = $(am_ToUnicodeMapTest_OBJECTS)
 ToUnicodeMapTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_TriangularPatchTest_OBJECTS = TriangularPatchTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_TriangularPatchTest_OBJECTS =  \
+	TriangularPatchTest-TriangularPatchTest.$(OBJEXT)
 TriangularPatchTest_OBJECTS = $(am_TriangularPatchTest_OBJECTS)
 TriangularPatchTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_UnicodeTest_OBJECTS = UnicodeTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_UnicodeTest_OBJECTS = UnicodeTest-UnicodeTest.$(OBJEXT)
 UnicodeTest_OBJECTS = $(am_UnicodeTest_OBJECTS)
 UnicodeTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_UtilityTest_OBJECTS = UtilityTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_UtilityTest_OBJECTS = UtilityTest-UtilityTest.$(OBJEXT)
 UtilityTest_OBJECTS = $(am_UtilityTest_OBJECTS)
 UtilityTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_VectorIteratorTest_OBJECTS = VectorIteratorTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_VectorIteratorTest_OBJECTS =  \
+	VectorIteratorTest-VectorIteratorTest.$(OBJEXT)
 VectorIteratorTest_OBJECTS = $(am_VectorIteratorTest_OBJECTS)
 VectorIteratorTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_VectorStreamTest_OBJECTS = VectorStreamTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_VectorStreamTest_OBJECTS =  \
+	VectorStreamTest-VectorStreamTest.$(OBJEXT)
 VectorStreamTest_OBJECTS = $(am_VectorStreamTest_OBJECTS)
 VectorStreamTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_XMLNodeTest_OBJECTS = XMLNodeTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_XMLNodeTest_OBJECTS = XMLNodeTest-XMLNodeTest.$(OBJEXT)
 XMLNodeTest_OBJECTS = $(am_XMLNodeTest_OBJECTS)
 XMLNodeTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
-am_XMLStringTest_OBJECTS = XMLStringTest.$(OBJEXT)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
+am_XMLStringTest_OBJECTS = XMLStringTest-XMLStringTest.$(OBJEXT)
 XMLStringTest_OBJECTS = $(am_XMLStringTest_OBJECTS)
 XMLStringTest_DEPENDENCIES = ../src/libdvisvgm.a \
-	../libs/xxHash/libxxhash.a $(am__DEPENDENCIES_1)
+	../libs/xxHash/libxxhash.a libgtest.la $(am__DEPENDENCIES_1)
 nodist_hashcheck_OBJECTS = hashcheck-hashcheck.$(OBJEXT)
 hashcheck_OBJECTS = $(nodist_hashcheck_OBJECTS)
 hashcheck_DEPENDENCIES = ../libs/xxHash/libxxhash.a
@@ -375,32 +421,34 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 am__mv = mv -f
-AM_V_lt = $(am__v_lt_ at AM_V@)
-am__v_lt_ = $(am__v_lt_ at AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
 AM_V_CXX = $(am__v_CXX_ at AM_V@)
 am__v_CXX_ = $(am__v_CXX_ at AM_DEFAULT_V@)
 am__v_CXX_0 = @echo "  CXX     " $@;
 am__v_CXX_1 = 
 CXXLD = $(CXX)
-CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
-	-o $@
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_CXXLD = $(am__v_CXXLD_ at AM_V@)
 am__v_CXXLD_ = $(am__v_CXXLD_ at AM_DEFAULT_V@)
 am__v_CXXLD_0 = @echo "  CXXLD   " $@;
 am__v_CXXLD_1 = 
-SOURCES = $(BezierTest_SOURCES) $(BitmapTest_SOURCES) \
-	$(BoundingBoxTest_SOURCES) $(CMapManagerTest_SOURCES) \
-	$(CMapReaderTest_SOURCES) $(CMapTest_SOURCES) \
-	$(CRC32Test_SOURCES) $(CalculatorTest_SOURCES) \
-	$(ColorSpecialTest_SOURCES) $(ColorTest_SOURCES) \
-	$(CommandLineTest_SOURCES) $(DependencyGraphTest_SOURCES) \
-	$(DirectoryTest_SOURCES) $(DvisvgmSpecialTest_SOURCES) \
-	$(EmSpecialTest_SOURCES) $(FileFinderTest_SOURCES) \
-	$(FilePathTest_SOURCES) $(FileSystemTest_SOURCES) \
+SOURCES = $(libgtest_la_SOURCES) $(BezierTest_SOURCES) \
+	$(BitmapTest_SOURCES) $(BoundingBoxTest_SOURCES) \
+	$(CMapManagerTest_SOURCES) $(CMapReaderTest_SOURCES) \
+	$(CMapTest_SOURCES) $(CRC32Test_SOURCES) \
+	$(CalculatorTest_SOURCES) $(ColorSpecialTest_SOURCES) \
+	$(ColorTest_SOURCES) $(CommandLineTest_SOURCES) \
+	$(DependencyGraphTest_SOURCES) $(DirectoryTest_SOURCES) \
+	$(DvisvgmSpecialTest_SOURCES) $(EmSpecialTest_SOURCES) \
+	$(FileFinderTest_SOURCES) $(FilePathTest_SOURCES) \
+	$(FileSystemTest_SOURCES) $(FontCacheTest_SOURCES) \
 	$(FontManagerTest_SOURCES) $(FontMapTest_SOURCES) \
 	$(GFGlyphTracerTest_SOURCES) $(GFReaderTest_SOURCES) \
 	$(GhostscriptTest_SOURCES) $(GraphicsPathTest_SOURCES) \
@@ -408,8 +456,9 @@
 	$(MapLineTest_SOURCES) $(MatrixTest_SOURCES) \
 	$(MessageExceptionTest_SOURCES) $(PSInterpreterTest_SOURCES) \
 	$(PageRagesTest_SOURCES) $(PageSizeTest_SOURCES) \
-	$(PairTest_SOURCES) $(RangeMapTest_SOURCES) \
-	$(SVGOutputTest_SOURCES) $(ShadingPatchTest_SOURCES) \
+	$(PairTest_SOURCES) $(PapersizeSpecialTest_SOURCES) \
+	$(RangeMapTest_SOURCES) $(SVGOutputTest_SOURCES) \
+	$(ShadingPatchTest_SOURCES) \
 	$(SplittedCharInputBufferTest_SOURCES) \
 	$(StreamInputBufferTest_SOURCES) $(StreamReaderTest_SOURCES) \
 	$(StreamWriterTest_SOURCES) $(SubfontTest_SOURCES) \
@@ -419,15 +468,16 @@
 	$(VectorIteratorTest_SOURCES) $(VectorStreamTest_SOURCES) \
 	$(XMLNodeTest_SOURCES) $(XMLStringTest_SOURCES) \
 	$(nodist_hashcheck_SOURCES)
-DIST_SOURCES = $(BezierTest_SOURCES) $(BitmapTest_SOURCES) \
-	$(BoundingBoxTest_SOURCES) $(CMapManagerTest_SOURCES) \
-	$(CMapReaderTest_SOURCES) $(CMapTest_SOURCES) \
-	$(CRC32Test_SOURCES) $(CalculatorTest_SOURCES) \
-	$(ColorSpecialTest_SOURCES) $(ColorTest_SOURCES) \
-	$(CommandLineTest_SOURCES) $(DependencyGraphTest_SOURCES) \
-	$(DirectoryTest_SOURCES) $(DvisvgmSpecialTest_SOURCES) \
-	$(EmSpecialTest_SOURCES) $(FileFinderTest_SOURCES) \
-	$(FilePathTest_SOURCES) $(FileSystemTest_SOURCES) \
+DIST_SOURCES = $(libgtest_la_SOURCES) $(BezierTest_SOURCES) \
+	$(BitmapTest_SOURCES) $(BoundingBoxTest_SOURCES) \
+	$(CMapManagerTest_SOURCES) $(CMapReaderTest_SOURCES) \
+	$(CMapTest_SOURCES) $(CRC32Test_SOURCES) \
+	$(CalculatorTest_SOURCES) $(ColorSpecialTest_SOURCES) \
+	$(ColorTest_SOURCES) $(CommandLineTest_SOURCES) \
+	$(DependencyGraphTest_SOURCES) $(DirectoryTest_SOURCES) \
+	$(DvisvgmSpecialTest_SOURCES) $(EmSpecialTest_SOURCES) \
+	$(FileFinderTest_SOURCES) $(FilePathTest_SOURCES) \
+	$(FileSystemTest_SOURCES) $(FontCacheTest_SOURCES) \
 	$(FontManagerTest_SOURCES) $(FontMapTest_SOURCES) \
 	$(GFGlyphTracerTest_SOURCES) $(GFReaderTest_SOURCES) \
 	$(GhostscriptTest_SOURCES) $(GraphicsPathTest_SOURCES) \
@@ -435,8 +485,9 @@
 	$(MapLineTest_SOURCES) $(MatrixTest_SOURCES) \
 	$(MessageExceptionTest_SOURCES) $(PSInterpreterTest_SOURCES) \
 	$(PageRagesTest_SOURCES) $(PageSizeTest_SOURCES) \
-	$(PairTest_SOURCES) $(RangeMapTest_SOURCES) \
-	$(SVGOutputTest_SOURCES) $(ShadingPatchTest_SOURCES) \
+	$(PairTest_SOURCES) $(PapersizeSpecialTest_SOURCES) \
+	$(RangeMapTest_SOURCES) $(SVGOutputTest_SOURCES) \
+	$(ShadingPatchTest_SOURCES) \
 	$(SplittedCharInputBufferTest_SOURCES) \
 	$(StreamInputBufferTest_SOURCES) $(StreamReaderTest_SOURCES) \
 	$(StreamWriterTest_SOURCES) $(SubfontTest_SOURCES) \
@@ -722,6 +773,7 @@
 AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -731,11 +783,14 @@
 CFLAGS = @CFLAGS@
 CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
 CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
+CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
 CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
 CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -742,11 +797,15 @@
 DATE = @DATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GCOV = @GCOV@
@@ -759,13 +818,24 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LCOV = @LCOV@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -789,8 +859,10 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -828,6 +900,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -841,118 +914,184 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 SUBDIRS = data
+check_LTLIBRARIES = libgtest.la
+libgtest_la_SOURCES = gtest/src/gtest-all.cc gtest/src/gtest_main.cc
+libgtest_la_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include -I$(top_srcdir)/tests/gtest
+libgtest_la_LDFLAGS = -pthread
+EXTRA_DIST = gtest/LICENSE gtest/include gtest/src/gtest.cc \
+	gtest/src/gtest-death-test.cc gtest/src/gtest-filepath.cc \
+	gtest/src/gtest-internal-inl.h gtest/src/gtest-port.cc \
+	gtest/src/gtest-printers.cc gtest/src/gtest-test-part.cc \
+	gtest/src/gtest-typed-test.cc check-conv genhashcheck.py \
+	normalize.xsl
 AM_CXXFLAGS = -I$(top_srcdir)/src -Wall -DSRCDIR='"$(srcdir)"' $(CODE_COVERAGE_CFLAGS)
 nodist_hashcheck_SOURCES = hashcheck.cpp
 hashcheck_LDADD = ../libs/xxHash/libxxhash.a
 hashcheck_CPPFLAGS = -I$(top_srcdir)/libs/xxHash
 BezierTest_SOURCES = BezierTest.cpp
-BezierTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+BezierTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+BezierTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 BitmapTest_SOURCES = BitmapTest.cpp
-BitmapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+BitmapTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+BitmapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 BoundingBoxTest_SOURCES = BoundingBoxTest.cpp
-BoundingBoxTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
-CalculatorTest_SOURCES = CalculatorTest.cpp
-CalculatorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+BoundingBoxTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+BoundingBoxTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 CMapManagerTest_SOURCES = CMapManagerTest.cpp
-CMapManagerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+CMapManagerTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CMapManagerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 CMapReaderTest_SOURCES = CMapReaderTest.cpp
-CMapReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+CMapReaderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CMapReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 CMapTest_SOURCES = CMapTest.cpp
-CMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+CMapTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+CRC32Test_SOURCES = CRC32Test.cpp
+CRC32Test_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CRC32Test_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+CalculatorTest_SOURCES = CalculatorTest.cpp
+CalculatorTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CalculatorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 ColorSpecialTest_SOURCES = ColorSpecialTest.cpp
-ColorSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+ColorSpecialTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+ColorSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 ColorTest_SOURCES = ColorTest.cpp
-ColorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+ColorTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+ColorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 CommandLineTest_SOURCES = CommandLineTest.cpp
-CommandLineTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
-CRC32Test_SOURCES = CRC32Test.cpp
-CRC32Test_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+CommandLineTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+CommandLineTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 DependencyGraphTest_SOURCES = DependencyGraphTest.cpp
-DependencyGraphTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+DependencyGraphTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+DependencyGraphTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 DirectoryTest_SOURCES = DirectoryTest.cpp
-DirectoryTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+DirectoryTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+DirectoryTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 DvisvgmSpecialTest_SOURCES = DvisvgmSpecialTest.cpp
-DvisvgmSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+DvisvgmSpecialTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+DvisvgmSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 EmSpecialTest_SOURCES = EmSpecialTest.cpp
-EmSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+EmSpecialTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+EmSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 FileFinderTest_SOURCES = FileFinderTest.cpp
-FileFinderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+FileFinderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FileFinderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 FilePathTest_SOURCES = FilePathTest.cpp
-FilePathTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+FilePathTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FilePathTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 FileSystemTest_SOURCES = FileSystemTest.cpp
-FileSystemTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+FileSystemTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FileSystemTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+FontCacheTest_SOURCES = FontCacheTest.cpp
+FontCacheTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FontCacheTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 FontManagerTest_SOURCES = FontManagerTest.cpp
-FontManagerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+FontManagerTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FontManagerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 FontMapTest_SOURCES = FontMapTest.cpp
-FontMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+FontMapTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+FontMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 GFGlyphTracerTest_SOURCES = GFGlyphTracerTest.cpp
-GFGlyphTracerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+GFGlyphTracerTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+GFGlyphTracerTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 GFReaderTest_SOURCES = GFReaderTest.cpp
-GFReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+GFReaderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+GFReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 GhostscriptTest_SOURCES = GhostscriptTest.cpp
-GhostscriptTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+GhostscriptTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+GhostscriptTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 GraphicsPathTest_SOURCES = GraphicsPathTest.cpp
-GraphicsPathTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+GraphicsPathTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+GraphicsPathTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 JFMReaderTest_SOURCES = JFMReaderTest.cpp
-JFMReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+JFMReaderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+JFMReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 LengthTest_SOURCES = LengthTest.cpp
-LengthTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+LengthTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+LengthTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 MapLineTest_SOURCES = MapLineTest.cpp
-MapLineTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+MapLineTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+MapLineTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 MatrixTest_SOURCES = MatrixTest.cpp
-MatrixTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+MatrixTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+MatrixTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 MessageExceptionTest_SOURCES = MessageExceptionTest.cpp
-MessageExceptionTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+MessageExceptionTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+MessageExceptionTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+PSInterpreterTest_SOURCES = PSInterpreterTest.cpp
+PSInterpreterTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+PSInterpreterTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 PageRagesTest_SOURCES = PageRagesTest.cpp
-PageRagesTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+PageRagesTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+PageRagesTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 PageSizeTest_SOURCES = PageSizeTest.cpp
-PageSizeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+PageSizeTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+PageSizeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 PairTest_SOURCES = PairTest.cpp
-PairTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
-PSInterpreterTest_SOURCES = PSInterpreterTest.cpp
-PSInterpreterTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+PairTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+PairTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+PapersizeSpecialTest_SOURCES = PapersizeSpecialTest.cpp
+PapersizeSpecialTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+PapersizeSpecialTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 RangeMapTest_SOURCES = RangeMapTest.cpp
-RangeMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+RangeMapTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+RangeMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+SVGOutputTest_SOURCES = SVGOutputTest.cpp
+SVGOutputTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+SVGOutputTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 ShadingPatchTest_SOURCES = ShadingPatchTest.cpp
-ShadingPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+ShadingPatchTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+ShadingPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 SplittedCharInputBufferTest_SOURCES = SplittedCharInputBufferTest.cpp
-SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+SplittedCharInputBufferTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+SplittedCharInputBufferTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 StreamInputBufferTest_SOURCES = StreamInputBufferTest.cpp
-StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+StreamInputBufferTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+StreamInputBufferTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 StreamReaderTest_SOURCES = StreamReaderTest.cpp
-StreamReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+StreamReaderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+StreamReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 StreamWriterTest_SOURCES = StreamWriterTest.cpp
-StreamWriterTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+StreamWriterTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+StreamWriterTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 SubfontTest_SOURCES = SubfontTest.cpp
-SubfontTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
-SVGOutputTest_SOURCES = SVGOutputTest.cpp
-SVGOutputTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+SubfontTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+SubfontTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
+TFMReaderTest_SOURCES = TFMReaderTest.cpp
+TFMReaderTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+TFMReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 TensorProductPatchTest_SOURCES = TensorProductPatchTest.cpp
-TensorProductPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
-TFMReaderTest_SOURCES = TFMReaderTest.cpp
-TFMReaderTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+TensorProductPatchTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+TensorProductPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 ToUnicodeMapTest_SOURCES = ToUnicodeMapTest.cpp
-ToUnicodeMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+ToUnicodeMapTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+ToUnicodeMapTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 TriangularPatchTest_SOURCES = TriangularPatchTest.cpp
-TriangularPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+TriangularPatchTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+TriangularPatchTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 UnicodeTest_SOURCES = UnicodeTest.cpp
-UnicodeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+UnicodeTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+UnicodeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 UtilityTest_SOURCES = UtilityTest.cpp
-UtilityTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+UtilityTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+UtilityTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 VectorIteratorTest_SOURCES = VectorIteratorTest.cpp
-VectorIteratorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+VectorIteratorTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+VectorIteratorTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 VectorStreamTest_SOURCES = VectorStreamTest.cpp
-VectorStreamTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+VectorStreamTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+VectorStreamTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 XMLNodeTest_SOURCES = XMLNodeTest.cpp
-XMLNodeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
+XMLNodeTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+XMLNodeTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 XMLStringTest_SOURCES = XMLStringTest.cpp
-XMLStringTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a -L../potracelib -lpotrace -lfreetype -lgtest -lgtest_main -lpthread $(CODE_COVERAGE_LDFLAGS)
-EXTRA_DIST = check-conv genhashcheck.py normalize.xsl
+XMLStringTest_CPPFLAGS = -I$(top_srcdir)/tests/gtest/include
+XMLStringTest_LDADD = ../src/libdvisvgm.a ../libs/xxHash/libxxhash.a libgtest.la -lpotrace -lfreetype $(CODE_COVERAGE_LDFLAGS)
 CLEANFILES = *.gcda *.gcno hashcheck.cpp
 all: all-recursive
 
 .SUFFIXES:
-.SUFFIXES: .cpp .log .o .obj .test .test$(EXEEXT) .trs
+.SUFFIXES: .cc .cpp .lo .log .o .obj .test .test$(EXEEXT) .trs
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -962,9 +1101,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu tests/Makefile
+	  $(AUTOMAKE) --foreign tests/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -983,8 +1122,38 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
+clean-checkLTLIBRARIES:
+	-test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES)
+	@list='$(check_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+gtest/src/$(am__dirstamp):
+	@$(MKDIR_P) gtest/src
+	@: > gtest/src/$(am__dirstamp)
+gtest/src/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) gtest/src/$(DEPDIR)
+	@: > gtest/src/$(DEPDIR)/$(am__dirstamp)
+gtest/src/libgtest_la-gtest-all.lo: gtest/src/$(am__dirstamp) \
+	gtest/src/$(DEPDIR)/$(am__dirstamp)
+gtest/src/libgtest_la-gtest_main.lo: gtest/src/$(am__dirstamp) \
+	gtest/src/$(DEPDIR)/$(am__dirstamp)
+
+libgtest.la: $(libgtest_la_OBJECTS) $(libgtest_la_DEPENDENCIES) $(EXTRA_libgtest_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(libgtest_la_LINK)  $(libgtest_la_OBJECTS) $(libgtest_la_LIBADD) $(LIBS)
+
 clean-checkPROGRAMS:
-	-test -z "$(check_PROGRAMS)" || rm -f $(check_PROGRAMS)
+	@list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 
 BezierTest$(EXEEXT): $(BezierTest_OBJECTS) $(BezierTest_DEPENDENCIES) $(EXTRA_BezierTest_DEPENDENCIES) 
 	@rm -f BezierTest$(EXEEXT)
@@ -1058,6 +1227,10 @@
 	@rm -f FileSystemTest$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(FileSystemTest_OBJECTS) $(FileSystemTest_LDADD) $(LIBS)
 
+FontCacheTest$(EXEEXT): $(FontCacheTest_OBJECTS) $(FontCacheTest_DEPENDENCIES) $(EXTRA_FontCacheTest_DEPENDENCIES) 
+	@rm -f FontCacheTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(FontCacheTest_OBJECTS) $(FontCacheTest_LDADD) $(LIBS)
+
 FontManagerTest$(EXEEXT): $(FontManagerTest_OBJECTS) $(FontManagerTest_DEPENDENCIES) $(EXTRA_FontManagerTest_DEPENDENCIES) 
 	@rm -f FontManagerTest$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(FontManagerTest_OBJECTS) $(FontManagerTest_LDADD) $(LIBS)
@@ -1118,6 +1291,10 @@
 	@rm -f PairTest$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(PairTest_OBJECTS) $(PairTest_LDADD) $(LIBS)
 
+PapersizeSpecialTest$(EXEEXT): $(PapersizeSpecialTest_OBJECTS) $(PapersizeSpecialTest_DEPENDENCIES) $(EXTRA_PapersizeSpecialTest_DEPENDENCIES) 
+	@rm -f PapersizeSpecialTest$(EXEEXT)
+	$(AM_V_CXXLD)$(CXXLINK) $(PapersizeSpecialTest_OBJECTS) $(PapersizeSpecialTest_LDADD) $(LIBS)
+
 RangeMapTest$(EXEEXT): $(RangeMapTest_OBJECTS) $(RangeMapTest_DEPENDENCIES) $(EXTRA_RangeMapTest_DEPENDENCIES) 
 	@rm -f RangeMapTest$(EXEEXT)
 	$(AM_V_CXXLD)$(CXXLINK) $(RangeMapTest_OBJECTS) $(RangeMapTest_LDADD) $(LIBS)
@@ -1196,64 +1373,70 @@
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
+	-rm -f gtest/src/*.$(OBJEXT)
+	-rm -f gtest/src/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
 
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/BezierTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/BitmapTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/BoundingBoxTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CMapManagerTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CMapReaderTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CMapTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CRC32Test.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CalculatorTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ColorSpecialTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ColorTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CommandLineTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DependencyGraphTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DirectoryTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DvisvgmSpecialTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/EmSpecialTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FileFinderTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FilePathTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FileSystemTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FontManagerTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FontMapTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/GFGlyphTracerTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/GFReaderTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/GhostscriptTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/GraphicsPathTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/JFMReaderTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/LengthTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MapLineTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MatrixTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MessageExceptionTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/PSInterpreterTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/PageRagesTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/PageSizeTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/PairTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/RangeMapTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/SVGOutputTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ShadingPatchTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/SplittedCharInputBufferTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/StreamInputBufferTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/StreamReaderTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/StreamWriterTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/SubfontTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TFMReaderTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TensorProductPatchTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ToUnicodeMapTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TriangularPatchTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UnicodeTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UtilityTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/VectorIteratorTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/VectorStreamTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLNodeTest.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/BezierTest-BezierTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/BitmapTest-BitmapTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/BoundingBoxTest-BoundingBoxTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CMapManagerTest-CMapManagerTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CMapReaderTest-CMapReaderTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CMapTest-CMapTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CRC32Test-CRC32Test.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CalculatorTest-CalculatorTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ColorSpecialTest-ColorSpecialTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ColorTest-ColorTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/CommandLineTest-CommandLineTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DependencyGraphTest-DependencyGraphTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DirectoryTest-DirectoryTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/DvisvgmSpecialTest-DvisvgmSpecialTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/EmSpecialTest-EmSpecialTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FileFinderTest-FileFinderTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FilePathTest-FilePathTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FileSystemTest-FileSystemTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FontCacheTest-FontCacheTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FontManagerTest-FontManagerTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/FontMapTest-FontMapTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/GFGlyphTracerTest-GFGlyphTracerTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/GFReaderTest-GFReaderTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/GhostscriptTest-GhostscriptTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/JFMReaderTest-JFMReaderTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/LengthTest-LengthTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MapLineTest-MapLineTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MatrixTest-MatrixTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/MessageExceptionTest-MessageExceptionTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/PSInterpreterTest-PSInterpreterTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/PageRagesTest-PageRagesTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/PageSizeTest-PageSizeTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/PairTest-PairTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/PapersizeSpecialTest-PapersizeSpecialTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/RangeMapTest-RangeMapTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/SVGOutputTest-SVGOutputTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ShadingPatchTest-ShadingPatchTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/SplittedCharInputBufferTest-SplittedCharInputBufferTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/StreamInputBufferTest-StreamInputBufferTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/StreamReaderTest-StreamReaderTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/StreamWriterTest-StreamWriterTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/SubfontTest-SubfontTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TFMReaderTest-TFMReaderTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TensorProductPatchTest-TensorProductPatchTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ToUnicodeMapTest-ToUnicodeMapTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/TriangularPatchTest-TriangularPatchTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UnicodeTest-UnicodeTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/UtilityTest-UtilityTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/VectorIteratorTest-VectorIteratorTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/VectorStreamTest-VectorStreamTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLNodeTest-XMLNodeTest.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringTest-XMLStringTest.Po at am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/hashcheck-hashcheck.Po at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at gtest/src/$(DEPDIR)/libgtest_la-gtest-all.Plo at am__quote@
+ at AMDEP_TRUE@@am__include@ @am__quote at gtest/src/$(DEPDIR)/libgtest_la-gtest_main.Plo at am__quote@
 
-.cpp.o:
+.cc.o:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
 @am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
@@ -1261,7 +1444,7 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
 
-.cpp.obj:
+.cc.obj:
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
 @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
 @am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
@@ -1269,6 +1452,770 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
 
+.cc.lo:
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+gtest/src/libgtest_la-gtest-all.lo: gtest/src/gtest-all.cc
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgtest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest/src/libgtest_la-gtest-all.lo -MD -MP -MF gtest/src/$(DEPDIR)/libgtest_la-gtest-all.Tpo -c -o gtest/src/libgtest_la-gtest-all.lo `test -f 'gtest/src/gtest-all.cc' || echo '$(srcdir)/'`gtest/src/gtest-all.cc
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gtest/src/$(DEPDIR)/libgtest_la-gtest-all.Tpo gtest/src/$(DEPDIR)/libgtest_la-gtest-all.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='gtest/src/gtest-all.cc' object='gtest/src/libgtest_la-gtest-all.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgtest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest/src/libgtest_la-gtest-all.lo `test -f 'gtest/src/gtest-all.cc' || echo '$(srcdir)/'`gtest/src/gtest-all.cc
+
+gtest/src/libgtest_la-gtest_main.lo: gtest/src/gtest_main.cc
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgtest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT gtest/src/libgtest_la-gtest_main.lo -MD -MP -MF gtest/src/$(DEPDIR)/libgtest_la-gtest_main.Tpo -c -o gtest/src/libgtest_la-gtest_main.lo `test -f 'gtest/src/gtest_main.cc' || echo '$(srcdir)/'`gtest/src/gtest_main.cc
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) gtest/src/$(DEPDIR)/libgtest_la-gtest_main.Tpo gtest/src/$(DEPDIR)/libgtest_la-gtest_main.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='gtest/src/gtest_main.cc' object='gtest/src/libgtest_la-gtest_main.lo' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libgtest_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o gtest/src/libgtest_la-gtest_main.lo `test -f 'gtest/src/gtest_main.cc' || echo '$(srcdir)/'`gtest/src/gtest_main.cc
+
+BezierTest-BezierTest.o: BezierTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BezierTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT BezierTest-BezierTest.o -MD -MP -MF $(DEPDIR)/BezierTest-BezierTest.Tpo -c -o BezierTest-BezierTest.o `test -f 'BezierTest.cpp' || echo '$(srcdir)/'`BezierTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/BezierTest-BezierTest.Tpo $(DEPDIR)/BezierTest-BezierTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='BezierTest.cpp' object='BezierTest-BezierTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BezierTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o BezierTest-BezierTest.o `test -f 'BezierTest.cpp' || echo '$(srcdir)/'`BezierTest.cpp
+
+BezierTest-BezierTest.obj: BezierTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BezierTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT BezierTest-BezierTest.obj -MD -MP -MF $(DEPDIR)/BezierTest-BezierTest.Tpo -c -o BezierTest-BezierTest.obj `if test -f 'BezierTest.cpp'; then $(CYGPATH_W) 'BezierTest.cpp'; else $(CYGPATH_W) '$(srcdir)/BezierTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/BezierTest-BezierTest.Tpo $(DEPDIR)/BezierTest-BezierTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='BezierTest.cpp' object='BezierTest-BezierTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BezierTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o BezierTest-BezierTest.obj `if test -f 'BezierTest.cpp'; then $(CYGPATH_W) 'BezierTest.cpp'; else $(CYGPATH_W) '$(srcdir)/BezierTest.cpp'; fi`
+
+BitmapTest-BitmapTest.o: BitmapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BitmapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT BitmapTest-BitmapTest.o -MD -MP -MF $(DEPDIR)/BitmapTest-BitmapTest.Tpo -c -o BitmapTest-BitmapTest.o `test -f 'BitmapTest.cpp' || echo '$(srcdir)/'`BitmapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/BitmapTest-BitmapTest.Tpo $(DEPDIR)/BitmapTest-BitmapTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='BitmapTest.cpp' object='BitmapTest-BitmapTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BitmapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o BitmapTest-BitmapTest.o `test -f 'BitmapTest.cpp' || echo '$(srcdir)/'`BitmapTest.cpp
+
+BitmapTest-BitmapTest.obj: BitmapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BitmapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT BitmapTest-BitmapTest.obj -MD -MP -MF $(DEPDIR)/BitmapTest-BitmapTest.Tpo -c -o BitmapTest-BitmapTest.obj `if test -f 'BitmapTest.cpp'; then $(CYGPATH_W) 'BitmapTest.cpp'; else $(CYGPATH_W) '$(srcdir)/BitmapTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/BitmapTest-BitmapTest.Tpo $(DEPDIR)/BitmapTest-BitmapTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='BitmapTest.cpp' object='BitmapTest-BitmapTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BitmapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o BitmapTest-BitmapTest.obj `if test -f 'BitmapTest.cpp'; then $(CYGPATH_W) 'BitmapTest.cpp'; else $(CYGPATH_W) '$(srcdir)/BitmapTest.cpp'; fi`
+
+BoundingBoxTest-BoundingBoxTest.o: BoundingBoxTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BoundingBoxTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT BoundingBoxTest-BoundingBoxTest.o -MD -MP -MF $(DEPDIR)/BoundingBoxTest-BoundingBoxTest.Tpo -c -o BoundingBoxTest-BoundingBoxTest.o `test -f 'BoundingBoxTest.cpp' || echo '$(srcdir)/'`BoundingBoxTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/BoundingBoxTest-BoundingBoxTest.Tpo $(DEPDIR)/BoundingBoxTest-BoundingBoxTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='BoundingBoxTest.cpp' object='BoundingBoxTest-BoundingBoxTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BoundingBoxTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o BoundingBoxTest-BoundingBoxTest.o `test -f 'BoundingBoxTest.cpp' || echo '$(srcdir)/'`BoundingBoxTest.cpp
+
+BoundingBoxTest-BoundingBoxTest.obj: BoundingBoxTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BoundingBoxTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT BoundingBoxTest-BoundingBoxTest.obj -MD -MP -MF $(DEPDIR)/BoundingBoxTest-BoundingBoxTest.Tpo -c -o BoundingBoxTest-BoundingBoxTest.obj `if test -f 'BoundingBoxTest.cpp'; then $(CYGPATH_W) 'BoundingBoxTest.cpp'; else $(CYGPATH_W) '$(srcdir)/BoundingBoxTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/BoundingBoxTest-BoundingBoxTest.Tpo $(DEPDIR)/BoundingBoxTest-BoundingBoxTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='BoundingBoxTest.cpp' object='BoundingBoxTest-BoundingBoxTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(BoundingBoxTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o BoundingBoxTest-BoundingBoxTest.obj `if test -f 'BoundingBoxTest.cpp'; then $(CYGPATH_W) 'BoundingBoxTest.cpp'; else $(CYGPATH_W) '$(srcdir)/BoundingBoxTest.cpp'; fi`
+
+CMapManagerTest-CMapManagerTest.o: CMapManagerTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapManagerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CMapManagerTest-CMapManagerTest.o -MD -MP -MF $(DEPDIR)/CMapManagerTest-CMapManagerTest.Tpo -c -o CMapManagerTest-CMapManagerTest.o `test -f 'CMapManagerTest.cpp' || echo '$(srcdir)/'`CMapManagerTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CMapManagerTest-CMapManagerTest.Tpo $(DEPDIR)/CMapManagerTest-CMapManagerTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CMapManagerTest.cpp' object='CMapManagerTest-CMapManagerTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapManagerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CMapManagerTest-CMapManagerTest.o `test -f 'CMapManagerTest.cpp' || echo '$(srcdir)/'`CMapManagerTest.cpp
+
+CMapManagerTest-CMapManagerTest.obj: CMapManagerTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapManagerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CMapManagerTest-CMapManagerTest.obj -MD -MP -MF $(DEPDIR)/CMapManagerTest-CMapManagerTest.Tpo -c -o CMapManagerTest-CMapManagerTest.obj `if test -f 'CMapManagerTest.cpp'; then $(CYGPATH_W) 'CMapManagerTest.cpp'; else $(CYGPATH_W) '$(srcdir)/CMapManagerTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CMapManagerTest-CMapManagerTest.Tpo $(DEPDIR)/CMapManagerTest-CMapManagerTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CMapManagerTest.cpp' object='CMapManagerTest-CMapManagerTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapManagerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CMapManagerTest-CMapManagerTest.obj `if test -f 'CMapManagerTest.cpp'; then $(CYGPATH_W) 'CMapManagerTest.cpp'; else $(CYGPATH_W) '$(srcdir)/CMapManagerTest.cpp'; fi`
+
+CMapReaderTest-CMapReaderTest.o: CMapReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CMapReaderTest-CMapReaderTest.o -MD -MP -MF $(DEPDIR)/CMapReaderTest-CMapReaderTest.Tpo -c -o CMapReaderTest-CMapReaderTest.o `test -f 'CMapReaderTest.cpp' || echo '$(srcdir)/'`CMapReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CMapReaderTest-CMapReaderTest.Tpo $(DEPDIR)/CMapReaderTest-CMapReaderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CMapReaderTest.cpp' object='CMapReaderTest-CMapReaderTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CMapReaderTest-CMapReaderTest.o `test -f 'CMapReaderTest.cpp' || echo '$(srcdir)/'`CMapReaderTest.cpp
+
+CMapReaderTest-CMapReaderTest.obj: CMapReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CMapReaderTest-CMapReaderTest.obj -MD -MP -MF $(DEPDIR)/CMapReaderTest-CMapReaderTest.Tpo -c -o CMapReaderTest-CMapReaderTest.obj `if test -f 'CMapReaderTest.cpp'; then $(CYGPATH_W) 'CMapReaderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/CMapReaderTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CMapReaderTest-CMapReaderTest.Tpo $(DEPDIR)/CMapReaderTest-CMapReaderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CMapReaderTest.cpp' object='CMapReaderTest-CMapReaderTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CMapReaderTest-CMapReaderTest.obj `if test -f 'CMapReaderTest.cpp'; then $(CYGPATH_W) 'CMapReaderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/CMapReaderTest.cpp'; fi`
+
+CMapTest-CMapTest.o: CMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CMapTest-CMapTest.o -MD -MP -MF $(DEPDIR)/CMapTest-CMapTest.Tpo -c -o CMapTest-CMapTest.o `test -f 'CMapTest.cpp' || echo '$(srcdir)/'`CMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CMapTest-CMapTest.Tpo $(DEPDIR)/CMapTest-CMapTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CMapTest.cpp' object='CMapTest-CMapTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CMapTest-CMapTest.o `test -f 'CMapTest.cpp' || echo '$(srcdir)/'`CMapTest.cpp
+
+CMapTest-CMapTest.obj: CMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CMapTest-CMapTest.obj -MD -MP -MF $(DEPDIR)/CMapTest-CMapTest.Tpo -c -o CMapTest-CMapTest.obj `if test -f 'CMapTest.cpp'; then $(CYGPATH_W) 'CMapTest.cpp'; else $(CYGPATH_W) '$(srcdir)/CMapTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CMapTest-CMapTest.Tpo $(DEPDIR)/CMapTest-CMapTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CMapTest.cpp' object='CMapTest-CMapTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CMapTest-CMapTest.obj `if test -f 'CMapTest.cpp'; then $(CYGPATH_W) 'CMapTest.cpp'; else $(CYGPATH_W) '$(srcdir)/CMapTest.cpp'; fi`
+
+CRC32Test-CRC32Test.o: CRC32Test.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CRC32Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CRC32Test-CRC32Test.o -MD -MP -MF $(DEPDIR)/CRC32Test-CRC32Test.Tpo -c -o CRC32Test-CRC32Test.o `test -f 'CRC32Test.cpp' || echo '$(srcdir)/'`CRC32Test.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CRC32Test-CRC32Test.Tpo $(DEPDIR)/CRC32Test-CRC32Test.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CRC32Test.cpp' object='CRC32Test-CRC32Test.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CRC32Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CRC32Test-CRC32Test.o `test -f 'CRC32Test.cpp' || echo '$(srcdir)/'`CRC32Test.cpp
+
+CRC32Test-CRC32Test.obj: CRC32Test.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CRC32Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CRC32Test-CRC32Test.obj -MD -MP -MF $(DEPDIR)/CRC32Test-CRC32Test.Tpo -c -o CRC32Test-CRC32Test.obj `if test -f 'CRC32Test.cpp'; then $(CYGPATH_W) 'CRC32Test.cpp'; else $(CYGPATH_W) '$(srcdir)/CRC32Test.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CRC32Test-CRC32Test.Tpo $(DEPDIR)/CRC32Test-CRC32Test.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CRC32Test.cpp' object='CRC32Test-CRC32Test.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CRC32Test_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CRC32Test-CRC32Test.obj `if test -f 'CRC32Test.cpp'; then $(CYGPATH_W) 'CRC32Test.cpp'; else $(CYGPATH_W) '$(srcdir)/CRC32Test.cpp'; fi`
+
+CalculatorTest-CalculatorTest.o: CalculatorTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CalculatorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CalculatorTest-CalculatorTest.o -MD -MP -MF $(DEPDIR)/CalculatorTest-CalculatorTest.Tpo -c -o CalculatorTest-CalculatorTest.o `test -f 'CalculatorTest.cpp' || echo '$(srcdir)/'`CalculatorTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CalculatorTest-CalculatorTest.Tpo $(DEPDIR)/CalculatorTest-CalculatorTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CalculatorTest.cpp' object='CalculatorTest-CalculatorTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CalculatorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CalculatorTest-CalculatorTest.o `test -f 'CalculatorTest.cpp' || echo '$(srcdir)/'`CalculatorTest.cpp
+
+CalculatorTest-CalculatorTest.obj: CalculatorTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CalculatorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CalculatorTest-CalculatorTest.obj -MD -MP -MF $(DEPDIR)/CalculatorTest-CalculatorTest.Tpo -c -o CalculatorTest-CalculatorTest.obj `if test -f 'CalculatorTest.cpp'; then $(CYGPATH_W) 'CalculatorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/CalculatorTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CalculatorTest-CalculatorTest.Tpo $(DEPDIR)/CalculatorTest-CalculatorTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CalculatorTest.cpp' object='CalculatorTest-CalculatorTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CalculatorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CalculatorTest-CalculatorTest.obj `if test -f 'CalculatorTest.cpp'; then $(CYGPATH_W) 'CalculatorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/CalculatorTest.cpp'; fi`
+
+ColorSpecialTest-ColorSpecialTest.o: ColorSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ColorSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ColorSpecialTest-ColorSpecialTest.o -MD -MP -MF $(DEPDIR)/ColorSpecialTest-ColorSpecialTest.Tpo -c -o ColorSpecialTest-ColorSpecialTest.o `test -f 'ColorSpecialTest.cpp' || echo '$(srcdir)/'`ColorSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ColorSpecialTest-ColorSpecialTest.Tpo $(DEPDIR)/ColorSpecialTest-ColorSpecialTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ColorSpecialTest.cpp' object='ColorSpecialTest-ColorSpecialTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ColorSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ColorSpecialTest-ColorSpecialTest.o `test -f 'ColorSpecialTest.cpp' || echo '$(srcdir)/'`ColorSpecialTest.cpp
+
+ColorSpecialTest-ColorSpecialTest.obj: ColorSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ColorSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ColorSpecialTest-ColorSpecialTest.obj -MD -MP -MF $(DEPDIR)/ColorSpecialTest-ColorSpecialTest.Tpo -c -o ColorSpecialTest-ColorSpecialTest.obj `if test -f 'ColorSpecialTest.cpp'; then $(CYGPATH_W) 'ColorSpecialTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ColorSpecialTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ColorSpecialTest-ColorSpecialTest.Tpo $(DEPDIR)/ColorSpecialTest-ColorSpecialTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ColorSpecialTest.cpp' object='ColorSpecialTest-ColorSpecialTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ColorSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ColorSpecialTest-ColorSpecialTest.obj `if test -f 'ColorSpecialTest.cpp'; then $(CYGPATH_W) 'ColorSpecialTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ColorSpecialTest.cpp'; fi`
+
+ColorTest-ColorTest.o: ColorTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ColorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ColorTest-ColorTest.o -MD -MP -MF $(DEPDIR)/ColorTest-ColorTest.Tpo -c -o ColorTest-ColorTest.o `test -f 'ColorTest.cpp' || echo '$(srcdir)/'`ColorTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ColorTest-ColorTest.Tpo $(DEPDIR)/ColorTest-ColorTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ColorTest.cpp' object='ColorTest-ColorTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ColorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ColorTest-ColorTest.o `test -f 'ColorTest.cpp' || echo '$(srcdir)/'`ColorTest.cpp
+
+ColorTest-ColorTest.obj: ColorTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ColorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ColorTest-ColorTest.obj -MD -MP -MF $(DEPDIR)/ColorTest-ColorTest.Tpo -c -o ColorTest-ColorTest.obj `if test -f 'ColorTest.cpp'; then $(CYGPATH_W) 'ColorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ColorTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ColorTest-ColorTest.Tpo $(DEPDIR)/ColorTest-ColorTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ColorTest.cpp' object='ColorTest-ColorTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ColorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ColorTest-ColorTest.obj `if test -f 'ColorTest.cpp'; then $(CYGPATH_W) 'ColorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ColorTest.cpp'; fi`
+
+CommandLineTest-CommandLineTest.o: CommandLineTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CommandLineTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CommandLineTest-CommandLineTest.o -MD -MP -MF $(DEPDIR)/CommandLineTest-CommandLineTest.Tpo -c -o CommandLineTest-CommandLineTest.o `test -f 'CommandLineTest.cpp' || echo '$(srcdir)/'`CommandLineTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CommandLineTest-CommandLineTest.Tpo $(DEPDIR)/CommandLineTest-CommandLineTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CommandLineTest.cpp' object='CommandLineTest-CommandLineTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CommandLineTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CommandLineTest-CommandLineTest.o `test -f 'CommandLineTest.cpp' || echo '$(srcdir)/'`CommandLineTest.cpp
+
+CommandLineTest-CommandLineTest.obj: CommandLineTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CommandLineTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT CommandLineTest-CommandLineTest.obj -MD -MP -MF $(DEPDIR)/CommandLineTest-CommandLineTest.Tpo -c -o CommandLineTest-CommandLineTest.obj `if test -f 'CommandLineTest.cpp'; then $(CYGPATH_W) 'CommandLineTest.cpp'; else $(CYGPATH_W) '$(srcdir)/CommandLineTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/CommandLineTest-CommandLineTest.Tpo $(DEPDIR)/CommandLineTest-CommandLineTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='CommandLineTest.cpp' object='CommandLineTest-CommandLineTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CommandLineTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o CommandLineTest-CommandLineTest.obj `if test -f 'CommandLineTest.cpp'; then $(CYGPATH_W) 'CommandLineTest.cpp'; else $(CYGPATH_W) '$(srcdir)/CommandLineTest.cpp'; fi`
+
+DependencyGraphTest-DependencyGraphTest.o: DependencyGraphTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DependencyGraphTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DependencyGraphTest-DependencyGraphTest.o -MD -MP -MF $(DEPDIR)/DependencyGraphTest-DependencyGraphTest.Tpo -c -o DependencyGraphTest-DependencyGraphTest.o `test -f 'DependencyGraphTest.cpp' || echo '$(srcdir)/'`DependencyGraphTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/DependencyGraphTest-DependencyGraphTest.Tpo $(DEPDIR)/DependencyGraphTest-DependencyGraphTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DependencyGraphTest.cpp' object='DependencyGraphTest-DependencyGraphTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DependencyGraphTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DependencyGraphTest-DependencyGraphTest.o `test -f 'DependencyGraphTest.cpp' || echo '$(srcdir)/'`DependencyGraphTest.cpp
+
+DependencyGraphTest-DependencyGraphTest.obj: DependencyGraphTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DependencyGraphTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DependencyGraphTest-DependencyGraphTest.obj -MD -MP -MF $(DEPDIR)/DependencyGraphTest-DependencyGraphTest.Tpo -c -o DependencyGraphTest-DependencyGraphTest.obj `if test -f 'DependencyGraphTest.cpp'; then $(CYGPATH_W) 'DependencyGraphTest.cpp'; else $(CYGPATH_W) '$(srcdir)/DependencyGraphTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/DependencyGraphTest-DependencyGraphTest.Tpo $(DEPDIR)/DependencyGraphTest-DependencyGraphTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DependencyGraphTest.cpp' object='DependencyGraphTest-DependencyGraphTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DependencyGraphTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DependencyGraphTest-DependencyGraphTest.obj `if test -f 'DependencyGraphTest.cpp'; then $(CYGPATH_W) 'DependencyGraphTest.cpp'; else $(CYGPATH_W) '$(srcdir)/DependencyGraphTest.cpp'; fi`
+
+DirectoryTest-DirectoryTest.o: DirectoryTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DirectoryTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DirectoryTest-DirectoryTest.o -MD -MP -MF $(DEPDIR)/DirectoryTest-DirectoryTest.Tpo -c -o DirectoryTest-DirectoryTest.o `test -f 'DirectoryTest.cpp' || echo '$(srcdir)/'`DirectoryTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/DirectoryTest-DirectoryTest.Tpo $(DEPDIR)/DirectoryTest-DirectoryTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DirectoryTest.cpp' object='DirectoryTest-DirectoryTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DirectoryTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DirectoryTest-DirectoryTest.o `test -f 'DirectoryTest.cpp' || echo '$(srcdir)/'`DirectoryTest.cpp
+
+DirectoryTest-DirectoryTest.obj: DirectoryTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DirectoryTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DirectoryTest-DirectoryTest.obj -MD -MP -MF $(DEPDIR)/DirectoryTest-DirectoryTest.Tpo -c -o DirectoryTest-DirectoryTest.obj `if test -f 'DirectoryTest.cpp'; then $(CYGPATH_W) 'DirectoryTest.cpp'; else $(CYGPATH_W) '$(srcdir)/DirectoryTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/DirectoryTest-DirectoryTest.Tpo $(DEPDIR)/DirectoryTest-DirectoryTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DirectoryTest.cpp' object='DirectoryTest-DirectoryTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DirectoryTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DirectoryTest-DirectoryTest.obj `if test -f 'DirectoryTest.cpp'; then $(CYGPATH_W) 'DirectoryTest.cpp'; else $(CYGPATH_W) '$(srcdir)/DirectoryTest.cpp'; fi`
+
+DvisvgmSpecialTest-DvisvgmSpecialTest.o: DvisvgmSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DvisvgmSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DvisvgmSpecialTest-DvisvgmSpecialTest.o -MD -MP -MF $(DEPDIR)/DvisvgmSpecialTest-DvisvgmSpecialTest.Tpo -c -o DvisvgmSpecialTest-DvisvgmSpecialTest.o `test -f 'DvisvgmSpecialTest.cpp' || echo '$(srcdir)/'`DvisvgmSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/DvisvgmSpecialTest-DvisvgmSpecialTest.Tpo $(DEPDIR)/DvisvgmSpecialTest-DvisvgmSpecialTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DvisvgmSpecialTest.cpp' object='DvisvgmSpecialTest-DvisvgmSpecialTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DvisvgmSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DvisvgmSpecialTest-DvisvgmSpecialTest.o `test -f 'DvisvgmSpecialTest.cpp' || echo '$(srcdir)/'`DvisvgmSpecialTest.cpp
+
+DvisvgmSpecialTest-DvisvgmSpecialTest.obj: DvisvgmSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DvisvgmSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DvisvgmSpecialTest-DvisvgmSpecialTest.obj -MD -MP -MF $(DEPDIR)/DvisvgmSpecialTest-DvisvgmSpecialTest.Tpo -c -o DvisvgmSpecialTest-DvisvgmSpecialTest.obj `if test -f 'DvisvgmSpecialTest.cpp'; then $(CYGPATH_W) 'DvisvgmSpecialTest.cpp'; else $(CYGPATH_W) '$(srcdir)/DvisvgmSpecialTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/DvisvgmSpecialTest-DvisvgmSpecialTest.Tpo $(DEPDIR)/DvisvgmSpecialTest-DvisvgmSpecialTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='DvisvgmSpecialTest.cpp' object='DvisvgmSpecialTest-DvisvgmSpecialTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(DvisvgmSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DvisvgmSpecialTest-DvisvgmSpecialTest.obj `if test -f 'DvisvgmSpecialTest.cpp'; then $(CYGPATH_W) 'DvisvgmSpecialTest.cpp'; else $(CYGPATH_W) '$(srcdir)/DvisvgmSpecialTest.cpp'; fi`
+
+EmSpecialTest-EmSpecialTest.o: EmSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(EmSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT EmSpecialTest-EmSpecialTest.o -MD -MP -MF $(DEPDIR)/EmSpecialTest-EmSpecialTest.Tpo -c -o EmSpecialTest-EmSpecialTest.o `test -f 'EmSpecialTest.cpp' || echo '$(srcdir)/'`EmSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/EmSpecialTest-EmSpecialTest.Tpo $(DEPDIR)/EmSpecialTest-EmSpecialTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='EmSpecialTest.cpp' object='EmSpecialTest-EmSpecialTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(EmSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o EmSpecialTest-EmSpecialTest.o `test -f 'EmSpecialTest.cpp' || echo '$(srcdir)/'`EmSpecialTest.cpp
+
+EmSpecialTest-EmSpecialTest.obj: EmSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(EmSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT EmSpecialTest-EmSpecialTest.obj -MD -MP -MF $(DEPDIR)/EmSpecialTest-EmSpecialTest.Tpo -c -o EmSpecialTest-EmSpecialTest.obj `if test -f 'EmSpecialTest.cpp'; then $(CYGPATH_W) 'EmSpecialTest.cpp'; else $(CYGPATH_W) '$(srcdir)/EmSpecialTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/EmSpecialTest-EmSpecialTest.Tpo $(DEPDIR)/EmSpecialTest-EmSpecialTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='EmSpecialTest.cpp' object='EmSpecialTest-EmSpecialTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(EmSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o EmSpecialTest-EmSpecialTest.obj `if test -f 'EmSpecialTest.cpp'; then $(CYGPATH_W) 'EmSpecialTest.cpp'; else $(CYGPATH_W) '$(srcdir)/EmSpecialTest.cpp'; fi`
+
+FileFinderTest-FileFinderTest.o: FileFinderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileFinderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileFinderTest-FileFinderTest.o -MD -MP -MF $(DEPDIR)/FileFinderTest-FileFinderTest.Tpo -c -o FileFinderTest-FileFinderTest.o `test -f 'FileFinderTest.cpp' || echo '$(srcdir)/'`FileFinderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FileFinderTest-FileFinderTest.Tpo $(DEPDIR)/FileFinderTest-FileFinderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FileFinderTest.cpp' object='FileFinderTest-FileFinderTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileFinderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileFinderTest-FileFinderTest.o `test -f 'FileFinderTest.cpp' || echo '$(srcdir)/'`FileFinderTest.cpp
+
+FileFinderTest-FileFinderTest.obj: FileFinderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileFinderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileFinderTest-FileFinderTest.obj -MD -MP -MF $(DEPDIR)/FileFinderTest-FileFinderTest.Tpo -c -o FileFinderTest-FileFinderTest.obj `if test -f 'FileFinderTest.cpp'; then $(CYGPATH_W) 'FileFinderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FileFinderTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FileFinderTest-FileFinderTest.Tpo $(DEPDIR)/FileFinderTest-FileFinderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FileFinderTest.cpp' object='FileFinderTest-FileFinderTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileFinderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileFinderTest-FileFinderTest.obj `if test -f 'FileFinderTest.cpp'; then $(CYGPATH_W) 'FileFinderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FileFinderTest.cpp'; fi`
+
+FilePathTest-FilePathTest.o: FilePathTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FilePathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FilePathTest-FilePathTest.o -MD -MP -MF $(DEPDIR)/FilePathTest-FilePathTest.Tpo -c -o FilePathTest-FilePathTest.o `test -f 'FilePathTest.cpp' || echo '$(srcdir)/'`FilePathTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FilePathTest-FilePathTest.Tpo $(DEPDIR)/FilePathTest-FilePathTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FilePathTest.cpp' object='FilePathTest-FilePathTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FilePathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FilePathTest-FilePathTest.o `test -f 'FilePathTest.cpp' || echo '$(srcdir)/'`FilePathTest.cpp
+
+FilePathTest-FilePathTest.obj: FilePathTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FilePathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FilePathTest-FilePathTest.obj -MD -MP -MF $(DEPDIR)/FilePathTest-FilePathTest.Tpo -c -o FilePathTest-FilePathTest.obj `if test -f 'FilePathTest.cpp'; then $(CYGPATH_W) 'FilePathTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FilePathTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FilePathTest-FilePathTest.Tpo $(DEPDIR)/FilePathTest-FilePathTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FilePathTest.cpp' object='FilePathTest-FilePathTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FilePathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FilePathTest-FilePathTest.obj `if test -f 'FilePathTest.cpp'; then $(CYGPATH_W) 'FilePathTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FilePathTest.cpp'; fi`
+
+FileSystemTest-FileSystemTest.o: FileSystemTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileSystemTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileSystemTest-FileSystemTest.o -MD -MP -MF $(DEPDIR)/FileSystemTest-FileSystemTest.Tpo -c -o FileSystemTest-FileSystemTest.o `test -f 'FileSystemTest.cpp' || echo '$(srcdir)/'`FileSystemTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FileSystemTest-FileSystemTest.Tpo $(DEPDIR)/FileSystemTest-FileSystemTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FileSystemTest.cpp' object='FileSystemTest-FileSystemTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileSystemTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileSystemTest-FileSystemTest.o `test -f 'FileSystemTest.cpp' || echo '$(srcdir)/'`FileSystemTest.cpp
+
+FileSystemTest-FileSystemTest.obj: FileSystemTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileSystemTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FileSystemTest-FileSystemTest.obj -MD -MP -MF $(DEPDIR)/FileSystemTest-FileSystemTest.Tpo -c -o FileSystemTest-FileSystemTest.obj `if test -f 'FileSystemTest.cpp'; then $(CYGPATH_W) 'FileSystemTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FileSystemTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FileSystemTest-FileSystemTest.Tpo $(DEPDIR)/FileSystemTest-FileSystemTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FileSystemTest.cpp' object='FileSystemTest-FileSystemTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FileSystemTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FileSystemTest-FileSystemTest.obj `if test -f 'FileSystemTest.cpp'; then $(CYGPATH_W) 'FileSystemTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FileSystemTest.cpp'; fi`
+
+FontCacheTest-FontCacheTest.o: FontCacheTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FontCacheTest-FontCacheTest.o -MD -MP -MF $(DEPDIR)/FontCacheTest-FontCacheTest.Tpo -c -o FontCacheTest-FontCacheTest.o `test -f 'FontCacheTest.cpp' || echo '$(srcdir)/'`FontCacheTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FontCacheTest-FontCacheTest.Tpo $(DEPDIR)/FontCacheTest-FontCacheTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FontCacheTest.cpp' object='FontCacheTest-FontCacheTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FontCacheTest-FontCacheTest.o `test -f 'FontCacheTest.cpp' || echo '$(srcdir)/'`FontCacheTest.cpp
+
+FontCacheTest-FontCacheTest.obj: FontCacheTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FontCacheTest-FontCacheTest.obj -MD -MP -MF $(DEPDIR)/FontCacheTest-FontCacheTest.Tpo -c -o FontCacheTest-FontCacheTest.obj `if test -f 'FontCacheTest.cpp'; then $(CYGPATH_W) 'FontCacheTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FontCacheTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FontCacheTest-FontCacheTest.Tpo $(DEPDIR)/FontCacheTest-FontCacheTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FontCacheTest.cpp' object='FontCacheTest-FontCacheTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontCacheTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FontCacheTest-FontCacheTest.obj `if test -f 'FontCacheTest.cpp'; then $(CYGPATH_W) 'FontCacheTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FontCacheTest.cpp'; fi`
+
+FontManagerTest-FontManagerTest.o: FontManagerTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontManagerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FontManagerTest-FontManagerTest.o -MD -MP -MF $(DEPDIR)/FontManagerTest-FontManagerTest.Tpo -c -o FontManagerTest-FontManagerTest.o `test -f 'FontManagerTest.cpp' || echo '$(srcdir)/'`FontManagerTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FontManagerTest-FontManagerTest.Tpo $(DEPDIR)/FontManagerTest-FontManagerTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FontManagerTest.cpp' object='FontManagerTest-FontManagerTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontManagerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FontManagerTest-FontManagerTest.o `test -f 'FontManagerTest.cpp' || echo '$(srcdir)/'`FontManagerTest.cpp
+
+FontManagerTest-FontManagerTest.obj: FontManagerTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontManagerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FontManagerTest-FontManagerTest.obj -MD -MP -MF $(DEPDIR)/FontManagerTest-FontManagerTest.Tpo -c -o FontManagerTest-FontManagerTest.obj `if test -f 'FontManagerTest.cpp'; then $(CYGPATH_W) 'FontManagerTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FontManagerTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FontManagerTest-FontManagerTest.Tpo $(DEPDIR)/FontManagerTest-FontManagerTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FontManagerTest.cpp' object='FontManagerTest-FontManagerTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontManagerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FontManagerTest-FontManagerTest.obj `if test -f 'FontManagerTest.cpp'; then $(CYGPATH_W) 'FontManagerTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FontManagerTest.cpp'; fi`
+
+FontMapTest-FontMapTest.o: FontMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FontMapTest-FontMapTest.o -MD -MP -MF $(DEPDIR)/FontMapTest-FontMapTest.Tpo -c -o FontMapTest-FontMapTest.o `test -f 'FontMapTest.cpp' || echo '$(srcdir)/'`FontMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FontMapTest-FontMapTest.Tpo $(DEPDIR)/FontMapTest-FontMapTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FontMapTest.cpp' object='FontMapTest-FontMapTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FontMapTest-FontMapTest.o `test -f 'FontMapTest.cpp' || echo '$(srcdir)/'`FontMapTest.cpp
+
+FontMapTest-FontMapTest.obj: FontMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT FontMapTest-FontMapTest.obj -MD -MP -MF $(DEPDIR)/FontMapTest-FontMapTest.Tpo -c -o FontMapTest-FontMapTest.obj `if test -f 'FontMapTest.cpp'; then $(CYGPATH_W) 'FontMapTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FontMapTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/FontMapTest-FontMapTest.Tpo $(DEPDIR)/FontMapTest-FontMapTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='FontMapTest.cpp' object='FontMapTest-FontMapTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(FontMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o FontMapTest-FontMapTest.obj `if test -f 'FontMapTest.cpp'; then $(CYGPATH_W) 'FontMapTest.cpp'; else $(CYGPATH_W) '$(srcdir)/FontMapTest.cpp'; fi`
+
+GFGlyphTracerTest-GFGlyphTracerTest.o: GFGlyphTracerTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GFGlyphTracerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GFGlyphTracerTest-GFGlyphTracerTest.o -MD -MP -MF $(DEPDIR)/GFGlyphTracerTest-GFGlyphTracerTest.Tpo -c -o GFGlyphTracerTest-GFGlyphTracerTest.o `test -f 'GFGlyphTracerTest.cpp' || echo '$(srcdir)/'`GFGlyphTracerTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/GFGlyphTracerTest-GFGlyphTracerTest.Tpo $(DEPDIR)/GFGlyphTracerTest-GFGlyphTracerTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GFGlyphTracerTest.cpp' object='GFGlyphTracerTest-GFGlyphTracerTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GFGlyphTracerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GFGlyphTracerTest-GFGlyphTracerTest.o `test -f 'GFGlyphTracerTest.cpp' || echo '$(srcdir)/'`GFGlyphTracerTest.cpp
+
+GFGlyphTracerTest-GFGlyphTracerTest.obj: GFGlyphTracerTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GFGlyphTracerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GFGlyphTracerTest-GFGlyphTracerTest.obj -MD -MP -MF $(DEPDIR)/GFGlyphTracerTest-GFGlyphTracerTest.Tpo -c -o GFGlyphTracerTest-GFGlyphTracerTest.obj `if test -f 'GFGlyphTracerTest.cpp'; then $(CYGPATH_W) 'GFGlyphTracerTest.cpp'; else $(CYGPATH_W) '$(srcdir)/GFGlyphTracerTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/GFGlyphTracerTest-GFGlyphTracerTest.Tpo $(DEPDIR)/GFGlyphTracerTest-GFGlyphTracerTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GFGlyphTracerTest.cpp' object='GFGlyphTracerTest-GFGlyphTracerTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GFGlyphTracerTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GFGlyphTracerTest-GFGlyphTracerTest.obj `if test -f 'GFGlyphTracerTest.cpp'; then $(CYGPATH_W) 'GFGlyphTracerTest.cpp'; else $(CYGPATH_W) '$(srcdir)/GFGlyphTracerTest.cpp'; fi`
+
+GFReaderTest-GFReaderTest.o: GFReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GFReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GFReaderTest-GFReaderTest.o -MD -MP -MF $(DEPDIR)/GFReaderTest-GFReaderTest.Tpo -c -o GFReaderTest-GFReaderTest.o `test -f 'GFReaderTest.cpp' || echo '$(srcdir)/'`GFReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/GFReaderTest-GFReaderTest.Tpo $(DEPDIR)/GFReaderTest-GFReaderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GFReaderTest.cpp' object='GFReaderTest-GFReaderTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GFReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GFReaderTest-GFReaderTest.o `test -f 'GFReaderTest.cpp' || echo '$(srcdir)/'`GFReaderTest.cpp
+
+GFReaderTest-GFReaderTest.obj: GFReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GFReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GFReaderTest-GFReaderTest.obj -MD -MP -MF $(DEPDIR)/GFReaderTest-GFReaderTest.Tpo -c -o GFReaderTest-GFReaderTest.obj `if test -f 'GFReaderTest.cpp'; then $(CYGPATH_W) 'GFReaderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/GFReaderTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/GFReaderTest-GFReaderTest.Tpo $(DEPDIR)/GFReaderTest-GFReaderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GFReaderTest.cpp' object='GFReaderTest-GFReaderTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GFReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GFReaderTest-GFReaderTest.obj `if test -f 'GFReaderTest.cpp'; then $(CYGPATH_W) 'GFReaderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/GFReaderTest.cpp'; fi`
+
+GhostscriptTest-GhostscriptTest.o: GhostscriptTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GhostscriptTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GhostscriptTest-GhostscriptTest.o -MD -MP -MF $(DEPDIR)/GhostscriptTest-GhostscriptTest.Tpo -c -o GhostscriptTest-GhostscriptTest.o `test -f 'GhostscriptTest.cpp' || echo '$(srcdir)/'`GhostscriptTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/GhostscriptTest-GhostscriptTest.Tpo $(DEPDIR)/GhostscriptTest-GhostscriptTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GhostscriptTest.cpp' object='GhostscriptTest-GhostscriptTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GhostscriptTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GhostscriptTest-GhostscriptTest.o `test -f 'GhostscriptTest.cpp' || echo '$(srcdir)/'`GhostscriptTest.cpp
+
+GhostscriptTest-GhostscriptTest.obj: GhostscriptTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GhostscriptTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GhostscriptTest-GhostscriptTest.obj -MD -MP -MF $(DEPDIR)/GhostscriptTest-GhostscriptTest.Tpo -c -o GhostscriptTest-GhostscriptTest.obj `if test -f 'GhostscriptTest.cpp'; then $(CYGPATH_W) 'GhostscriptTest.cpp'; else $(CYGPATH_W) '$(srcdir)/GhostscriptTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/GhostscriptTest-GhostscriptTest.Tpo $(DEPDIR)/GhostscriptTest-GhostscriptTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GhostscriptTest.cpp' object='GhostscriptTest-GhostscriptTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GhostscriptTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GhostscriptTest-GhostscriptTest.obj `if test -f 'GhostscriptTest.cpp'; then $(CYGPATH_W) 'GhostscriptTest.cpp'; else $(CYGPATH_W) '$(srcdir)/GhostscriptTest.cpp'; fi`
+
+GraphicsPathTest-GraphicsPathTest.o: GraphicsPathTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GraphicsPathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GraphicsPathTest-GraphicsPathTest.o -MD -MP -MF $(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Tpo -c -o GraphicsPathTest-GraphicsPathTest.o `test -f 'GraphicsPathTest.cpp' || echo '$(srcdir)/'`GraphicsPathTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Tpo $(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GraphicsPathTest.cpp' object='GraphicsPathTest-GraphicsPathTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GraphicsPathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GraphicsPathTest-GraphicsPathTest.o `test -f 'GraphicsPathTest.cpp' || echo '$(srcdir)/'`GraphicsPathTest.cpp
+
+GraphicsPathTest-GraphicsPathTest.obj: GraphicsPathTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GraphicsPathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT GraphicsPathTest-GraphicsPathTest.obj -MD -MP -MF $(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Tpo -c -o GraphicsPathTest-GraphicsPathTest.obj `if test -f 'GraphicsPathTest.cpp'; then $(CYGPATH_W) 'GraphicsPathTest.cpp'; else $(CYGPATH_W) '$(srcdir)/GraphicsPathTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Tpo $(DEPDIR)/GraphicsPathTest-GraphicsPathTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='GraphicsPathTest.cpp' object='GraphicsPathTest-GraphicsPathTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(GraphicsPathTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o GraphicsPathTest-GraphicsPathTest.obj `if test -f 'GraphicsPathTest.cpp'; then $(CYGPATH_W) 'GraphicsPathTest.cpp'; else $(CYGPATH_W) '$(srcdir)/GraphicsPathTest.cpp'; fi`
+
+JFMReaderTest-JFMReaderTest.o: JFMReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(JFMReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT JFMReaderTest-JFMReaderTest.o -MD -MP -MF $(DEPDIR)/JFMReaderTest-JFMReaderTest.Tpo -c -o JFMReaderTest-JFMReaderTest.o `test -f 'JFMReaderTest.cpp' || echo '$(srcdir)/'`JFMReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/JFMReaderTest-JFMReaderTest.Tpo $(DEPDIR)/JFMReaderTest-JFMReaderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='JFMReaderTest.cpp' object='JFMReaderTest-JFMReaderTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(JFMReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o JFMReaderTest-JFMReaderTest.o `test -f 'JFMReaderTest.cpp' || echo '$(srcdir)/'`JFMReaderTest.cpp
+
+JFMReaderTest-JFMReaderTest.obj: JFMReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(JFMReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT JFMReaderTest-JFMReaderTest.obj -MD -MP -MF $(DEPDIR)/JFMReaderTest-JFMReaderTest.Tpo -c -o JFMReaderTest-JFMReaderTest.obj `if test -f 'JFMReaderTest.cpp'; then $(CYGPATH_W) 'JFMReaderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/JFMReaderTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/JFMReaderTest-JFMReaderTest.Tpo $(DEPDIR)/JFMReaderTest-JFMReaderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='JFMReaderTest.cpp' object='JFMReaderTest-JFMReaderTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(JFMReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o JFMReaderTest-JFMReaderTest.obj `if test -f 'JFMReaderTest.cpp'; then $(CYGPATH_W) 'JFMReaderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/JFMReaderTest.cpp'; fi`
+
+LengthTest-LengthTest.o: LengthTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(LengthTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT LengthTest-LengthTest.o -MD -MP -MF $(DEPDIR)/LengthTest-LengthTest.Tpo -c -o LengthTest-LengthTest.o `test -f 'LengthTest.cpp' || echo '$(srcdir)/'`LengthTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LengthTest-LengthTest.Tpo $(DEPDIR)/LengthTest-LengthTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='LengthTest.cpp' object='LengthTest-LengthTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(LengthTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o LengthTest-LengthTest.o `test -f 'LengthTest.cpp' || echo '$(srcdir)/'`LengthTest.cpp
+
+LengthTest-LengthTest.obj: LengthTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(LengthTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT LengthTest-LengthTest.obj -MD -MP -MF $(DEPDIR)/LengthTest-LengthTest.Tpo -c -o LengthTest-LengthTest.obj `if test -f 'LengthTest.cpp'; then $(CYGPATH_W) 'LengthTest.cpp'; else $(CYGPATH_W) '$(srcdir)/LengthTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/LengthTest-LengthTest.Tpo $(DEPDIR)/LengthTest-LengthTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='LengthTest.cpp' object='LengthTest-LengthTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(LengthTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o LengthTest-LengthTest.obj `if test -f 'LengthTest.cpp'; then $(CYGPATH_W) 'LengthTest.cpp'; else $(CYGPATH_W) '$(srcdir)/LengthTest.cpp'; fi`
+
+MapLineTest-MapLineTest.o: MapLineTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MapLineTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MapLineTest-MapLineTest.o -MD -MP -MF $(DEPDIR)/MapLineTest-MapLineTest.Tpo -c -o MapLineTest-MapLineTest.o `test -f 'MapLineTest.cpp' || echo '$(srcdir)/'`MapLineTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/MapLineTest-MapLineTest.Tpo $(DEPDIR)/MapLineTest-MapLineTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='MapLineTest.cpp' object='MapLineTest-MapLineTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MapLineTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MapLineTest-MapLineTest.o `test -f 'MapLineTest.cpp' || echo '$(srcdir)/'`MapLineTest.cpp
+
+MapLineTest-MapLineTest.obj: MapLineTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MapLineTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MapLineTest-MapLineTest.obj -MD -MP -MF $(DEPDIR)/MapLineTest-MapLineTest.Tpo -c -o MapLineTest-MapLineTest.obj `if test -f 'MapLineTest.cpp'; then $(CYGPATH_W) 'MapLineTest.cpp'; else $(CYGPATH_W) '$(srcdir)/MapLineTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/MapLineTest-MapLineTest.Tpo $(DEPDIR)/MapLineTest-MapLineTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='MapLineTest.cpp' object='MapLineTest-MapLineTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MapLineTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MapLineTest-MapLineTest.obj `if test -f 'MapLineTest.cpp'; then $(CYGPATH_W) 'MapLineTest.cpp'; else $(CYGPATH_W) '$(srcdir)/MapLineTest.cpp'; fi`
+
+MatrixTest-MatrixTest.o: MatrixTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MatrixTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MatrixTest-MatrixTest.o -MD -MP -MF $(DEPDIR)/MatrixTest-MatrixTest.Tpo -c -o MatrixTest-MatrixTest.o `test -f 'MatrixTest.cpp' || echo '$(srcdir)/'`MatrixTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/MatrixTest-MatrixTest.Tpo $(DEPDIR)/MatrixTest-MatrixTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='MatrixTest.cpp' object='MatrixTest-MatrixTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MatrixTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MatrixTest-MatrixTest.o `test -f 'MatrixTest.cpp' || echo '$(srcdir)/'`MatrixTest.cpp
+
+MatrixTest-MatrixTest.obj: MatrixTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MatrixTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MatrixTest-MatrixTest.obj -MD -MP -MF $(DEPDIR)/MatrixTest-MatrixTest.Tpo -c -o MatrixTest-MatrixTest.obj `if test -f 'MatrixTest.cpp'; then $(CYGPATH_W) 'MatrixTest.cpp'; else $(CYGPATH_W) '$(srcdir)/MatrixTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/MatrixTest-MatrixTest.Tpo $(DEPDIR)/MatrixTest-MatrixTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='MatrixTest.cpp' object='MatrixTest-MatrixTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MatrixTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MatrixTest-MatrixTest.obj `if test -f 'MatrixTest.cpp'; then $(CYGPATH_W) 'MatrixTest.cpp'; else $(CYGPATH_W) '$(srcdir)/MatrixTest.cpp'; fi`
+
+MessageExceptionTest-MessageExceptionTest.o: MessageExceptionTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MessageExceptionTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MessageExceptionTest-MessageExceptionTest.o -MD -MP -MF $(DEPDIR)/MessageExceptionTest-MessageExceptionTest.Tpo -c -o MessageExceptionTest-MessageExceptionTest.o `test -f 'MessageExceptionTest.cpp' || echo '$(srcdir)/'`MessageExceptionTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/MessageExceptionTest-MessageExceptionTest.Tpo $(DEPDIR)/MessageExceptionTest-MessageExceptionTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='MessageExceptionTest.cpp' object='MessageExceptionTest-MessageExceptionTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MessageExceptionTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MessageExceptionTest-MessageExceptionTest.o `test -f 'MessageExceptionTest.cpp' || echo '$(srcdir)/'`MessageExceptionTest.cpp
+
+MessageExceptionTest-MessageExceptionTest.obj: MessageExceptionTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MessageExceptionTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT MessageExceptionTest-MessageExceptionTest.obj -MD -MP -MF $(DEPDIR)/MessageExceptionTest-MessageExceptionTest.Tpo -c -o MessageExceptionTest-MessageExceptionTest.obj `if test -f 'MessageExceptionTest.cpp'; then $(CYGPATH_W) 'MessageExceptionTest.cpp'; else $(CYGPATH_W) '$(srcdir)/MessageExceptionTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/MessageExceptionTest-MessageExceptionTest.Tpo $(DEPDIR)/MessageExceptionTest-MessageExceptionTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='MessageExceptionTest.cpp' object='MessageExceptionTest-MessageExceptionTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MessageExceptionTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o MessageExceptionTest-MessageExceptionTest.obj `if test -f 'MessageExceptionTest.cpp'; then $(CYGPATH_W) 'MessageExceptionTest.cpp'; else $(CYGPATH_W) '$(srcdir)/MessageExceptionTest.cpp'; fi`
+
+PSInterpreterTest-PSInterpreterTest.o: PSInterpreterTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PSInterpreterTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSInterpreterTest-PSInterpreterTest.o -MD -MP -MF $(DEPDIR)/PSInterpreterTest-PSInterpreterTest.Tpo -c -o PSInterpreterTest-PSInterpreterTest.o `test -f 'PSInterpreterTest.cpp' || echo '$(srcdir)/'`PSInterpreterTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PSInterpreterTest-PSInterpreterTest.Tpo $(DEPDIR)/PSInterpreterTest-PSInterpreterTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='PSInterpreterTest.cpp' object='PSInterpreterTest-PSInterpreterTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PSInterpreterTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSInterpreterTest-PSInterpreterTest.o `test -f 'PSInterpreterTest.cpp' || echo '$(srcdir)/'`PSInterpreterTest.cpp
+
+PSInterpreterTest-PSInterpreterTest.obj: PSInterpreterTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PSInterpreterTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PSInterpreterTest-PSInterpreterTest.obj -MD -MP -MF $(DEPDIR)/PSInterpreterTest-PSInterpreterTest.Tpo -c -o PSInterpreterTest-PSInterpreterTest.obj `if test -f 'PSInterpreterTest.cpp'; then $(CYGPATH_W) 'PSInterpreterTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PSInterpreterTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PSInterpreterTest-PSInterpreterTest.Tpo $(DEPDIR)/PSInterpreterTest-PSInterpreterTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='PSInterpreterTest.cpp' object='PSInterpreterTest-PSInterpreterTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PSInterpreterTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PSInterpreterTest-PSInterpreterTest.obj `if test -f 'PSInterpreterTest.cpp'; then $(CYGPATH_W) 'PSInterpreterTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PSInterpreterTest.cpp'; fi`
+
+PageRagesTest-PageRagesTest.o: PageRagesTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PageRagesTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PageRagesTest-PageRagesTest.o -MD -MP -MF $(DEPDIR)/PageRagesTest-PageRagesTest.Tpo -c -o PageRagesTest-PageRagesTest.o `test -f 'PageRagesTest.cpp' || echo '$(srcdir)/'`PageRagesTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PageRagesTest-PageRagesTest.Tpo $(DEPDIR)/PageRagesTest-PageRagesTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='PageRagesTest.cpp' object='PageRagesTest-PageRagesTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PageRagesTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PageRagesTest-PageRagesTest.o `test -f 'PageRagesTest.cpp' || echo '$(srcdir)/'`PageRagesTest.cpp
+
+PageRagesTest-PageRagesTest.obj: PageRagesTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PageRagesTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PageRagesTest-PageRagesTest.obj -MD -MP -MF $(DEPDIR)/PageRagesTest-PageRagesTest.Tpo -c -o PageRagesTest-PageRagesTest.obj `if test -f 'PageRagesTest.cpp'; then $(CYGPATH_W) 'PageRagesTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PageRagesTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PageRagesTest-PageRagesTest.Tpo $(DEPDIR)/PageRagesTest-PageRagesTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='PageRagesTest.cpp' object='PageRagesTest-PageRagesTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PageRagesTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PageRagesTest-PageRagesTest.obj `if test -f 'PageRagesTest.cpp'; then $(CYGPATH_W) 'PageRagesTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PageRagesTest.cpp'; fi`
+
+PageSizeTest-PageSizeTest.o: PageSizeTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PageSizeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PageSizeTest-PageSizeTest.o -MD -MP -MF $(DEPDIR)/PageSizeTest-PageSizeTest.Tpo -c -o PageSizeTest-PageSizeTest.o `test -f 'PageSizeTest.cpp' || echo '$(srcdir)/'`PageSizeTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PageSizeTest-PageSizeTest.Tpo $(DEPDIR)/PageSizeTest-PageSizeTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='PageSizeTest.cpp' object='PageSizeTest-PageSizeTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PageSizeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PageSizeTest-PageSizeTest.o `test -f 'PageSizeTest.cpp' || echo '$(srcdir)/'`PageSizeTest.cpp
+
+PageSizeTest-PageSizeTest.obj: PageSizeTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PageSizeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PageSizeTest-PageSizeTest.obj -MD -MP -MF $(DEPDIR)/PageSizeTest-PageSizeTest.Tpo -c -o PageSizeTest-PageSizeTest.obj `if test -f 'PageSizeTest.cpp'; then $(CYGPATH_W) 'PageSizeTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PageSizeTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PageSizeTest-PageSizeTest.Tpo $(DEPDIR)/PageSizeTest-PageSizeTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='PageSizeTest.cpp' object='PageSizeTest-PageSizeTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PageSizeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PageSizeTest-PageSizeTest.obj `if test -f 'PageSizeTest.cpp'; then $(CYGPATH_W) 'PageSizeTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PageSizeTest.cpp'; fi`
+
+PairTest-PairTest.o: PairTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PairTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PairTest-PairTest.o -MD -MP -MF $(DEPDIR)/PairTest-PairTest.Tpo -c -o PairTest-PairTest.o `test -f 'PairTest.cpp' || echo '$(srcdir)/'`PairTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PairTest-PairTest.Tpo $(DEPDIR)/PairTest-PairTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='PairTest.cpp' object='PairTest-PairTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PairTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PairTest-PairTest.o `test -f 'PairTest.cpp' || echo '$(srcdir)/'`PairTest.cpp
+
+PairTest-PairTest.obj: PairTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PairTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PairTest-PairTest.obj -MD -MP -MF $(DEPDIR)/PairTest-PairTest.Tpo -c -o PairTest-PairTest.obj `if test -f 'PairTest.cpp'; then $(CYGPATH_W) 'PairTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PairTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PairTest-PairTest.Tpo $(DEPDIR)/PairTest-PairTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='PairTest.cpp' object='PairTest-PairTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PairTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PairTest-PairTest.obj `if test -f 'PairTest.cpp'; then $(CYGPATH_W) 'PairTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PairTest.cpp'; fi`
+
+PapersizeSpecialTest-PapersizeSpecialTest.o: PapersizeSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PapersizeSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PapersizeSpecialTest-PapersizeSpecialTest.o -MD -MP -MF $(DEPDIR)/PapersizeSpecialTest-PapersizeSpecialTest.Tpo -c -o PapersizeSpecialTest-PapersizeSpecialTest.o `test -f 'PapersizeSpecialTest.cpp' || echo '$(srcdir)/'`PapersizeSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PapersizeSpecialTest-PapersizeSpecialTest.Tpo $(DEPDIR)/PapersizeSpecialTest-PapersizeSpecialTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='PapersizeSpecialTest.cpp' object='PapersizeSpecialTest-PapersizeSpecialTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PapersizeSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PapersizeSpecialTest-PapersizeSpecialTest.o `test -f 'PapersizeSpecialTest.cpp' || echo '$(srcdir)/'`PapersizeSpecialTest.cpp
+
+PapersizeSpecialTest-PapersizeSpecialTest.obj: PapersizeSpecialTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PapersizeSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT PapersizeSpecialTest-PapersizeSpecialTest.obj -MD -MP -MF $(DEPDIR)/PapersizeSpecialTest-PapersizeSpecialTest.Tpo -c -o PapersizeSpecialTest-PapersizeSpecialTest.obj `if test -f 'PapersizeSpecialTest.cpp'; then $(CYGPATH_W) 'PapersizeSpecialTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PapersizeSpecialTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/PapersizeSpecialTest-PapersizeSpecialTest.Tpo $(DEPDIR)/PapersizeSpecialTest-PapersizeSpecialTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='PapersizeSpecialTest.cpp' object='PapersizeSpecialTest-PapersizeSpecialTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(PapersizeSpecialTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o PapersizeSpecialTest-PapersizeSpecialTest.obj `if test -f 'PapersizeSpecialTest.cpp'; then $(CYGPATH_W) 'PapersizeSpecialTest.cpp'; else $(CYGPATH_W) '$(srcdir)/PapersizeSpecialTest.cpp'; fi`
+
+RangeMapTest-RangeMapTest.o: RangeMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(RangeMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RangeMapTest-RangeMapTest.o -MD -MP -MF $(DEPDIR)/RangeMapTest-RangeMapTest.Tpo -c -o RangeMapTest-RangeMapTest.o `test -f 'RangeMapTest.cpp' || echo '$(srcdir)/'`RangeMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/RangeMapTest-RangeMapTest.Tpo $(DEPDIR)/RangeMapTest-RangeMapTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='RangeMapTest.cpp' object='RangeMapTest-RangeMapTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(RangeMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RangeMapTest-RangeMapTest.o `test -f 'RangeMapTest.cpp' || echo '$(srcdir)/'`RangeMapTest.cpp
+
+RangeMapTest-RangeMapTest.obj: RangeMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(RangeMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT RangeMapTest-RangeMapTest.obj -MD -MP -MF $(DEPDIR)/RangeMapTest-RangeMapTest.Tpo -c -o RangeMapTest-RangeMapTest.obj `if test -f 'RangeMapTest.cpp'; then $(CYGPATH_W) 'RangeMapTest.cpp'; else $(CYGPATH_W) '$(srcdir)/RangeMapTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/RangeMapTest-RangeMapTest.Tpo $(DEPDIR)/RangeMapTest-RangeMapTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='RangeMapTest.cpp' object='RangeMapTest-RangeMapTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(RangeMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o RangeMapTest-RangeMapTest.obj `if test -f 'RangeMapTest.cpp'; then $(CYGPATH_W) 'RangeMapTest.cpp'; else $(CYGPATH_W) '$(srcdir)/RangeMapTest.cpp'; fi`
+
+SVGOutputTest-SVGOutputTest.o: SVGOutputTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SVGOutputTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SVGOutputTest-SVGOutputTest.o -MD -MP -MF $(DEPDIR)/SVGOutputTest-SVGOutputTest.Tpo -c -o SVGOutputTest-SVGOutputTest.o `test -f 'SVGOutputTest.cpp' || echo '$(srcdir)/'`SVGOutputTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SVGOutputTest-SVGOutputTest.Tpo $(DEPDIR)/SVGOutputTest-SVGOutputTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='SVGOutputTest.cpp' object='SVGOutputTest-SVGOutputTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SVGOutputTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SVGOutputTest-SVGOutputTest.o `test -f 'SVGOutputTest.cpp' || echo '$(srcdir)/'`SVGOutputTest.cpp
+
+SVGOutputTest-SVGOutputTest.obj: SVGOutputTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SVGOutputTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SVGOutputTest-SVGOutputTest.obj -MD -MP -MF $(DEPDIR)/SVGOutputTest-SVGOutputTest.Tpo -c -o SVGOutputTest-SVGOutputTest.obj `if test -f 'SVGOutputTest.cpp'; then $(CYGPATH_W) 'SVGOutputTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SVGOutputTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SVGOutputTest-SVGOutputTest.Tpo $(DEPDIR)/SVGOutputTest-SVGOutputTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='SVGOutputTest.cpp' object='SVGOutputTest-SVGOutputTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SVGOutputTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SVGOutputTest-SVGOutputTest.obj `if test -f 'SVGOutputTest.cpp'; then $(CYGPATH_W) 'SVGOutputTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SVGOutputTest.cpp'; fi`
+
+ShadingPatchTest-ShadingPatchTest.o: ShadingPatchTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ShadingPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ShadingPatchTest-ShadingPatchTest.o -MD -MP -MF $(DEPDIR)/ShadingPatchTest-ShadingPatchTest.Tpo -c -o ShadingPatchTest-ShadingPatchTest.o `test -f 'ShadingPatchTest.cpp' || echo '$(srcdir)/'`ShadingPatchTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ShadingPatchTest-ShadingPatchTest.Tpo $(DEPDIR)/ShadingPatchTest-ShadingPatchTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ShadingPatchTest.cpp' object='ShadingPatchTest-ShadingPatchTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ShadingPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ShadingPatchTest-ShadingPatchTest.o `test -f 'ShadingPatchTest.cpp' || echo '$(srcdir)/'`ShadingPatchTest.cpp
+
+ShadingPatchTest-ShadingPatchTest.obj: ShadingPatchTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ShadingPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ShadingPatchTest-ShadingPatchTest.obj -MD -MP -MF $(DEPDIR)/ShadingPatchTest-ShadingPatchTest.Tpo -c -o ShadingPatchTest-ShadingPatchTest.obj `if test -f 'ShadingPatchTest.cpp'; then $(CYGPATH_W) 'ShadingPatchTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ShadingPatchTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ShadingPatchTest-ShadingPatchTest.Tpo $(DEPDIR)/ShadingPatchTest-ShadingPatchTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ShadingPatchTest.cpp' object='ShadingPatchTest-ShadingPatchTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ShadingPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ShadingPatchTest-ShadingPatchTest.obj `if test -f 'ShadingPatchTest.cpp'; then $(CYGPATH_W) 'ShadingPatchTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ShadingPatchTest.cpp'; fi`
+
+SplittedCharInputBufferTest-SplittedCharInputBufferTest.o: SplittedCharInputBufferTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SplittedCharInputBufferTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SplittedCharInputBufferTest-SplittedCharInputBufferTest.o -MD -MP -MF $(DEPDIR)/SplittedCharInputBufferTest-SplittedCharInputBufferTest.Tpo -c -o SplittedCharInputBufferTest-SplittedCharInputBufferTest.o `test -f 'SplittedCharInputBufferTest.cpp' || echo '$(srcdir)/'`SplittedCharInputBufferTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SplittedCharInputBufferTest-SplittedCharInputBufferTest.Tpo $(DEPDIR)/SplittedCharInputBufferTest-SplittedCharInputBufferTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='SplittedCharInputBufferTest.cpp' object='SplittedCharInputBufferTest-SplittedCharInputBufferTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SplittedCharInputBufferTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SplittedCharInputBufferTest-SplittedCharInputBufferTest.o `test -f 'SplittedCharInputBufferTest.cpp' || echo '$(srcdir)/'`SplittedCharInputBufferTest.cpp
+
+SplittedCharInputBufferTest-SplittedCharInputBufferTest.obj: SplittedCharInputBufferTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SplittedCharInputBufferTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SplittedCharInputBufferTest-SplittedCharInputBufferTest.obj -MD -MP -MF $(DEPDIR)/SplittedCharInputBufferTest-SplittedCharInputBufferTest.Tpo -c -o SplittedCharInputBufferTest-SplittedCharInputBufferTest.obj `if test -f 'SplittedCharInputBufferTest.cpp'; then $(CYGPATH_W) 'SplittedCharInputBufferTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SplittedCharInputBufferTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SplittedCharInputBufferTest-SplittedCharInputBufferTest.Tpo $(DEPDIR)/SplittedCharInputBufferTest-SplittedCharInputBufferTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='SplittedCharInputBufferTest.cpp' object='SplittedCharInputBufferTest-SplittedCharInputBufferTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SplittedCharInputBufferTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SplittedCharInputBufferTest-SplittedCharInputBufferTest.obj `if test -f 'SplittedCharInputBufferTest.cpp'; then $(CYGPATH_W) 'SplittedCharInputBufferTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SplittedCharInputBufferTest.cpp'; fi`
+
+StreamInputBufferTest-StreamInputBufferTest.o: StreamInputBufferTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamInputBufferTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StreamInputBufferTest-StreamInputBufferTest.o -MD -MP -MF $(DEPDIR)/StreamInputBufferTest-StreamInputBufferTest.Tpo -c -o StreamInputBufferTest-StreamInputBufferTest.o `test -f 'StreamInputBufferTest.cpp' || echo '$(srcdir)/'`StreamInputBufferTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/StreamInputBufferTest-StreamInputBufferTest.Tpo $(DEPDIR)/StreamInputBufferTest-StreamInputBufferTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='StreamInputBufferTest.cpp' object='StreamInputBufferTest-StreamInputBufferTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamInputBufferTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StreamInputBufferTest-StreamInputBufferTest.o `test -f 'StreamInputBufferTest.cpp' || echo '$(srcdir)/'`StreamInputBufferTest.cpp
+
+StreamInputBufferTest-StreamInputBufferTest.obj: StreamInputBufferTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamInputBufferTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StreamInputBufferTest-StreamInputBufferTest.obj -MD -MP -MF $(DEPDIR)/StreamInputBufferTest-StreamInputBufferTest.Tpo -c -o StreamInputBufferTest-StreamInputBufferTest.obj `if test -f 'StreamInputBufferTest.cpp'; then $(CYGPATH_W) 'StreamInputBufferTest.cpp'; else $(CYGPATH_W) '$(srcdir)/StreamInputBufferTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/StreamInputBufferTest-StreamInputBufferTest.Tpo $(DEPDIR)/StreamInputBufferTest-StreamInputBufferTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='StreamInputBufferTest.cpp' object='StreamInputBufferTest-StreamInputBufferTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamInputBufferTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StreamInputBufferTest-StreamInputBufferTest.obj `if test -f 'StreamInputBufferTest.cpp'; then $(CYGPATH_W) 'StreamInputBufferTest.cpp'; else $(CYGPATH_W) '$(srcdir)/StreamInputBufferTest.cpp'; fi`
+
+StreamReaderTest-StreamReaderTest.o: StreamReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StreamReaderTest-StreamReaderTest.o -MD -MP -MF $(DEPDIR)/StreamReaderTest-StreamReaderTest.Tpo -c -o StreamReaderTest-StreamReaderTest.o `test -f 'StreamReaderTest.cpp' || echo '$(srcdir)/'`StreamReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/StreamReaderTest-StreamReaderTest.Tpo $(DEPDIR)/StreamReaderTest-StreamReaderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='StreamReaderTest.cpp' object='StreamReaderTest-StreamReaderTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StreamReaderTest-StreamReaderTest.o `test -f 'StreamReaderTest.cpp' || echo '$(srcdir)/'`StreamReaderTest.cpp
+
+StreamReaderTest-StreamReaderTest.obj: StreamReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StreamReaderTest-StreamReaderTest.obj -MD -MP -MF $(DEPDIR)/StreamReaderTest-StreamReaderTest.Tpo -c -o StreamReaderTest-StreamReaderTest.obj `if test -f 'StreamReaderTest.cpp'; then $(CYGPATH_W) 'StreamReaderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/StreamReaderTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/StreamReaderTest-StreamReaderTest.Tpo $(DEPDIR)/StreamReaderTest-StreamReaderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='StreamReaderTest.cpp' object='StreamReaderTest-StreamReaderTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StreamReaderTest-StreamReaderTest.obj `if test -f 'StreamReaderTest.cpp'; then $(CYGPATH_W) 'StreamReaderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/StreamReaderTest.cpp'; fi`
+
+StreamWriterTest-StreamWriterTest.o: StreamWriterTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamWriterTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StreamWriterTest-StreamWriterTest.o -MD -MP -MF $(DEPDIR)/StreamWriterTest-StreamWriterTest.Tpo -c -o StreamWriterTest-StreamWriterTest.o `test -f 'StreamWriterTest.cpp' || echo '$(srcdir)/'`StreamWriterTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/StreamWriterTest-StreamWriterTest.Tpo $(DEPDIR)/StreamWriterTest-StreamWriterTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='StreamWriterTest.cpp' object='StreamWriterTest-StreamWriterTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamWriterTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StreamWriterTest-StreamWriterTest.o `test -f 'StreamWriterTest.cpp' || echo '$(srcdir)/'`StreamWriterTest.cpp
+
+StreamWriterTest-StreamWriterTest.obj: StreamWriterTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamWriterTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StreamWriterTest-StreamWriterTest.obj -MD -MP -MF $(DEPDIR)/StreamWriterTest-StreamWriterTest.Tpo -c -o StreamWriterTest-StreamWriterTest.obj `if test -f 'StreamWriterTest.cpp'; then $(CYGPATH_W) 'StreamWriterTest.cpp'; else $(CYGPATH_W) '$(srcdir)/StreamWriterTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/StreamWriterTest-StreamWriterTest.Tpo $(DEPDIR)/StreamWriterTest-StreamWriterTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='StreamWriterTest.cpp' object='StreamWriterTest-StreamWriterTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(StreamWriterTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StreamWriterTest-StreamWriterTest.obj `if test -f 'StreamWriterTest.cpp'; then $(CYGPATH_W) 'StreamWriterTest.cpp'; else $(CYGPATH_W) '$(srcdir)/StreamWriterTest.cpp'; fi`
+
+SubfontTest-SubfontTest.o: SubfontTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SubfontTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SubfontTest-SubfontTest.o -MD -MP -MF $(DEPDIR)/SubfontTest-SubfontTest.Tpo -c -o SubfontTest-SubfontTest.o `test -f 'SubfontTest.cpp' || echo '$(srcdir)/'`SubfontTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SubfontTest-SubfontTest.Tpo $(DEPDIR)/SubfontTest-SubfontTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='SubfontTest.cpp' object='SubfontTest-SubfontTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SubfontTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SubfontTest-SubfontTest.o `test -f 'SubfontTest.cpp' || echo '$(srcdir)/'`SubfontTest.cpp
+
+SubfontTest-SubfontTest.obj: SubfontTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SubfontTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT SubfontTest-SubfontTest.obj -MD -MP -MF $(DEPDIR)/SubfontTest-SubfontTest.Tpo -c -o SubfontTest-SubfontTest.obj `if test -f 'SubfontTest.cpp'; then $(CYGPATH_W) 'SubfontTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SubfontTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/SubfontTest-SubfontTest.Tpo $(DEPDIR)/SubfontTest-SubfontTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='SubfontTest.cpp' object='SubfontTest-SubfontTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(SubfontTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o SubfontTest-SubfontTest.obj `if test -f 'SubfontTest.cpp'; then $(CYGPATH_W) 'SubfontTest.cpp'; else $(CYGPATH_W) '$(srcdir)/SubfontTest.cpp'; fi`
+
+TFMReaderTest-TFMReaderTest.o: TFMReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TFMReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TFMReaderTest-TFMReaderTest.o -MD -MP -MF $(DEPDIR)/TFMReaderTest-TFMReaderTest.Tpo -c -o TFMReaderTest-TFMReaderTest.o `test -f 'TFMReaderTest.cpp' || echo '$(srcdir)/'`TFMReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TFMReaderTest-TFMReaderTest.Tpo $(DEPDIR)/TFMReaderTest-TFMReaderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TFMReaderTest.cpp' object='TFMReaderTest-TFMReaderTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TFMReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TFMReaderTest-TFMReaderTest.o `test -f 'TFMReaderTest.cpp' || echo '$(srcdir)/'`TFMReaderTest.cpp
+
+TFMReaderTest-TFMReaderTest.obj: TFMReaderTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TFMReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TFMReaderTest-TFMReaderTest.obj -MD -MP -MF $(DEPDIR)/TFMReaderTest-TFMReaderTest.Tpo -c -o TFMReaderTest-TFMReaderTest.obj `if test -f 'TFMReaderTest.cpp'; then $(CYGPATH_W) 'TFMReaderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/TFMReaderTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TFMReaderTest-TFMReaderTest.Tpo $(DEPDIR)/TFMReaderTest-TFMReaderTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TFMReaderTest.cpp' object='TFMReaderTest-TFMReaderTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TFMReaderTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TFMReaderTest-TFMReaderTest.obj `if test -f 'TFMReaderTest.cpp'; then $(CYGPATH_W) 'TFMReaderTest.cpp'; else $(CYGPATH_W) '$(srcdir)/TFMReaderTest.cpp'; fi`
+
+TensorProductPatchTest-TensorProductPatchTest.o: TensorProductPatchTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TensorProductPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TensorProductPatchTest-TensorProductPatchTest.o -MD -MP -MF $(DEPDIR)/TensorProductPatchTest-TensorProductPatchTest.Tpo -c -o TensorProductPatchTest-TensorProductPatchTest.o `test -f 'TensorProductPatchTest.cpp' || echo '$(srcdir)/'`TensorProductPatchTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TensorProductPatchTest-TensorProductPatchTest.Tpo $(DEPDIR)/TensorProductPatchTest-TensorProductPatchTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TensorProductPatchTest.cpp' object='TensorProductPatchTest-TensorProductPatchTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TensorProductPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TensorProductPatchTest-TensorProductPatchTest.o `test -f 'TensorProductPatchTest.cpp' || echo '$(srcdir)/'`TensorProductPatchTest.cpp
+
+TensorProductPatchTest-TensorProductPatchTest.obj: TensorProductPatchTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TensorProductPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TensorProductPatchTest-TensorProductPatchTest.obj -MD -MP -MF $(DEPDIR)/TensorProductPatchTest-TensorProductPatchTest.Tpo -c -o TensorProductPatchTest-TensorProductPatchTest.obj `if test -f 'TensorProductPatchTest.cpp'; then $(CYGPATH_W) 'TensorProductPatchTest.cpp'; else $(CYGPATH_W) '$(srcdir)/TensorProductPatchTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TensorProductPatchTest-TensorProductPatchTest.Tpo $(DEPDIR)/TensorProductPatchTest-TensorProductPatchTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TensorProductPatchTest.cpp' object='TensorProductPatchTest-TensorProductPatchTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TensorProductPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TensorProductPatchTest-TensorProductPatchTest.obj `if test -f 'TensorProductPatchTest.cpp'; then $(CYGPATH_W) 'TensorProductPatchTest.cpp'; else $(CYGPATH_W) '$(srcdir)/TensorProductPatchTest.cpp'; fi`
+
+ToUnicodeMapTest-ToUnicodeMapTest.o: ToUnicodeMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ToUnicodeMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ToUnicodeMapTest-ToUnicodeMapTest.o -MD -MP -MF $(DEPDIR)/ToUnicodeMapTest-ToUnicodeMapTest.Tpo -c -o ToUnicodeMapTest-ToUnicodeMapTest.o `test -f 'ToUnicodeMapTest.cpp' || echo '$(srcdir)/'`ToUnicodeMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ToUnicodeMapTest-ToUnicodeMapTest.Tpo $(DEPDIR)/ToUnicodeMapTest-ToUnicodeMapTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ToUnicodeMapTest.cpp' object='ToUnicodeMapTest-ToUnicodeMapTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ToUnicodeMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ToUnicodeMapTest-ToUnicodeMapTest.o `test -f 'ToUnicodeMapTest.cpp' || echo '$(srcdir)/'`ToUnicodeMapTest.cpp
+
+ToUnicodeMapTest-ToUnicodeMapTest.obj: ToUnicodeMapTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ToUnicodeMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ToUnicodeMapTest-ToUnicodeMapTest.obj -MD -MP -MF $(DEPDIR)/ToUnicodeMapTest-ToUnicodeMapTest.Tpo -c -o ToUnicodeMapTest-ToUnicodeMapTest.obj `if test -f 'ToUnicodeMapTest.cpp'; then $(CYGPATH_W) 'ToUnicodeMapTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ToUnicodeMapTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ToUnicodeMapTest-ToUnicodeMapTest.Tpo $(DEPDIR)/ToUnicodeMapTest-ToUnicodeMapTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='ToUnicodeMapTest.cpp' object='ToUnicodeMapTest-ToUnicodeMapTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(ToUnicodeMapTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ToUnicodeMapTest-ToUnicodeMapTest.obj `if test -f 'ToUnicodeMapTest.cpp'; then $(CYGPATH_W) 'ToUnicodeMapTest.cpp'; else $(CYGPATH_W) '$(srcdir)/ToUnicodeMapTest.cpp'; fi`
+
+TriangularPatchTest-TriangularPatchTest.o: TriangularPatchTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TriangularPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TriangularPatchTest-TriangularPatchTest.o -MD -MP -MF $(DEPDIR)/TriangularPatchTest-TriangularPatchTest.Tpo -c -o TriangularPatchTest-TriangularPatchTest.o `test -f 'TriangularPatchTest.cpp' || echo '$(srcdir)/'`TriangularPatchTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TriangularPatchTest-TriangularPatchTest.Tpo $(DEPDIR)/TriangularPatchTest-TriangularPatchTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TriangularPatchTest.cpp' object='TriangularPatchTest-TriangularPatchTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TriangularPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TriangularPatchTest-TriangularPatchTest.o `test -f 'TriangularPatchTest.cpp' || echo '$(srcdir)/'`TriangularPatchTest.cpp
+
+TriangularPatchTest-TriangularPatchTest.obj: TriangularPatchTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TriangularPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT TriangularPatchTest-TriangularPatchTest.obj -MD -MP -MF $(DEPDIR)/TriangularPatchTest-TriangularPatchTest.Tpo -c -o TriangularPatchTest-TriangularPatchTest.obj `if test -f 'TriangularPatchTest.cpp'; then $(CYGPATH_W) 'TriangularPatchTest.cpp'; else $(CYGPATH_W) '$(srcdir)/TriangularPatchTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/TriangularPatchTest-TriangularPatchTest.Tpo $(DEPDIR)/TriangularPatchTest-TriangularPatchTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='TriangularPatchTest.cpp' object='TriangularPatchTest-TriangularPatchTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(TriangularPatchTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o TriangularPatchTest-TriangularPatchTest.obj `if test -f 'TriangularPatchTest.cpp'; then $(CYGPATH_W) 'TriangularPatchTest.cpp'; else $(CYGPATH_W) '$(srcdir)/TriangularPatchTest.cpp'; fi`
+
+UnicodeTest-UnicodeTest.o: UnicodeTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(UnicodeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UnicodeTest-UnicodeTest.o -MD -MP -MF $(DEPDIR)/UnicodeTest-UnicodeTest.Tpo -c -o UnicodeTest-UnicodeTest.o `test -f 'UnicodeTest.cpp' || echo '$(srcdir)/'`UnicodeTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/UnicodeTest-UnicodeTest.Tpo $(DEPDIR)/UnicodeTest-UnicodeTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='UnicodeTest.cpp' object='UnicodeTest-UnicodeTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(UnicodeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UnicodeTest-UnicodeTest.o `test -f 'UnicodeTest.cpp' || echo '$(srcdir)/'`UnicodeTest.cpp
+
+UnicodeTest-UnicodeTest.obj: UnicodeTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(UnicodeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UnicodeTest-UnicodeTest.obj -MD -MP -MF $(DEPDIR)/UnicodeTest-UnicodeTest.Tpo -c -o UnicodeTest-UnicodeTest.obj `if test -f 'UnicodeTest.cpp'; then $(CYGPATH_W) 'UnicodeTest.cpp'; else $(CYGPATH_W) '$(srcdir)/UnicodeTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/UnicodeTest-UnicodeTest.Tpo $(DEPDIR)/UnicodeTest-UnicodeTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='UnicodeTest.cpp' object='UnicodeTest-UnicodeTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(UnicodeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UnicodeTest-UnicodeTest.obj `if test -f 'UnicodeTest.cpp'; then $(CYGPATH_W) 'UnicodeTest.cpp'; else $(CYGPATH_W) '$(srcdir)/UnicodeTest.cpp'; fi`
+
+UtilityTest-UtilityTest.o: UtilityTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(UtilityTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UtilityTest-UtilityTest.o -MD -MP -MF $(DEPDIR)/UtilityTest-UtilityTest.Tpo -c -o UtilityTest-UtilityTest.o `test -f 'UtilityTest.cpp' || echo '$(srcdir)/'`UtilityTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/UtilityTest-UtilityTest.Tpo $(DEPDIR)/UtilityTest-UtilityTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='UtilityTest.cpp' object='UtilityTest-UtilityTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(UtilityTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UtilityTest-UtilityTest.o `test -f 'UtilityTest.cpp' || echo '$(srcdir)/'`UtilityTest.cpp
+
+UtilityTest-UtilityTest.obj: UtilityTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(UtilityTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT UtilityTest-UtilityTest.obj -MD -MP -MF $(DEPDIR)/UtilityTest-UtilityTest.Tpo -c -o UtilityTest-UtilityTest.obj `if test -f 'UtilityTest.cpp'; then $(CYGPATH_W) 'UtilityTest.cpp'; else $(CYGPATH_W) '$(srcdir)/UtilityTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/UtilityTest-UtilityTest.Tpo $(DEPDIR)/UtilityTest-UtilityTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='UtilityTest.cpp' object='UtilityTest-UtilityTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(UtilityTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o UtilityTest-UtilityTest.obj `if test -f 'UtilityTest.cpp'; then $(CYGPATH_W) 'UtilityTest.cpp'; else $(CYGPATH_W) '$(srcdir)/UtilityTest.cpp'; fi`
+
+VectorIteratorTest-VectorIteratorTest.o: VectorIteratorTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(VectorIteratorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT VectorIteratorTest-VectorIteratorTest.o -MD -MP -MF $(DEPDIR)/VectorIteratorTest-VectorIteratorTest.Tpo -c -o VectorIteratorTest-VectorIteratorTest.o `test -f 'VectorIteratorTest.cpp' || echo '$(srcdir)/'`VectorIteratorTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/VectorIteratorTest-VectorIteratorTest.Tpo $(DEPDIR)/VectorIteratorTest-VectorIteratorTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='VectorIteratorTest.cpp' object='VectorIteratorTest-VectorIteratorTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(VectorIteratorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o VectorIteratorTest-VectorIteratorTest.o `test -f 'VectorIteratorTest.cpp' || echo '$(srcdir)/'`VectorIteratorTest.cpp
+
+VectorIteratorTest-VectorIteratorTest.obj: VectorIteratorTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(VectorIteratorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT VectorIteratorTest-VectorIteratorTest.obj -MD -MP -MF $(DEPDIR)/VectorIteratorTest-VectorIteratorTest.Tpo -c -o VectorIteratorTest-VectorIteratorTest.obj `if test -f 'VectorIteratorTest.cpp'; then $(CYGPATH_W) 'VectorIteratorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/VectorIteratorTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/VectorIteratorTest-VectorIteratorTest.Tpo $(DEPDIR)/VectorIteratorTest-VectorIteratorTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='VectorIteratorTest.cpp' object='VectorIteratorTest-VectorIteratorTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(VectorIteratorTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o VectorIteratorTest-VectorIteratorTest.obj `if test -f 'VectorIteratorTest.cpp'; then $(CYGPATH_W) 'VectorIteratorTest.cpp'; else $(CYGPATH_W) '$(srcdir)/VectorIteratorTest.cpp'; fi`
+
+VectorStreamTest-VectorStreamTest.o: VectorStreamTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(VectorStreamTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT VectorStreamTest-VectorStreamTest.o -MD -MP -MF $(DEPDIR)/VectorStreamTest-VectorStreamTest.Tpo -c -o VectorStreamTest-VectorStreamTest.o `test -f 'VectorStreamTest.cpp' || echo '$(srcdir)/'`VectorStreamTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/VectorStreamTest-VectorStreamTest.Tpo $(DEPDIR)/VectorStreamTest-VectorStreamTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='VectorStreamTest.cpp' object='VectorStreamTest-VectorStreamTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(VectorStreamTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o VectorStreamTest-VectorStreamTest.o `test -f 'VectorStreamTest.cpp' || echo '$(srcdir)/'`VectorStreamTest.cpp
+
+VectorStreamTest-VectorStreamTest.obj: VectorStreamTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(VectorStreamTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT VectorStreamTest-VectorStreamTest.obj -MD -MP -MF $(DEPDIR)/VectorStreamTest-VectorStreamTest.Tpo -c -o VectorStreamTest-VectorStreamTest.obj `if test -f 'VectorStreamTest.cpp'; then $(CYGPATH_W) 'VectorStreamTest.cpp'; else $(CYGPATH_W) '$(srcdir)/VectorStreamTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/VectorStreamTest-VectorStreamTest.Tpo $(DEPDIR)/VectorStreamTest-VectorStreamTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='VectorStreamTest.cpp' object='VectorStreamTest-VectorStreamTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(VectorStreamTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o VectorStreamTest-VectorStreamTest.obj `if test -f 'VectorStreamTest.cpp'; then $(CYGPATH_W) 'VectorStreamTest.cpp'; else $(CYGPATH_W) '$(srcdir)/VectorStreamTest.cpp'; fi`
+
+XMLNodeTest-XMLNodeTest.o: XMLNodeTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(XMLNodeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT XMLNodeTest-XMLNodeTest.o -MD -MP -MF $(DEPDIR)/XMLNodeTest-XMLNodeTest.Tpo -c -o XMLNodeTest-XMLNodeTest.o `test -f 'XMLNodeTest.cpp' || echo '$(srcdir)/'`XMLNodeTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/XMLNodeTest-XMLNodeTest.Tpo $(DEPDIR)/XMLNodeTest-XMLNodeTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XMLNodeTest.cpp' object='XMLNodeTest-XMLNodeTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(XMLNodeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o XMLNodeTest-XMLNodeTest.o `test -f 'XMLNodeTest.cpp' || echo '$(srcdir)/'`XMLNodeTest.cpp
+
+XMLNodeTest-XMLNodeTest.obj: XMLNodeTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(XMLNodeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT XMLNodeTest-XMLNodeTest.obj -MD -MP -MF $(DEPDIR)/XMLNodeTest-XMLNodeTest.Tpo -c -o XMLNodeTest-XMLNodeTest.obj `if test -f 'XMLNodeTest.cpp'; then $(CYGPATH_W) 'XMLNodeTest.cpp'; else $(CYGPATH_W) '$(srcdir)/XMLNodeTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/XMLNodeTest-XMLNodeTest.Tpo $(DEPDIR)/XMLNodeTest-XMLNodeTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XMLNodeTest.cpp' object='XMLNodeTest-XMLNodeTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(XMLNodeTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o XMLNodeTest-XMLNodeTest.obj `if test -f 'XMLNodeTest.cpp'; then $(CYGPATH_W) 'XMLNodeTest.cpp'; else $(CYGPATH_W) '$(srcdir)/XMLNodeTest.cpp'; fi`
+
+XMLStringTest-XMLStringTest.o: XMLStringTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(XMLStringTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT XMLStringTest-XMLStringTest.o -MD -MP -MF $(DEPDIR)/XMLStringTest-XMLStringTest.Tpo -c -o XMLStringTest-XMLStringTest.o `test -f 'XMLStringTest.cpp' || echo '$(srcdir)/'`XMLStringTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/XMLStringTest-XMLStringTest.Tpo $(DEPDIR)/XMLStringTest-XMLStringTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XMLStringTest.cpp' object='XMLStringTest-XMLStringTest.o' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(XMLStringTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o XMLStringTest-XMLStringTest.o `test -f 'XMLStringTest.cpp' || echo '$(srcdir)/'`XMLStringTest.cpp
+
+XMLStringTest-XMLStringTest.obj: XMLStringTest.cpp
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(XMLStringTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT XMLStringTest-XMLStringTest.obj -MD -MP -MF $(DEPDIR)/XMLStringTest-XMLStringTest.Tpo -c -o XMLStringTest-XMLStringTest.obj `if test -f 'XMLStringTest.cpp'; then $(CYGPATH_W) 'XMLStringTest.cpp'; else $(CYGPATH_W) '$(srcdir)/XMLStringTest.cpp'; fi`
+ at am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/XMLStringTest-XMLStringTest.Tpo $(DEPDIR)/XMLStringTest-XMLStringTest.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='XMLStringTest.cpp' object='XMLStringTest-XMLStringTest.obj' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(XMLStringTest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o XMLStringTest-XMLStringTest.obj `if test -f 'XMLStringTest.cpp'; then $(CYGPATH_W) 'XMLStringTest.cpp'; else $(CYGPATH_W) '$(srcdir)/XMLStringTest.cpp'; fi`
+
 hashcheck-hashcheck.o: hashcheck.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_CXX)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hashcheck_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT hashcheck-hashcheck.o -MD -MP -MF $(DEPDIR)/hashcheck-hashcheck.Tpo -c -o hashcheck-hashcheck.o `test -f 'hashcheck.cpp' || echo '$(srcdir)/'`hashcheck.cpp
 @am__fastdepCXX_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/hashcheck-hashcheck.Tpo $(DEPDIR)/hashcheck-hashcheck.Po
@@ -1283,6 +2230,37 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(hashcheck_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o hashcheck-hashcheck.obj `if test -f 'hashcheck.cpp'; then $(CYGPATH_W) 'hashcheck.cpp'; else $(CYGPATH_W) '$(srcdir)/hashcheck.cpp'; fi`
 
+.cpp.o:
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+ at am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+ at am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+ at am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+ at am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+ at AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ at am__fastdepCXX_FALSE@	$(AM_V_CXX at am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+	-rm -rf gtest/src/.libs gtest/src/_libs
+
 # 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,
@@ -1512,7 +2490,7 @@
 	log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \
 	$(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \
 	exit $$?;
-recheck: all $(check_PROGRAMS)
+recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS)
 	@test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
 	@set +e; $(am__set_TESTS_bases); \
 	bases=`for i in $$bases; do echo $$i; done \
@@ -1551,13 +2529,6 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-CalculatorTest.log: CalculatorTest$(EXEEXT)
-	@p='CalculatorTest$(EXEEXT)'; \
-	b='CalculatorTest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 CMapManagerTest.log: CMapManagerTest$(EXEEXT)
 	@p='CMapManagerTest$(EXEEXT)'; \
 	b='CMapManagerTest'; \
@@ -1579,6 +2550,20 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+CRC32Test.log: CRC32Test$(EXEEXT)
+	@p='CRC32Test$(EXEEXT)'; \
+	b='CRC32Test'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
+CalculatorTest.log: CalculatorTest$(EXEEXT)
+	@p='CalculatorTest$(EXEEXT)'; \
+	b='CalculatorTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 ColorSpecialTest.log: ColorSpecialTest$(EXEEXT)
 	@p='ColorSpecialTest$(EXEEXT)'; \
 	b='ColorSpecialTest'; \
@@ -1600,13 +2585,6 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-CRC32Test.log: CRC32Test$(EXEEXT)
-	@p='CRC32Test$(EXEEXT)'; \
-	b='CRC32Test'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 DependencyGraphTest.log: DependencyGraphTest$(EXEEXT)
 	@p='DependencyGraphTest$(EXEEXT)'; \
 	b='DependencyGraphTest'; \
@@ -1656,6 +2634,13 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+FontCacheTest.log: FontCacheTest$(EXEEXT)
+	@p='FontCacheTest$(EXEEXT)'; \
+	b='FontCacheTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 FontManagerTest.log: FontManagerTest$(EXEEXT)
 	@p='FontManagerTest$(EXEEXT)'; \
 	b='FontManagerTest'; \
@@ -1733,6 +2718,13 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+PSInterpreterTest.log: PSInterpreterTest$(EXEEXT)
+	@p='PSInterpreterTest$(EXEEXT)'; \
+	b='PSInterpreterTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 PageRagesTest.log: PageRagesTest$(EXEEXT)
 	@p='PageRagesTest$(EXEEXT)'; \
 	b='PageRagesTest'; \
@@ -1754,9 +2746,9 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-PSInterpreterTest.log: PSInterpreterTest$(EXEEXT)
-	@p='PSInterpreterTest$(EXEEXT)'; \
-	b='PSInterpreterTest'; \
+PapersizeSpecialTest.log: PapersizeSpecialTest$(EXEEXT)
+	@p='PapersizeSpecialTest$(EXEEXT)'; \
+	b='PapersizeSpecialTest'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -1768,6 +2760,13 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
+SVGOutputTest.log: SVGOutputTest$(EXEEXT)
+	@p='SVGOutputTest$(EXEEXT)'; \
+	b='SVGOutputTest'; \
+	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
+	--log-file $$b.log --trs-file $$b.trs \
+	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
+	"$$tst" $(AM_TESTS_FD_REDIRECT)
 ShadingPatchTest.log: ShadingPatchTest$(EXEEXT)
 	@p='ShadingPatchTest$(EXEEXT)'; \
 	b='ShadingPatchTest'; \
@@ -1810,9 +2809,9 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-SVGOutputTest.log: SVGOutputTest$(EXEEXT)
-	@p='SVGOutputTest$(EXEEXT)'; \
-	b='SVGOutputTest'; \
+TFMReaderTest.log: TFMReaderTest$(EXEEXT)
+	@p='TFMReaderTest$(EXEEXT)'; \
+	b='TFMReaderTest'; \
 	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
@@ -1824,13 +2823,6 @@
 	--log-file $$b.log --trs-file $$b.trs \
 	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
 	"$$tst" $(AM_TESTS_FD_REDIRECT)
-TFMReaderTest.log: TFMReaderTest$(EXEEXT)
-	@p='TFMReaderTest$(EXEEXT)'; \
-	b='TFMReaderTest'; \
-	$(am__check_pre) $(LOG_DRIVER) --test-name "$$f" \
-	--log-file $$b.log --trs-file $$b.trs \
-	$(am__common_driver_flags) $(AM_LOG_DRIVER_FLAGS) $(LOG_DRIVER_FLAGS) -- $(LOG_COMPILE) \
-	"$$tst" $(AM_TESTS_FD_REDIRECT)
 ToUnicodeMapTest.log: ToUnicodeMapTest$(EXEEXT)
 	@p='ToUnicodeMapTest$(EXEEXT)'; \
 	b='ToUnicodeMapTest'; \
@@ -1965,7 +2957,7 @@
 	  fi; \
 	done
 check-am: all-am
-	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
+	$(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS)
 	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-recursive
 all-am: Makefile
@@ -2001,6 +2993,8 @@
 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)
+	-rm -f gtest/src/$(DEPDIR)/$(am__dirstamp)
+	-rm -f gtest/src/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -2007,10 +3001,11 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-checkPROGRAMS clean-generic mostlyclean-am
+clean-am: clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \
+	clean-libtool mostlyclean-am
 
 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
+	-rm -rf ./$(DEPDIR) gtest/src/$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -2056,13 +3051,14 @@
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
+	-rm -rf ./$(DEPDIR) gtest/src/$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
 mostlyclean: mostlyclean-recursive
 
-mostlyclean-am: mostlyclean-compile mostlyclean-generic
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
 
 pdf: pdf-recursive
 
@@ -2077,9 +3073,10 @@
 .MAKE: $(am__recursive_targets) check-am install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-TESTS check-am clean clean-checkPROGRAMS clean-generic \
-	cscopelist-am ctags ctags-am distclean distclean-compile \
-	distclean-generic distclean-tags distdir dvi dvi-am html \
+	check-TESTS check-am clean clean-checkLTLIBRARIES \
+	clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \
+	ctags ctags-am distclean distclean-compile distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
@@ -2087,11 +3084,12 @@
 	install-ps install-ps-am install-strip installcheck \
 	installcheck-am installdirs installdirs-am maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am recheck tags tags-am \
-	uninstall uninstall-am
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	recheck tags tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 
+
 hashcheck.cpp: genhashcheck.py $(top_srcdir)/src/AGLTable.hpp $(top_srcdir)/libs/xxHash/xxhash.h
 	python $^ >$@
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/MapLineTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/MapLineTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/MapLineTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -30,7 +30,7 @@
 class MapLineTest : public ::testing::Test
 {
 	protected:
-		void SetUp () {
+		void SetUp () override {
 			FileFinder::init("MapLineTest", "MapLineTest", false);
 		}
 };
@@ -102,13 +102,12 @@
    EXPECT_EQ(mapline.psname(), "");
    EXPECT_EQ(mapline.encname(), "unicode");
    EXPECT_EQ(mapline.fontfname(), "simsun.ttc");
-	if (mapline.sfd() != 0) {  // if UGBK.sfd is installed do some more checks
+	EXPECT_EQ(mapline.fontindex(), 0);
+	EXPECT_DOUBLE_EQ(mapline.slant(), 0.123);
+	EXPECT_DOUBLE_EQ(mapline.extend(), 0.456);
+	EXPECT_DOUBLE_EQ(mapline.bold(), 1);
+	if (mapline.sfd() != 0)  // if UGBK.sfd is installed, check SFD name
 		EXPECT_EQ(mapline.sfd()->name(), "UGBK");
-		EXPECT_EQ(mapline.fontindex(), 0);
-		EXPECT_DOUBLE_EQ(mapline.slant(), 0.123);
-		EXPECT_DOUBLE_EQ(mapline.extend(), 0.456);
-		EXPECT_DOUBLE_EQ(mapline.bold(), 1);
-	}
 }
 
 TEST_F(MapLineTest, pdfline4) {
@@ -118,10 +117,22 @@
    EXPECT_EQ(mapline.psname(), "");
    EXPECT_EQ(mapline.encname(), "");  // encodings "default" and "none" are replaced with ""
 	EXPECT_EQ(mapline.fontfname(), "simsun.ttc");
-	if (mapline.sfd() != 0) {  // if UGBK.sfd is installed do some more checks
+	EXPECT_EQ(mapline.fontindex(), 1);
+	EXPECT_DOUBLE_EQ(mapline.slant(), 0);
+	EXPECT_DOUBLE_EQ(mapline.extend(), 0.345);
+	if (mapline.sfd() != 0)  // if UGBK.sfd is installed, check SFD name
 		EXPECT_EQ(mapline.sfd()->name(), "UGBK");
-		EXPECT_EQ(mapline.fontindex(), 1);
-		EXPECT_DOUBLE_EQ(mapline.slant(), 0);
-		EXPECT_DOUBLE_EQ(mapline.extend(), 0.345);
-	}
 }
+
+
+TEST_F(MapLineTest, fail) {
+	EXPECT_THROW(MapLine("texname -"), MapLineException);
+	EXPECT_THROW(MapLine("texname -s"), MapLineException);
+	EXPECT_THROW(MapLine("texname -e"), MapLineException);
+	EXPECT_THROW(MapLine("texname -b"), MapLineException);
+	EXPECT_THROW(MapLine("texname -i"), MapLineException);
+	EXPECT_THROW(MapLine("texname -p"), MapLineException);
+	EXPECT_THROW(MapLine("texname -v"), MapLineException);
+	EXPECT_THROW(MapLine("texname -w"), MapLineException);
+	EXPECT_THROW(MapLine("texname -Z"), MapLineException);
+}
\ No newline at end of file

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/MatrixTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/MatrixTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/MatrixTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -21,11 +21,31 @@
 #include <gtest/gtest.h>
 #include <sstream>
 #include <vector>
+#include "Calculator.hpp"
 #include "Matrix.hpp"
 
 using namespace std;
 
 
+TEST(MatrixTest, construct) {
+	const vector<double> vec{1, 2, 3, 4, 5, 6, 7, 8, 9};
+	Matrix m1(vec);
+	for (int row=0; row < 3; row++)
+		for (int col=0; col < 3; col++)
+			ASSERT_EQ(m1.get(row, col), vec[row*3+col]) << "row=" << row << ", col=" << col;
+
+	int startIndex=4;
+	Matrix m2(vec, startIndex);
+	for (int row=0; row < 3; row++) {
+		for (int col=0; col < 3; col++) {
+			int index = row*3+col+startIndex;
+			ASSERT_EQ(m2.get(row, col), index < 9 ? vec[index] : (row == col ? 1 : 0)) << "row=" << row << ", col=" << col;
+		}
+	}
+	EXPECT_TRUE(Matrix(1).isIdentity());
+}
+
+
 TEST(MatrixTest, svg) {
 	double v1[] = {1,2,3,4,5,6,7,8,9};
 	Matrix m1(v1);
@@ -79,7 +99,7 @@
 }
 
 
-TEST(MatrixTest, checks) {
+TEST(MatrixTest, isTranslation) {
 	Matrix m(1);
 	EXPECT_TRUE(m.isIdentity());
 	double tx, ty;
@@ -95,6 +115,28 @@
 }
 
 
+TEST(MatrixTest, lmultiply) {
+	const Matrix m1({1, 2, 3, 4, 5, 6, 7, 8, 9});
+	const Matrix m2({9, 8, 7, 6, 5, 4, 3, 2, 1});
+	EXPECT_TRUE(m1 != m2);
+	Matrix m3;
+	EXPECT_EQ((m3=m1).lmultiply(m2), Matrix({30, 24, 18, 84, 69, 54, 138, 114, 90}));
+	EXPECT_EQ((m3=m2).lmultiply(m1), Matrix({90, 114, 138, 54, 69, 84, 18, 24, 30}));
+	EXPECT_EQ((m3=m1).lmultiply(Matrix(1)), m1);
+}
+
+
+TEST(MatrixTest, rmultiply) {
+	const Matrix m1({1, 2, 3, 4, 5, 6, 7, 8, 9});
+	const Matrix m2({9, 8, 7, 6, 5, 4, 3, 2, 1});
+	EXPECT_TRUE(m1 != m2);
+	Matrix m3;
+	EXPECT_EQ((m3=m1).rmultiply(m2), Matrix({90, 114, 138, 54, 69, 84, 18, 24, 30}));
+	EXPECT_EQ((m3=m2).rmultiply(m1), Matrix({30, 24, 18, 84, 69, 54, 138, 114, 90}));
+	EXPECT_EQ((m3=m1).rmultiply(Matrix(1)), m1);
+}
+
+
 TEST(MatrixTest, vec) {
 	vector<double> v;
 	for (int i=1; i <= 15; ++i)
@@ -149,3 +191,50 @@
 		for (int j=0; j < 3; ++j)
 			EXPECT_DOUBLE_EQ(m2.get(i,j), m3.get(i,j));
 }
+
+
+TEST(MatrixTest, parse) {
+	Calculator calc;
+	calc.setVariable("ux", 0);
+	calc.setVariable("uy", 0);
+	calc.setVariable("w", 0);
+	calc.setVariable("h", 0);
+	EXPECT_EQ(Matrix("T1,-2", calc), TranslationMatrix(1, -2));
+	EXPECT_EQ(Matrix("R45", calc), RotationMatrix(45));
+	EXPECT_EQ(Matrix("S2,3", calc), ScalingMatrix(2, 3));
+	EXPECT_EQ(Matrix("FH1", calc), Matrix({1, 0, 0, 0, -1, 2, 0, 0, 1}));
+	EXPECT_EQ(Matrix("FV1", calc), Matrix({-1, 0, 2, 0, 1, 0, 0, 0, 1}));
+	EXPECT_EQ(Matrix("KX45", calc), Matrix({1, 1, 0, 0, 1, 0, 0, 0, 1}));
+	EXPECT_EQ(Matrix("KY45", calc), Matrix({1, 0, 0, 1, 1, 0, 0, 0, 1}));
+	EXPECT_EQ(Matrix("M1,2,3,4,5,6", calc), Matrix({1, 2, 3, 4, 5, 6, 0, 0, 1}));
+
+	Matrix m;
+	m.set("R90 T1,1 S2", calc);
+	EXPECT_EQ(m, Matrix({0, -2, 2, 2, 0, 2, 0, 0, 1}));
+}
+
+
+TEST(MatrixTest, write) {
+	ostringstream oss;
+	Matrix m(3);
+	oss << m;
+	EXPECT_EQ(oss.str(), "((3,0,0),(0,3,0),(0,0,3))");
+}
+
+
+TEST(MatrixTest, fail) {
+	Calculator calc;
+	EXPECT_THROW(Matrix("R45", calc), CalculatorException);
+
+	calc.setVariable("ux", 0);
+	calc.setVariable("uy", 0);
+	calc.setVariable("w", 0);
+	calc.setVariable("h", 0);
+	EXPECT_THROW(Matrix("ABC", calc), ParserException);   // invalid command
+	EXPECT_THROW(Matrix("F1", calc), ParserException);    // missing H or V
+	EXPECT_THROW(Matrix("K45", calc), ParserException);   // missing X or Y
+	EXPECT_THROW(Matrix("KX", calc), ParserException);    // missing argument
+	EXPECT_THROW(Matrix("KX90", calc), ParserException);  // invalid argument (pole at 90+180k degrees)
+	EXPECT_THROW(Matrix("KY270", calc), ParserException); // invalid argument (pole at 90+180k degrees)
+	EXPECT_THROW(Matrix("S2,", calc), ParserException);   // missing argument
+}
\ No newline at end of file

Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/PapersizeSpecialTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/PapersizeSpecialTest.cpp	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/PapersizeSpecialTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,160 @@
+/*************************************************************************
+** PapersizeSpecialTest.cpp                                             **
+**                                                                      **
+** This file is part of dvisvgm -- a fast DVI to SVG converter          **
+** Copyright (C) 2005-2017 Martin Gieseking <martin.gieseking at uos.de>   **
+**                                                                      **
+** 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 3 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, see <http://www.gnu.org/licenses/>. **
+*************************************************************************/
+
+#include <gtest/gtest.h>
+#include <sstream>
+#include "PapersizeSpecialHandler.hpp"
+#include "SpecialActions.hpp"
+
+using namespace std;
+
+
+class PapersizeSpecialTest : public ::testing::Test
+{
+	protected:
+		class PapersizeSpecialActions : public EmptySpecialActions {
+			public:
+				PapersizeSpecialActions () : _pageno(0) {}
+				BoundingBox& bbox () override {return _bbox;}
+				string getBBoxFormatString () const override    {return _bboxFormatString;}
+				void setBBoxFormatString (const string &str)    {_bboxFormatString = str;}
+				unsigned getCurrentPageNumber () const override {return _pageno;}
+				void setCurrentPageNumber (unsigned pageno)     {_pageno = pageno;}
+
+			private:
+				BoundingBox _bbox;
+				string _bboxFormatString;
+				unsigned _pageno;
+		};
+
+		class MyPapersizeSpecialHandler : public PapersizeSpecialHandler {
+			public:
+				void endPage (PapersizeSpecialActions &actions) {dviEndPage(actions.getCurrentPageNumber(), actions);}
+		};
+
+
+		void SetUp () override {
+			handler.reset();
+		}
+
+		string bboxString () {
+			return actions.bbox().toSVGViewBox();
+		}
+
+		void preprocess (const string &str) {
+			istringstream iss(str);
+			handler.preprocess(0, iss, actions);
+		}
+
+		bool process (const string &str) {
+			istringstream iss(str);
+			return handler.process(0, iss, actions);
+		}
+
+		void endPage () {
+			handler.endPage(actions);
+		}
+
+	protected:
+		MyPapersizeSpecialHandler handler;
+		PapersizeSpecialActions actions;
+};
+
+
+TEST_F(PapersizeSpecialTest, name) {
+	EXPECT_EQ(handler.name(), "papersize");
+	ASSERT_STREQ(handler.prefixes()[0], "papersize=");
+	ASSERT_EQ(handler.prefixes()[1], nullptr);
+}
+
+
+TEST_F(PapersizeSpecialTest, disabled) {
+	actions.setBBoxFormatString("min");  // --bbox=min => ignore papersize specials
+	actions.setCurrentPageNumber(1);
+	ASSERT_EQ(bboxString(), "0 0 0 0");
+	preprocess("123,456");
+	endPage();
+	ASSERT_EQ(bboxString(), "0 0 0 0");
+	ASSERT_TRUE(process("dummy"));
+}
+
+
+TEST_F(PapersizeSpecialTest, singlePage1) {
+	actions.setBBoxFormatString("papersize");  // --bbox=papersize => evaluate papersize specials
+	actions.setCurrentPageNumber(1);
+	ASSERT_EQ(bboxString(), "0 0 0 0");
+	preprocess("123bp,456bp");
+	endPage();
+	ASSERT_EQ(bboxString(), "-72 -72 123 456");
+}
+
+
+TEST_F(PapersizeSpecialTest, singlePage2) {
+	actions.setBBoxFormatString("papersize");
+	actions.setCurrentPageNumber(1);
+	ASSERT_EQ(bboxString(), "0 0 0 0");
+	preprocess("123bp,456bp");
+	preprocess("333bp,444bp");
+	preprocess("321bp,654bp");
+	endPage();
+	ASSERT_EQ(bboxString(), "-72 -72 321 654");
+}
+
+
+TEST_F(PapersizeSpecialTest, multiPage1) {
+	actions.setBBoxFormatString("papersize");
+	actions.setCurrentPageNumber(1);
+	ASSERT_EQ(bboxString(), "0 0 0 0");
+	preprocess("123bp,456bp");
+	preprocess("333bp,444bp");
+	preprocess("321bp,654bp");
+	endPage();
+	ASSERT_EQ(bboxString(), "-72 -72 321 654");
+	actions.setCurrentPageNumber(2);
+	endPage();
+	ASSERT_EQ(bboxString(), "-72 -72 321 654");
+	actions.setCurrentPageNumber(3);
+	endPage();
+	ASSERT_EQ(bboxString(), "-72 -72 321 654");
+}
+
+
+TEST_F(PapersizeSpecialTest, multiPage2) {
+	actions.setBBoxFormatString("papersize");
+	actions.setCurrentPageNumber(1);
+	ASSERT_EQ(bboxString(), "0 0 0 0");
+	preprocess("123bp,456bp");
+	preprocess("333bp");
+	endPage();
+	ASSERT_EQ(bboxString(), "-72 -72 333 333");
+	actions.setCurrentPageNumber(2);
+	endPage();
+	ASSERT_EQ(bboxString(), "-72 -72 333 333");
+	actions.setCurrentPageNumber(3);
+	preprocess("321bp,456bp");
+	endPage();
+	ASSERT_EQ(bboxString(), "-72 -72 321 456");
+}
+
+
+TEST_F(PapersizeSpecialTest, error) {
+	ASSERT_THROW(preprocess("abc"), UnitException);
+	ASSERT_THROW(preprocess("123bp,456x"), UnitException);
+}


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/PapersizeSpecialTest.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/SplittedCharInputBufferTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/SplittedCharInputBufferTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/SplittedCharInputBufferTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -46,7 +46,7 @@
 	SplittedCharInputBuffer buffer(buf1, strlen(buf1), buf2, strlen(buf2));
 	BufferInputReader in(buffer);
 	EXPECT_EQ(in.peek(), 'a');
-	for (int i=0; i < 26; i++) 
+	for (int i=0; i < 26; i++)
 		EXPECT_EQ(in.peek(i), 'a'+i);
 	EXPECT_EQ(in.peek(26), -1);
 }
@@ -86,8 +86,8 @@
 
 
 TEST(SplittedCharInputBufferTest, parseInt) {
-	const char *buf1 = "1234,-"; 
-	const char *buf2 = "5,+6,10.-"; 
+	const char *buf1 = "1234,-";
+	const char *buf2 = "5,+6,10.-";
 	SplittedCharInputBuffer buffer(buf1, strlen(buf1), buf2, strlen(buf2));
 	BufferInputReader in(buffer);
 	int n;
@@ -112,31 +112,31 @@
 }
 
 
-TEST(SplittedCharInputBufferTest, parseInt_base) {
-	const char *buf1 = "1234,-5,10,1a"; 
-	const char *buf2 = "bc,1234a"; 
+TEST(SplittedCharInputBufferTest, parseUInt_base) {
+	const char *buf1 = "1234,-5,10,1a";
+	const char *buf2 = "bc,1234a";
 	SplittedCharInputBuffer buffer(buf1, strlen(buf1), buf2, strlen(buf2));
 	BufferInputReader in(buffer);
-	int n;
-	EXPECT_TRUE(in.parseInt(10, n));
+	unsigned n;
+	EXPECT_TRUE(in.parseUInt(10, n));
 	EXPECT_EQ(n, 1234);
 	EXPECT_EQ(in.get(), ',');
 
-	EXPECT_FALSE(in.parseInt(10, n));
+	EXPECT_FALSE(in.parseUInt(10, n));
 	in.get();
-	EXPECT_TRUE(in.parseInt(10, n));
+	EXPECT_TRUE(in.parseUInt(10, n));
 	EXPECT_EQ(n, 5);
 	EXPECT_EQ(in.get(), ',');
 
-	EXPECT_TRUE(in.parseInt(16, n));
+	EXPECT_TRUE(in.parseUInt(16, n));
 	EXPECT_EQ(n, 16);
 	EXPECT_EQ(in.get(), ',');
 
-	EXPECT_TRUE(in.parseInt(16, n));
+	EXPECT_TRUE(in.parseUInt(16, n));
 	EXPECT_EQ(n, 0x1abc);
 	EXPECT_EQ(in.get(), ',');
 
-	EXPECT_TRUE(in.parseInt(8, n));
+	EXPECT_TRUE(in.parseUInt(8, n));
 	EXPECT_EQ(n, 01234);
 	EXPECT_EQ(in.get(), 'a');
 }
@@ -143,8 +143,8 @@
 
 
 TEST(SplittedCharInputBufferTest, parseDouble) {
-	const char *buf1 = "1234,-5,6.12,-3"; 
-	const char *buf2 = ".1415,-.1,12e2,10.-"; 
+	const char *buf1 = "1234,-5,6.12,-3";
+	const char *buf2 = ".1415,-.1,12e2,10.-";
 	SplittedCharInputBuffer buffer(buf1, strlen(buf1), buf2, strlen(buf2));
 	BufferInputReader in(buffer);
 	double d;

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/StreamInputBufferTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/StreamInputBufferTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/StreamInputBufferTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -111,30 +111,30 @@
 }
 
 
-TEST(StreamInputBufferTest, parseInt_base) {
+TEST(StreamInputBufferTest, parseUInt_base) {
 	istringstream iss("1234,-5,10,1abc,1234a");
 	StreamInputBuffer buffer(iss, 10);
 	BufferInputReader in(buffer);
-	int n;
-	EXPECT_TRUE(in.parseInt(10, n));
+	unsigned n;
+	EXPECT_TRUE(in.parseUInt(10, n));
 	EXPECT_EQ(n, 1234);
 	EXPECT_EQ(in.get(), ',');
 
-	EXPECT_FALSE(in.parseInt(10, n));
+	EXPECT_FALSE(in.parseUInt(10, n));
 	in.get();
-	EXPECT_TRUE(in.parseInt(10, n));
+	EXPECT_TRUE(in.parseUInt(10, n));
 	EXPECT_EQ(n, 5);
 	EXPECT_EQ(in.get(), ',');
 
-	EXPECT_TRUE(in.parseInt(16, n));
+	EXPECT_TRUE(in.parseUInt(16, n));
 	EXPECT_EQ(n, 16);
 	EXPECT_EQ(in.get(), ',');
 
-	EXPECT_TRUE(in.parseInt(16, n));
+	EXPECT_TRUE(in.parseUInt(16, n));
 	EXPECT_EQ(n, 0x1abc);
 	EXPECT_EQ(in.get(), ',');
 
-	EXPECT_TRUE(in.parseInt(8, n));
+	EXPECT_TRUE(in.parseUInt(8, n));
 	EXPECT_EQ(n, 01234);
 	EXPECT_EQ(in.get(), 'a');
 }

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/StreamReaderTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/StreamReaderTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/StreamReaderTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -30,9 +30,11 @@
 TEST(StreamReaderTest, readString) {
 	string str1 = "dvisvgm converts DVI files to SVG.";
 	istringstream iss(str1);
+	ASSERT_TRUE(bool(iss));
 	StreamReader reader(iss);
 	string str2 = reader.readString(iss.str().length());
 	EXPECT_EQ(str1, str2);
+	iss.clear();
 	iss.str(str1);
 	str2 = reader.readString();
 	EXPECT_EQ(str1, str2);
@@ -42,11 +44,13 @@
 TEST(StreamReaderTest, readStringCRC) {
 	string str1 = "dvisvgm converts DVI files to SVG.";
 	istringstream iss(str1);
+	ASSERT_TRUE(bool(iss));
 	StreamReader reader(iss);
 	CRC32 crc;
 	string str2 = reader.readString(iss.str().length(), crc);
 	EXPECT_EQ(str1, str2);
 	EXPECT_EQ(crc.get(), 0x7c4ef359);
+	iss.clear();
 	iss.str(str1);
 	crc.reset();
 	str2 = reader.readString(crc, false);

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/SubfontTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/SubfontTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/SubfontTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -28,7 +28,7 @@
 class SubfontTest : public ::testing::Test
 {
 	protected:
-		void SetUp () {
+		void SetUp () override {
 			FileFinder::init("SubfontTest", "SubfontTest", false);
 		}
 };

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/TFMReaderTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/TFMReaderTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/TFMReaderTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -37,7 +37,7 @@
 	public:
 		TFMReaderTest () : tfm(0) {}
 
-		void SetUp () {
+		void SetUp () override {
 			string fname = string(SRCDIR)+"/data/cmr10.tfm";
 			ifstream ifs(fname.c_str(), ios::binary);
 			ASSERT_TRUE(ifs.is_open()) << "failed opening " << fname;
@@ -44,7 +44,7 @@
 			tfm = new TFM(ifs);
 		}
 
-		void TearDown () {
+		void TearDown () override {
 			delete tfm;
 		}
 

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/TensorProductPatchTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/TensorProductPatchTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/TensorProductPatchTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -29,7 +29,7 @@
 class TensorProductPatchTest : public ::testing::Test
 {
 	protected:
-		void SetUp () {
+		void SetUp () override {
 			_points.resize(16);
 			_points[0]  = DPair(10, 10);
 			_points[1]  = DPair(0, 30);

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/VectorIteratorTest.cpp
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/VectorIteratorTest.cpp	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/VectorIteratorTest.cpp	2017-02-13 17:57:19 UTC (rev 43208)
@@ -25,9 +25,7 @@
 
 
 TEST(VectorIteratorTest, inc) {
-	int array[] = {4,3,2,9,8,7,10};
-	const int size = sizeof(array)/sizeof(int);
-	vector<int> vec(array, array+size);
+	vector<int> vec{4,3,2,9,8,7,10};
 	VectorIterator<int> it(vec);
 	EXPECT_TRUE(it.valid());
 	EXPECT_EQ(*it++, 4);
@@ -35,8 +33,8 @@
 	EXPECT_EQ(*++it, 2);
 	EXPECT_TRUE(it.valid());
 	for (int i=2; it.valid(); i++) {
-		EXPECT_LT(i, size);
-		EXPECT_EQ(*it, array[i]);
+		EXPECT_LT(i, vec.size());
+		EXPECT_EQ(*it, vec[i]);
 		++it;
 	}
 }
@@ -43,9 +41,7 @@
 
 
 TEST(VectorIteratorTest, addsub) {
-	int array[] = {4,3,2,9,8,7,10};
-	const int size = sizeof(array)/sizeof(int);
-	vector<int> vec(array, array+size);
+	vector<int> vec{4,3,2,9,8,7,10};
 	VectorIterator<int> it(vec);
 	EXPECT_EQ(*(it += 4), 8);
 	EXPECT_EQ(*(it -= 3), 3);
@@ -55,9 +51,7 @@
 
 
 TEST(VectorIteratorTest, dec) {
-	int array[] = {4,3,2,9,8,7,10};
-	const int size = sizeof(array)/sizeof(int);
-	vector<int> vec(array, array+size);
+	vector<int> vec{4,3,2,9,8,7,10};
 	VectorIterator<int> it(vec);
 	it += 6;
 	EXPECT_EQ(*it, 10);
@@ -66,8 +60,8 @@
 	EXPECT_EQ(*--it, 8);
 	EXPECT_TRUE(it.valid());
 	for (int i=4; it.valid(); i--) {
-		EXPECT_LT(i, size);
-		EXPECT_EQ(*it, array[i]);
+		EXPECT_LT(i, vec.size());
+		EXPECT_EQ(*it, vec[i]);
 		--it;
 	}
 }
@@ -74,9 +68,7 @@
 
 
 TEST(VectorIteratorTest, invalidate) {
-	int array[] = {4,3,2,9,8,7,10};
-	const int size = sizeof(array)/sizeof(int);
-	vector<int> vec(array, array+size);
+	vector<int> vec{4,3,2,9,8,7,10};
 	VectorIterator<int> it(vec);
 	--it;
 	EXPECT_FALSE(it.valid());
@@ -88,13 +80,14 @@
 	EXPECT_TRUE(it.valid());
 	it.invalidate();
 	EXPECT_FALSE(it.valid());
+	it.reset();
+	ASSERT_TRUE(it.valid());
+	EXPECT_EQ(*it, 4);
 }
 
 
 TEST(VectorIteratorTest, compare) {
-	int array[] = {4,3,2,9,8,7,10};
-	const int size = sizeof(array)/sizeof(int);
-	vector<int> vec(array, array+size);
+	vector<int> vec{4,3,2,9,8,7,10};
 	VectorIterator<int> it1(vec);
 	VectorIterator<int> it2 = it1 + 1;
 	EXPECT_NE(it1, it2);

Modified: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/data/Makefile.in
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/data/Makefile.in	2017-02-13 14:08:26 UTC (rev 43207)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/data/Makefile.in	2017-02-13 17:57:19 UTC (rev 43208)
@@ -90,7 +90,11 @@
 target_triplet = @target@
 subdir = tests/data
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_code_coverage.m4 \
+	$(top_srcdir)/m4/ax_cxx_compile_stdcxx.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
@@ -125,6 +129,7 @@
 AM_CPPFLAGS = @AM_CPPFLAGS@
 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
 AM_LDFLAGS = @AM_LDFLAGS@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -134,11 +139,14 @@
 CFLAGS = @CFLAGS@
 CODE_COVERAGE_CFLAGS = @CODE_COVERAGE_CFLAGS@
 CODE_COVERAGE_CPPFLAGS = @CODE_COVERAGE_CPPFLAGS@
+CODE_COVERAGE_CXXFLAGS = @CODE_COVERAGE_CXXFLAGS@
 CODE_COVERAGE_ENABLED = @CODE_COVERAGE_ENABLED@
 CODE_COVERAGE_LDFLAGS = @CODE_COVERAGE_LDFLAGS@
+CODE_COVERAGE_LIBS = @CODE_COVERAGE_LIBS@
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
+CXXCPP = @CXXCPP@
 CXXDEPMODE = @CXXDEPMODE@
 CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
@@ -145,11 +153,15 @@
 DATE = @DATE@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
 ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FGREP = @FGREP@
 FREETYPE_CFLAGS = @FREETYPE_CFLAGS@
 FREETYPE_LIBS = @FREETYPE_LIBS@
 GCOV = @GCOV@
@@ -162,13 +174,24 @@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LCOV = @LCOV@
+LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -192,8 +215,10 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -231,6 +256,7 @@
 prefix = @prefix@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+runstatedir = @runstatedir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 srcdir = @srcdir@
@@ -270,9 +296,9 @@
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tests/data/Makefile'; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign tests/data/Makefile'; \
 	$(am__cd) $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu tests/data/Makefile
+	  $(AUTOMAKE) --foreign tests/data/Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
 	  *config.status*) \
@@ -290,6 +316,12 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
 tags TAGS:
 
 ctags CTAGS:
@@ -363,7 +395,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic mostlyclean-am
+clean-am: clean-generic clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -f Makefile
@@ -415,7 +447,7 @@
 
 mostlyclean: mostlyclean-am
 
-mostlyclean-am: mostlyclean-generic
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
 
 pdf: pdf-am
 
@@ -429,16 +461,17 @@
 
 .MAKE: install-am install-strip
 
-.PHONY: all all-am check check-am clean clean-generic cscopelist-am \
-	ctags-am 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 tags-am uninstall uninstall-am
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	cscopelist-am ctags-am distclean distclean-generic \
+	distclean-libtool 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 mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags-am uninstall uninstall-am
 
 .PRECIOUS: Makefile
 

Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/LICENSE
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/LICENSE	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/LICENSE	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,28 @@
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-death-test.h
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-death-test.h	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-death-test.h	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,294 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan at google.com (Zhanyong Wan)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file defines the public API for death tests.  It is
+// #included by gtest.h so a user doesn't need to include this
+// directly.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_
+
+#include "gtest/internal/gtest-death-test-internal.h"
+
+namespace testing {
+
+// This flag controls the style of death tests.  Valid values are "threadsafe",
+// meaning that the death test child process will re-execute the test binary
+// from the start, running only a single death test, or "fast",
+// meaning that the child process will execute the test logic immediately
+// after forking.
+GTEST_DECLARE_string_(death_test_style);
+
+#if GTEST_HAS_DEATH_TEST
+
+namespace internal {
+
+// Returns a Boolean value indicating whether the caller is currently
+// executing in the context of the death test child process.  Tools such as
+// Valgrind heap checkers may need this to modify their behavior in death
+// tests.  IMPORTANT: This is an internal utility.  Using it may break the
+// implementation of death tests.  User code MUST NOT use it.
+GTEST_API_ bool InDeathTestChild();
+
+}  // namespace internal
+
+// The following macros are useful for writing death tests.
+
+// Here's what happens when an ASSERT_DEATH* or EXPECT_DEATH* is
+// executed:
+//
+//   1. It generates a warning if there is more than one active
+//   thread.  This is because it's safe to fork() or clone() only
+//   when there is a single thread.
+//
+//   2. The parent process clone()s a sub-process and runs the death
+//   test in it; the sub-process exits with code 0 at the end of the
+//   death test, if it hasn't exited already.
+//
+//   3. The parent process waits for the sub-process to terminate.
+//
+//   4. The parent process checks the exit code and error message of
+//   the sub-process.
+//
+// Examples:
+//
+//   ASSERT_DEATH(server.SendMessage(56, "Hello"), "Invalid port number");
+//   for (int i = 0; i < 5; i++) {
+//     EXPECT_DEATH(server.ProcessRequest(i),
+//                  "Invalid request .* in ProcessRequest()")
+//                  << "Failed to die on request " << i;
+//   }
+//
+//   ASSERT_EXIT(server.ExitNow(), ::testing::ExitedWithCode(0), "Exiting");
+//
+//   bool KilledBySIGHUP(int exit_code) {
+//     return WIFSIGNALED(exit_code) && WTERMSIG(exit_code) == SIGHUP;
+//   }
+//
+//   ASSERT_EXIT(client.HangUpServer(), KilledBySIGHUP, "Hanging up!");
+//
+// On the regular expressions used in death tests:
+//
+//   On POSIX-compliant systems (*nix), we use the <regex.h> library,
+//   which uses the POSIX extended regex syntax.
+//
+//   On other platforms (e.g. Windows), we only support a simple regex
+//   syntax implemented as part of Google Test.  This limited
+//   implementation should be enough most of the time when writing
+//   death tests; though it lacks many features you can find in PCRE
+//   or POSIX extended regex syntax.  For example, we don't support
+//   union ("x|y"), grouping ("(xy)"), brackets ("[xy]"), and
+//   repetition count ("x{5,7}"), among others.
+//
+//   Below is the syntax that we do support.  We chose it to be a
+//   subset of both PCRE and POSIX extended regex, so it's easy to
+//   learn wherever you come from.  In the following: 'A' denotes a
+//   literal character, period (.), or a single \\ escape sequence;
+//   'x' and 'y' denote regular expressions; 'm' and 'n' are for
+//   natural numbers.
+//
+//     c     matches any literal character c
+//     \\d   matches any decimal digit
+//     \\D   matches any character that's not a decimal digit
+//     \\f   matches \f
+//     \\n   matches \n
+//     \\r   matches \r
+//     \\s   matches any ASCII whitespace, including \n
+//     \\S   matches any character that's not a whitespace
+//     \\t   matches \t
+//     \\v   matches \v
+//     \\w   matches any letter, _, or decimal digit
+//     \\W   matches any character that \\w doesn't match
+//     \\c   matches any literal character c, which must be a punctuation
+//     .     matches any single character except \n
+//     A?    matches 0 or 1 occurrences of A
+//     A*    matches 0 or many occurrences of A
+//     A+    matches 1 or many occurrences of A
+//     ^     matches the beginning of a string (not that of each line)
+//     $     matches the end of a string (not that of each line)
+//     xy    matches x followed by y
+//
+//   If you accidentally use PCRE or POSIX extended regex features
+//   not implemented by us, you will get a run-time failure.  In that
+//   case, please try to rewrite your regular expression within the
+//   above syntax.
+//
+//   This implementation is *not* meant to be as highly tuned or robust
+//   as a compiled regex library, but should perform well enough for a
+//   death test, which already incurs significant overhead by launching
+//   a child process.
+//
+// Known caveats:
+//
+//   A "threadsafe" style death test obtains the path to the test
+//   program from argv[0] and re-executes it in the sub-process.  For
+//   simplicity, the current implementation doesn't search the PATH
+//   when launching the sub-process.  This means that the user must
+//   invoke the test program via a path that contains at least one
+//   path separator (e.g. path/to/foo_test and
+//   /absolute/path/to/bar_test are fine, but foo_test is not).  This
+//   is rarely a problem as people usually don't put the test binary
+//   directory in PATH.
+//
+// TODO(wan at google.com): make thread-safe death tests search the PATH.
+
+// Asserts that a given statement causes the program to exit, with an
+// integer exit status that satisfies predicate, and emitting error output
+// that matches regex.
+# define ASSERT_EXIT(statement, predicate, regex) \
+    GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_FATAL_FAILURE_)
+
+// Like ASSERT_EXIT, but continues on to successive tests in the
+// test case, if any:
+# define EXPECT_EXIT(statement, predicate, regex) \
+    GTEST_DEATH_TEST_(statement, predicate, regex, GTEST_NONFATAL_FAILURE_)
+
+// Asserts that a given statement causes the program to exit, either by
+// explicitly exiting with a nonzero exit code or being killed by a
+// signal, and emitting error output that matches regex.
+# define ASSERT_DEATH(statement, regex) \
+    ASSERT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
+
+// Like ASSERT_DEATH, but continues on to successive tests in the
+// test case, if any:
+# define EXPECT_DEATH(statement, regex) \
+    EXPECT_EXIT(statement, ::testing::internal::ExitedUnsuccessfully, regex)
+
+// Two predicate classes that can be used in {ASSERT,EXPECT}_EXIT*:
+
+// Tests that an exit code describes a normal exit with a given exit code.
+class GTEST_API_ ExitedWithCode {
+ public:
+  explicit ExitedWithCode(int exit_code);
+  bool operator()(int exit_status) const;
+ private:
+  // No implementation - assignment is unsupported.
+  void operator=(const ExitedWithCode& other);
+
+  const int exit_code_;
+};
+
+# if !GTEST_OS_WINDOWS
+// Tests that an exit code describes an exit due to termination by a
+// given signal.
+class GTEST_API_ KilledBySignal {
+ public:
+  explicit KilledBySignal(int signum);
+  bool operator()(int exit_status) const;
+ private:
+  const int signum_;
+};
+# endif  // !GTEST_OS_WINDOWS
+
+// EXPECT_DEBUG_DEATH asserts that the given statements die in debug mode.
+// The death testing framework causes this to have interesting semantics,
+// since the sideeffects of the call are only visible in opt mode, and not
+// in debug mode.
+//
+// In practice, this can be used to test functions that utilize the
+// LOG(DFATAL) macro using the following style:
+//
+// int DieInDebugOr12(int* sideeffect) {
+//   if (sideeffect) {
+//     *sideeffect = 12;
+//   }
+//   LOG(DFATAL) << "death";
+//   return 12;
+// }
+//
+// TEST(TestCase, TestDieOr12WorksInDgbAndOpt) {
+//   int sideeffect = 0;
+//   // Only asserts in dbg.
+//   EXPECT_DEBUG_DEATH(DieInDebugOr12(&sideeffect), "death");
+//
+// #ifdef NDEBUG
+//   // opt-mode has sideeffect visible.
+//   EXPECT_EQ(12, sideeffect);
+// #else
+//   // dbg-mode no visible sideeffect.
+//   EXPECT_EQ(0, sideeffect);
+// #endif
+// }
+//
+// This will assert that DieInDebugReturn12InOpt() crashes in debug
+// mode, usually due to a DCHECK or LOG(DFATAL), but returns the
+// appropriate fallback value (12 in this case) in opt mode. If you
+// need to test that a function has appropriate side-effects in opt
+// mode, include assertions against the side-effects.  A general
+// pattern for this is:
+//
+// EXPECT_DEBUG_DEATH({
+//   // Side-effects here will have an effect after this statement in
+//   // opt mode, but none in debug mode.
+//   EXPECT_EQ(12, DieInDebugOr12(&sideeffect));
+// }, "death");
+//
+# ifdef NDEBUG
+
+#  define EXPECT_DEBUG_DEATH(statement, regex) \
+  GTEST_EXECUTE_STATEMENT_(statement, regex)
+
+#  define ASSERT_DEBUG_DEATH(statement, regex) \
+  GTEST_EXECUTE_STATEMENT_(statement, regex)
+
+# else
+
+#  define EXPECT_DEBUG_DEATH(statement, regex) \
+  EXPECT_DEATH(statement, regex)
+
+#  define ASSERT_DEBUG_DEATH(statement, regex) \
+  ASSERT_DEATH(statement, regex)
+
+# endif  // NDEBUG for EXPECT_DEBUG_DEATH
+#endif  // GTEST_HAS_DEATH_TEST
+
+// EXPECT_DEATH_IF_SUPPORTED(statement, regex) and
+// ASSERT_DEATH_IF_SUPPORTED(statement, regex) expand to real death tests if
+// death tests are supported; otherwise they just issue a warning.  This is
+// useful when you are combining death test assertions with normal test
+// assertions in one test.
+#if GTEST_HAS_DEATH_TEST
+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
+    EXPECT_DEATH(statement, regex)
+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
+    ASSERT_DEATH(statement, regex)
+#else
+# define EXPECT_DEATH_IF_SUPPORTED(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, )
+# define ASSERT_DEATH_IF_SUPPORTED(statement, regex) \
+    GTEST_UNSUPPORTED_DEATH_TEST_(statement, regex, return)
+#endif
+
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_DEATH_TEST_H_


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-death-test.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-message.h
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-message.h	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-message.h	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,250 @@
+// Copyright 2005, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan at google.com (Zhanyong Wan)
+//
+// The Google C++ Testing Framework (Google Test)
+//
+// This header file defines the Message class.
+//
+// IMPORTANT NOTE: Due to limitation of the C++ language, we have to
+// leave some internal implementation details in this header file.
+// They are clearly marked by comments like this:
+//
+//   // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+//
+// Such code is NOT meant to be used by a user directly, and is subject
+// to CHANGE WITHOUT NOTICE.  Therefore DO NOT DEPEND ON IT in a user
+// program!
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
+#define GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_
+
+#include <limits>
+
+#include "gtest/internal/gtest-port.h"
+
+// Ensures that there is at least one operator<< in the global namespace.
+// See Message& operator<<(...) below for why.
+void operator<<(const testing::internal::Secret&, int);
+
+namespace testing {
+
+// The Message class works like an ostream repeater.
+//
+// Typical usage:
+//
+//   1. You stream a bunch of values to a Message object.
+//      It will remember the text in a stringstream.
+//   2. Then you stream the Message object to an ostream.
+//      This causes the text in the Message to be streamed
+//      to the ostream.
+//
+// For example;
+//
+//   testing::Message foo;
+//   foo << 1 << " != " << 2;
+//   std::cout << foo;
+//
+// will print "1 != 2".
+//
+// Message is not intended to be inherited from.  In particular, its
+// destructor is not virtual.
+//
+// Note that stringstream behaves differently in gcc and in MSVC.  You
+// can stream a NULL char pointer to it in the former, but not in the
+// latter (it causes an access violation if you do).  The Message
+// class hides this difference by treating a NULL char pointer as
+// "(null)".
+class GTEST_API_ Message {
+ private:
+  // The type of basic IO manipulators (endl, ends, and flush) for
+  // narrow streams.
+  typedef std::ostream& (*BasicNarrowIoManip)(std::ostream&);
+
+ public:
+  // Constructs an empty Message.
+  Message();
+
+  // Copy constructor.
+  Message(const Message& msg) : ss_(new ::std::stringstream) {  // NOLINT
+    *ss_ << msg.GetString();
+  }
+
+  // Constructs a Message from a C-string.
+  explicit Message(const char* str) : ss_(new ::std::stringstream) {
+    *ss_ << str;
+  }
+
+#if GTEST_OS_SYMBIAN
+  // Streams a value (either a pointer or not) to this object.
+  template <typename T>
+  inline Message& operator <<(const T& value) {
+    StreamHelper(typename internal::is_pointer<T>::type(), value);
+    return *this;
+  }
+#else
+  // Streams a non-pointer value to this object.
+  template <typename T>
+  inline Message& operator <<(const T& val) {
+    // Some libraries overload << for STL containers.  These
+    // overloads are defined in the global namespace instead of ::std.
+    //
+    // C++'s symbol lookup rule (i.e. Koenig lookup) says that these
+    // overloads are visible in either the std namespace or the global
+    // namespace, but not other namespaces, including the testing
+    // namespace which Google Test's Message class is in.
+    //
+    // To allow STL containers (and other types that has a << operator
+    // defined in the global namespace) to be used in Google Test
+    // assertions, testing::Message must access the custom << operator
+    // from the global namespace.  With this using declaration,
+    // overloads of << defined in the global namespace and those
+    // visible via Koenig lookup are both exposed in this function.
+    using ::operator <<;
+    *ss_ << val;
+    return *this;
+  }
+
+  // Streams a pointer value to this object.
+  //
+  // This function is an overload of the previous one.  When you
+  // stream a pointer to a Message, this definition will be used as it
+  // is more specialized.  (The C++ Standard, section
+  // [temp.func.order].)  If you stream a non-pointer, then the
+  // previous definition will be used.
+  //
+  // The reason for this overload is that streaming a NULL pointer to
+  // ostream is undefined behavior.  Depending on the compiler, you
+  // may get "0", "(nil)", "(null)", or an access violation.  To
+  // ensure consistent result across compilers, we always treat NULL
+  // as "(null)".
+  template <typename T>
+  inline Message& operator <<(T* const& pointer) {  // NOLINT
+    if (pointer == NULL) {
+      *ss_ << "(null)";
+    } else {
+      *ss_ << pointer;
+    }
+    return *this;
+  }
+#endif  // GTEST_OS_SYMBIAN
+
+  // Since the basic IO manipulators are overloaded for both narrow
+  // and wide streams, we have to provide this specialized definition
+  // of operator <<, even though its body is the same as the
+  // templatized version above.  Without this definition, streaming
+  // endl or other basic IO manipulators to Message will confuse the
+  // compiler.
+  Message& operator <<(BasicNarrowIoManip val) {
+    *ss_ << val;
+    return *this;
+  }
+
+  // Instead of 1/0, we want to see true/false for bool values.
+  Message& operator <<(bool b) {
+    return *this << (b ? "true" : "false");
+  }
+
+  // These two overloads allow streaming a wide C string to a Message
+  // using the UTF-8 encoding.
+  Message& operator <<(const wchar_t* wide_c_str);
+  Message& operator <<(wchar_t* wide_c_str);
+
+#if GTEST_HAS_STD_WSTRING
+  // Converts the given wide string to a narrow string using the UTF-8
+  // encoding, and streams the result to this Message object.
+  Message& operator <<(const ::std::wstring& wstr);
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_HAS_GLOBAL_WSTRING
+  // Converts the given wide string to a narrow string using the UTF-8
+  // encoding, and streams the result to this Message object.
+  Message& operator <<(const ::wstring& wstr);
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+  // Gets the text streamed to this object so far as an std::string.
+  // Each '\0' character in the buffer is replaced with "\\0".
+  //
+  // INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+  std::string GetString() const;
+
+ private:
+
+#if GTEST_OS_SYMBIAN
+  // These are needed as the Nokia Symbian Compiler cannot decide between
+  // const T& and const T* in a function template. The Nokia compiler _can_
+  // decide between class template specializations for T and T*, so a
+  // tr1::type_traits-like is_pointer works, and we can overload on that.
+  template <typename T>
+  inline void StreamHelper(internal::true_type /*is_pointer*/, T* pointer) {
+    if (pointer == NULL) {
+      *ss_ << "(null)";
+    } else {
+      *ss_ << pointer;
+    }
+  }
+  template <typename T>
+  inline void StreamHelper(internal::false_type /*is_pointer*/,
+                           const T& value) {
+    // See the comments in Message& operator <<(const T&) above for why
+    // we need this using statement.
+    using ::operator <<;
+    *ss_ << value;
+  }
+#endif  // GTEST_OS_SYMBIAN
+
+  // We'll hold the text streamed to this object here.
+  const internal::scoped_ptr< ::std::stringstream> ss_;
+
+  // We declare (but don't implement) this to prevent the compiler
+  // from implementing the assignment operator.
+  void operator=(const Message&);
+};
+
+// Streams a Message to an ostream.
+inline std::ostream& operator <<(std::ostream& os, const Message& sb) {
+  return os << sb.GetString();
+}
+
+namespace internal {
+
+// Converts a streamable value to an std::string.  A NULL pointer is
+// converted to "(null)".  When the input value is a ::string,
+// ::std::string, ::wstring, or ::std::wstring object, each NUL
+// character in it is replaced with "\\0".
+template <typename T>
+std::string StreamableToString(const T& streamable) {
+  return (Message() << streamable).GetString();
+}
+
+}  // namespace internal
+}  // namespace testing
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_MESSAGE_H_


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-message.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-param-test.h
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-param-test.h	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-param-test.h	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,1444 @@
+// This file was GENERATED by command:
+//     pump.py gtest-param-test.h.pump
+// DO NOT EDIT BY HAND!!!
+
+// Copyright 2008, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Authors: vladl at google.com (Vlad Losev)
+//
+// Macros and functions for implementing parameterized tests
+// in Google C++ Testing Framework (Google Test)
+//
+// This file is generated by a SCRIPT.  DO NOT EDIT BY HAND!
+//
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_
+
+
+// Value-parameterized tests allow you to test your code with different
+// parameters without writing multiple copies of the same test.
+//
+// Here is how you use value-parameterized tests:
+
+#if 0
+
+// To write value-parameterized tests, first you should define a fixture
+// class. It is usually derived from testing::TestWithParam<T> (see below for
+// another inheritance scheme that's sometimes useful in more complicated
+// class hierarchies), where the type of your parameter values.
+// TestWithParam<T> is itself derived from testing::Test. T can be any
+// copyable type. If it's a raw pointer, you are responsible for managing the
+// lifespan of the pointed values.
+
+class FooTest : public ::testing::TestWithParam<const char*> {
+  // You can implement all the usual class fixture members here.
+};
+
+// Then, use the TEST_P macro to define as many parameterized tests
+// for this fixture as you want. The _P suffix is for "parameterized"
+// or "pattern", whichever you prefer to think.
+
+TEST_P(FooTest, DoesBlah) {
+  // Inside a test, access the test parameter with the GetParam() method
+  // of the TestWithParam<T> class:
+  EXPECT_TRUE(foo.Blah(GetParam()));
+  ...
+}
+
+TEST_P(FooTest, HasBlahBlah) {
+  ...
+}
+
+// Finally, you can use INSTANTIATE_TEST_CASE_P to instantiate the test
+// case with any set of parameters you want. Google Test defines a number
+// of functions for generating test parameters. They return what we call
+// (surprise!) parameter generators. Here is a  summary of them, which
+// are all in the testing namespace:
+//
+//
+//  Range(begin, end [, step]) - Yields values {begin, begin+step,
+//                               begin+step+step, ...}. The values do not
+//                               include end. step defaults to 1.
+//  Values(v1, v2, ..., vN)    - Yields values {v1, v2, ..., vN}.
+//  ValuesIn(container)        - Yields values from a C-style array, an STL
+//  ValuesIn(begin,end)          container, or an iterator range [begin, end).
+//  Bool()                     - Yields sequence {false, true}.
+//  Combine(g1, g2, ..., gN)   - Yields all combinations (the Cartesian product
+//                               for the math savvy) of the values generated
+//                               by the N generators.
+//
+// For more details, see comments at the definitions of these functions below
+// in this file.
+//
+// The following statement will instantiate tests from the FooTest test case
+// each with parameter values "meeny", "miny", and "moe".
+
+INSTANTIATE_TEST_CASE_P(InstantiationName,
+                        FooTest,
+                        Values("meeny", "miny", "moe"));
+
+// To distinguish different instances of the pattern, (yes, you
+// can instantiate it more then once) the first argument to the
+// INSTANTIATE_TEST_CASE_P macro is a prefix that will be added to the
+// actual test case name. Remember to pick unique prefixes for different
+// instantiations. The tests from the instantiation above will have
+// these names:
+//
+//    * InstantiationName/FooTest.DoesBlah/0 for "meeny"
+//    * InstantiationName/FooTest.DoesBlah/1 for "miny"
+//    * InstantiationName/FooTest.DoesBlah/2 for "moe"
+//    * InstantiationName/FooTest.HasBlahBlah/0 for "meeny"
+//    * InstantiationName/FooTest.HasBlahBlah/1 for "miny"
+//    * InstantiationName/FooTest.HasBlahBlah/2 for "moe"
+//
+// You can use these names in --gtest_filter.
+//
+// This statement will instantiate all tests from FooTest again, each
+// with parameter values "cat" and "dog":
+
+const char* pets[] = {"cat", "dog"};
+INSTANTIATE_TEST_CASE_P(AnotherInstantiationName, FooTest, ValuesIn(pets));
+
+// The tests from the instantiation above will have these names:
+//
+//    * AnotherInstantiationName/FooTest.DoesBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.DoesBlah/1 for "dog"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/0 for "cat"
+//    * AnotherInstantiationName/FooTest.HasBlahBlah/1 for "dog"
+//
+// Please note that INSTANTIATE_TEST_CASE_P will instantiate all tests
+// in the given test case, whether their definitions come before or
+// AFTER the INSTANTIATE_TEST_CASE_P statement.
+//
+// Please also note that generator expressions (including parameters to the
+// generators) are evaluated in InitGoogleTest(), after main() has started.
+// This allows the user on one hand, to adjust generator parameters in order
+// to dynamically determine a set of tests to run and on the other hand,
+// give the user a chance to inspect the generated tests with Google Test
+// reflection API before RUN_ALL_TESTS() is executed.
+//
+// You can see samples/sample7_unittest.cc and samples/sample8_unittest.cc
+// for more examples.
+//
+// In the future, we plan to publish the API for defining new parameter
+// generators. But for now this interface remains part of the internal
+// implementation and is subject to change.
+//
+//
+// A parameterized test fixture must be derived from testing::Test and from
+// testing::WithParamInterface<T>, where T is the type of the parameter
+// values. Inheriting from TestWithParam<T> satisfies that requirement because
+// TestWithParam<T> inherits from both Test and WithParamInterface. In more
+// complicated hierarchies, however, it is occasionally useful to inherit
+// separately from Test and WithParamInterface. For example:
+
+class BaseTest : public ::testing::Test {
+  // You can inherit all the usual members for a non-parameterized test
+  // fixture here.
+};
+
+class DerivedTest : public BaseTest, public ::testing::WithParamInterface<int> {
+  // The usual test fixture members go here too.
+};
+
+TEST_F(BaseTest, HasFoo) {
+  // This is an ordinary non-parameterized test.
+}
+
+TEST_P(DerivedTest, DoesBlah) {
+  // GetParam works just the same here as if you inherit from TestWithParam.
+  EXPECT_TRUE(foo.Blah(GetParam()));
+}
+
+#endif  // 0
+
+#include "gtest/internal/gtest-port.h"
+
+#if !GTEST_OS_SYMBIAN
+# include <utility>
+#endif
+
+// scripts/fuse_gtest.py depends on gtest's own header being #included
+// *unconditionally*.  Therefore these #includes cannot be moved
+// inside #if GTEST_HAS_PARAM_TEST.
+#include "gtest/internal/gtest-internal.h"
+#include "gtest/internal/gtest-param-util.h"
+#include "gtest/internal/gtest-param-util-generated.h"
+
+#if GTEST_HAS_PARAM_TEST
+
+namespace testing {
+
+// Functions producing parameter generators.
+//
+// Google Test uses these generators to produce parameters for value-
+// parameterized tests. When a parameterized test case is instantiated
+// with a particular generator, Google Test creates and runs tests
+// for each element in the sequence produced by the generator.
+//
+// In the following sample, tests from test case FooTest are instantiated
+// each three times with parameter values 3, 5, and 8:
+//
+// class FooTest : public TestWithParam<int> { ... };
+//
+// TEST_P(FooTest, TestThis) {
+// }
+// TEST_P(FooTest, TestThat) {
+// }
+// INSTANTIATE_TEST_CASE_P(TestSequence, FooTest, Values(3, 5, 8));
+//
+
+// Range() returns generators providing sequences of values in a range.
+//
+// Synopsis:
+// Range(start, end)
+//   - returns a generator producing a sequence of values {start, start+1,
+//     start+2, ..., }.
+// Range(start, end, step)
+//   - returns a generator producing a sequence of values {start, start+step,
+//     start+step+step, ..., }.
+// Notes:
+//   * The generated sequences never include end. For example, Range(1, 5)
+//     returns a generator producing a sequence {1, 2, 3, 4}. Range(1, 9, 2)
+//     returns a generator producing {1, 3, 5, 7}.
+//   * start and end must have the same type. That type may be any integral or
+//     floating-point type or a user defined type satisfying these conditions:
+//     * It must be assignable (have operator=() defined).
+//     * It must have operator+() (operator+(int-compatible type) for
+//       two-operand version).
+//     * It must have operator<() defined.
+//     Elements in the resulting sequences will also have that type.
+//   * Condition start < end must be satisfied in order for resulting sequences
+//     to contain any elements.
+//
+template <typename T, typename IncrementT>
+internal::ParamGenerator<T> Range(T start, T end, IncrementT step) {
+  return internal::ParamGenerator<T>(
+      new internal::RangeGenerator<T, IncrementT>(start, end, step));
+}
+
+template <typename T>
+internal::ParamGenerator<T> Range(T start, T end) {
+  return Range(start, end, 1);
+}
+
+// ValuesIn() function allows generation of tests with parameters coming from
+// a container.
+//
+// Synopsis:
+// ValuesIn(const T (&array)[N])
+//   - returns a generator producing sequences with elements from
+//     a C-style array.
+// ValuesIn(const Container& container)
+//   - returns a generator producing sequences with elements from
+//     an STL-style container.
+// ValuesIn(Iterator begin, Iterator end)
+//   - returns a generator producing sequences with elements from
+//     a range [begin, end) defined by a pair of STL-style iterators. These
+//     iterators can also be plain C pointers.
+//
+// Please note that ValuesIn copies the values from the containers
+// passed in and keeps them to generate tests in RUN_ALL_TESTS().
+//
+// Examples:
+//
+// This instantiates tests from test case StringTest
+// each with C-string values of "foo", "bar", and "baz":
+//
+// const char* strings[] = {"foo", "bar", "baz"};
+// INSTANTIATE_TEST_CASE_P(StringSequence, SrtingTest, ValuesIn(strings));
+//
+// This instantiates tests from test case StlStringTest
+// each with STL strings with values "a" and "b":
+//
+// ::std::vector< ::std::string> GetParameterStrings() {
+//   ::std::vector< ::std::string> v;
+//   v.push_back("a");
+//   v.push_back("b");
+//   return v;
+// }
+//
+// INSTANTIATE_TEST_CASE_P(CharSequence,
+//                         StlStringTest,
+//                         ValuesIn(GetParameterStrings()));
+//
+//
+// This will also instantiate tests from CharTest
+// each with parameter values 'a' and 'b':
+//
+// ::std::list<char> GetParameterChars() {
+//   ::std::list<char> list;
+//   list.push_back('a');
+//   list.push_back('b');
+//   return list;
+// }
+// ::std::list<char> l = GetParameterChars();
+// INSTANTIATE_TEST_CASE_P(CharSequence2,
+//                         CharTest,
+//                         ValuesIn(l.begin(), l.end()));
+//
+template <typename ForwardIterator>
+internal::ParamGenerator<
+  typename ::testing::internal::IteratorTraits<ForwardIterator>::value_type>
+ValuesIn(ForwardIterator begin, ForwardIterator end) {
+  typedef typename ::testing::internal::IteratorTraits<ForwardIterator>
+      ::value_type ParamType;
+  return internal::ParamGenerator<ParamType>(
+      new internal::ValuesInIteratorRangeGenerator<ParamType>(begin, end));
+}
+
+template <typename T, size_t N>
+internal::ParamGenerator<T> ValuesIn(const T (&array)[N]) {
+  return ValuesIn(array, array + N);
+}
+
+template <class Container>
+internal::ParamGenerator<typename Container::value_type> ValuesIn(
+    const Container& container) {
+  return ValuesIn(container.begin(), container.end());
+}
+
+// Values() allows generating tests from explicitly specified list of
+// parameters.
+//
+// Synopsis:
+// Values(T v1, T v2, ..., T vN)
+//   - returns a generator producing sequences with elements v1, v2, ..., vN.
+//
+// For example, this instantiates tests from test case BarTest each
+// with values "one", "two", and "three":
+//
+// INSTANTIATE_TEST_CASE_P(NumSequence, BarTest, Values("one", "two", "three"));
+//
+// This instantiates tests from test case BazTest each with values 1, 2, 3.5.
+// The exact type of values will depend on the type of parameter in BazTest.
+//
+// INSTANTIATE_TEST_CASE_P(FloatingNumbers, BazTest, Values(1, 2, 3.5));
+//
+// Currently, Values() supports from 1 to 50 parameters.
+//
+template <typename T1>
+internal::ValueArray1<T1> Values(T1 v1) {
+  return internal::ValueArray1<T1>(v1);
+}
+
+template <typename T1, typename T2>
+internal::ValueArray2<T1, T2> Values(T1 v1, T2 v2) {
+  return internal::ValueArray2<T1, T2>(v1, v2);
+}
+
+template <typename T1, typename T2, typename T3>
+internal::ValueArray3<T1, T2, T3> Values(T1 v1, T2 v2, T3 v3) {
+  return internal::ValueArray3<T1, T2, T3>(v1, v2, v3);
+}
+
+template <typename T1, typename T2, typename T3, typename T4>
+internal::ValueArray4<T1, T2, T3, T4> Values(T1 v1, T2 v2, T3 v3, T4 v4) {
+  return internal::ValueArray4<T1, T2, T3, T4>(v1, v2, v3, v4);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+internal::ValueArray5<T1, T2, T3, T4, T5> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5) {
+  return internal::ValueArray5<T1, T2, T3, T4, T5>(v1, v2, v3, v4, v5);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6>
+internal::ValueArray6<T1, T2, T3, T4, T5, T6> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6) {
+  return internal::ValueArray6<T1, T2, T3, T4, T5, T6>(v1, v2, v3, v4, v5, v6);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7>
+internal::ValueArray7<T1, T2, T3, T4, T5, T6, T7> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6, T7 v7) {
+  return internal::ValueArray7<T1, T2, T3, T4, T5, T6, T7>(v1, v2, v3, v4, v5,
+      v6, v7);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8>
+internal::ValueArray8<T1, T2, T3, T4, T5, T6, T7, T8> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8) {
+  return internal::ValueArray8<T1, T2, T3, T4, T5, T6, T7, T8>(v1, v2, v3, v4,
+      v5, v6, v7, v8);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9>
+internal::ValueArray9<T1, T2, T3, T4, T5, T6, T7, T8, T9> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9) {
+  return internal::ValueArray9<T1, T2, T3, T4, T5, T6, T7, T8, T9>(v1, v2, v3,
+      v4, v5, v6, v7, v8, v9);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10>
+internal::ValueArray10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Values(T1 v1,
+    T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10) {
+  return internal::ValueArray10<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(v1,
+      v2, v3, v4, v5, v6, v7, v8, v9, v10);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11>
+internal::ValueArray11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10,
+    T11> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11) {
+  return internal::ValueArray11<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10,
+      T11>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12>
+internal::ValueArray12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+    T12> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12) {
+  return internal::ValueArray12<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13>
+internal::ValueArray13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12,
+    T13> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13) {
+  return internal::ValueArray13<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14>
+internal::ValueArray14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14) {
+  return internal::ValueArray14<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13,
+      v14);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15>
+internal::ValueArray15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8,
+    T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15) {
+  return internal::ValueArray15<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12,
+      v13, v14, v15);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16>
+internal::ValueArray16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16) {
+  return internal::ValueArray16<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11,
+      v12, v13, v14, v15, v16);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17>
+internal::ValueArray17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17) {
+  return internal::ValueArray17<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10,
+      v11, v12, v13, v14, v15, v16, v17);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18>
+internal::ValueArray18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6,
+    T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18) {
+  return internal::ValueArray18<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18>(v1, v2, v3, v4, v5, v6, v7, v8, v9,
+      v10, v11, v12, v13, v14, v15, v16, v17, v18);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19>
+internal::ValueArray19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5,
+    T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14,
+    T15 v15, T16 v16, T17 v17, T18 v18, T19 v19) {
+  return internal::ValueArray19<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19>(v1, v2, v3, v4, v5, v6, v7, v8,
+      v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20>
+internal::ValueArray20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20) {
+  return internal::ValueArray20<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20>(v1, v2, v3, v4, v5, v6, v7,
+      v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21>
+internal::ValueArray21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21) {
+  return internal::ValueArray21<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21>(v1, v2, v3, v4, v5, v6,
+      v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22>
+internal::ValueArray22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22) {
+  return internal::ValueArray22<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22>(v1, v2, v3, v4,
+      v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23>
+internal::ValueArray23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23) {
+  return internal::ValueArray23<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23>(v1, v2, v3,
+      v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24>
+internal::ValueArray24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24) {
+  return internal::ValueArray24<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24>(v1, v2,
+      v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+      v19, v20, v21, v22, v23, v24);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25>
+internal::ValueArray25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25> Values(T1 v1,
+    T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11,
+    T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19,
+    T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25) {
+  return internal::ValueArray25<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25>(v1,
+      v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17,
+      v18, v19, v20, v21, v22, v23, v24, v25);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26>
+internal::ValueArray26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+    T26> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26) {
+  return internal::ValueArray26<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+      v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27>
+internal::ValueArray27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26,
+    T27> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27) {
+  return internal::ValueArray27<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14,
+      v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28>
+internal::ValueArray28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27,
+    T28> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28) {
+  return internal::ValueArray28<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13,
+      v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27,
+      v28);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29>
+internal::ValueArray29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29) {
+  return internal::ValueArray29<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12,
+      v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26,
+      v27, v28, v29);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30>
+internal::ValueArray30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8,
+    T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16,
+    T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24,
+    T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30) {
+  return internal::ValueArray30<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11,
+      v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25,
+      v26, v27, v28, v29, v30);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31>
+internal::ValueArray31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31) {
+  return internal::ValueArray31<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10,
+      v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24,
+      v25, v26, v27, v28, v29, v30, v31);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32>
+internal::ValueArray32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32) {
+  return internal::ValueArray32<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32>(v1, v2, v3, v4, v5, v6, v7, v8, v9,
+      v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33>
+internal::ValueArray33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6,
+    T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33) {
+  return internal::ValueArray33<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33>(v1, v2, v3, v4, v5, v6, v7, v8,
+      v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32, v33);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34>
+internal::ValueArray34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5,
+    T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14,
+    T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22,
+    T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30,
+    T31 v31, T32 v32, T33 v33, T34 v34) {
+  return internal::ValueArray34<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34>(v1, v2, v3, v4, v5, v6, v7,
+      v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22,
+      v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35>
+internal::ValueArray35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21,
+    T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29,
+    T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35) {
+  return internal::ValueArray35<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35>(v1, v2, v3, v4, v5, v6,
+      v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21,
+      v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36>
+internal::ValueArray36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21,
+    T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29,
+    T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36) {
+  return internal::ValueArray36<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36>(v1, v2, v3, v4,
+      v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33,
+      v34, v35, v36);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37>
+internal::ValueArray37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37> Values(T1 v1, T2 v2, T3 v3,
+    T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28,
+    T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36,
+    T37 v37) {
+  return internal::ValueArray37<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37>(v1, v2, v3,
+      v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33,
+      v34, v35, v36, v37);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38>
+internal::ValueArray38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28,
+    T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36,
+    T37 v37, T38 v38) {
+  return internal::ValueArray38<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38>(v1, v2,
+      v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18,
+      v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32,
+      v33, v34, v35, v36, v37, v38);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39>
+internal::ValueArray39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39> Values(T1 v1, T2 v2,
+    T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12,
+    T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20,
+    T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28,
+    T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36,
+    T37 v37, T38 v38, T39 v39) {
+  return internal::ValueArray39<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39>(v1,
+      v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17,
+      v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31,
+      v32, v33, v34, v35, v36, v37, v38, v39);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40>
+internal::ValueArray40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40> Values(T1 v1,
+    T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11,
+    T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19,
+    T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27,
+    T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35,
+    T36 v36, T37 v37, T38 v38, T39 v39, T40 v40) {
+  return internal::ValueArray40<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15,
+      v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29,
+      v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41>
+internal::ValueArray41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40,
+    T41> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41) {
+  return internal::ValueArray41<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14,
+      v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28,
+      v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42>
+internal::ValueArray42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41,
+    T42> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+    T42 v42) {
+  return internal::ValueArray42<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13,
+      v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27,
+      v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41,
+      v42);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43>
+internal::ValueArray43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42,
+    T43> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+    T42 v42, T43 v43) {
+  return internal::ValueArray43<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12,
+      v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26,
+      v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40,
+      v41, v42, v43);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44>
+internal::ValueArray44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8, T9 v9,
+    T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16, T17 v17,
+    T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24, T25 v25,
+    T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32, T33 v33,
+    T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40, T41 v41,
+    T42 v42, T43 v43, T44 v44) {
+  return internal::ValueArray44<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11,
+      v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25,
+      v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39,
+      v40, v41, v42, v43, v44);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45>
+internal::ValueArray45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7, T8 v8,
+    T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15, T16 v16,
+    T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23, T24 v24,
+    T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31, T32 v32,
+    T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39, T40 v40,
+    T41 v41, T42 v42, T43 v43, T44 v44, T45 v45) {
+  return internal::ValueArray45<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45>(v1, v2, v3, v4, v5, v6, v7, v8, v9, v10,
+      v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24,
+      v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38,
+      v39, v40, v41, v42, v43, v44, v45);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46>
+internal::ValueArray46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39,
+    T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46) {
+  return internal::ValueArray46<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46>(v1, v2, v3, v4, v5, v6, v7, v8, v9,
+      v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37,
+      v38, v39, v40, v41, v42, v43, v44, v45, v46);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47>
+internal::ValueArray47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6, T7 v7,
+    T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39,
+    T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47) {
+  return internal::ValueArray47<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47>(v1, v2, v3, v4, v5, v6, v7, v8,
+      v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23,
+      v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37,
+      v38, v39, v40, v41, v42, v43, v44, v45, v46, v47);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48>
+internal::ValueArray48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47, T48> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5, T6 v6,
+    T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14, T15 v15,
+    T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22, T23 v23,
+    T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30, T31 v31,
+    T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38, T39 v39,
+    T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46, T47 v47,
+    T48 v48) {
+  return internal::ValueArray48<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47, T48>(v1, v2, v3, v4, v5, v6, v7,
+      v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22,
+      v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36,
+      v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49>
+internal::ValueArray49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47, T48, T49> Values(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5,
+    T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13, T14 v14,
+    T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21, T22 v22,
+    T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29, T30 v30,
+    T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37, T38 v38,
+    T39 v39, T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45, T46 v46,
+    T47 v47, T48 v48, T49 v49) {
+  return internal::ValueArray49<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47, T48, T49>(v1, v2, v3, v4, v5, v6,
+      v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21,
+      v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35,
+      v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+    typename T6, typename T7, typename T8, typename T9, typename T10,
+    typename T11, typename T12, typename T13, typename T14, typename T15,
+    typename T16, typename T17, typename T18, typename T19, typename T20,
+    typename T21, typename T22, typename T23, typename T24, typename T25,
+    typename T26, typename T27, typename T28, typename T29, typename T30,
+    typename T31, typename T32, typename T33, typename T34, typename T35,
+    typename T36, typename T37, typename T38, typename T39, typename T40,
+    typename T41, typename T42, typename T43, typename T44, typename T45,
+    typename T46, typename T47, typename T48, typename T49, typename T50>
+internal::ValueArray50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11, T12, T13,
+    T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25, T26, T27, T28,
+    T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39, T40, T41, T42, T43,
+    T44, T45, T46, T47, T48, T49, T50> Values(T1 v1, T2 v2, T3 v3, T4 v4,
+    T5 v5, T6 v6, T7 v7, T8 v8, T9 v9, T10 v10, T11 v11, T12 v12, T13 v13,
+    T14 v14, T15 v15, T16 v16, T17 v17, T18 v18, T19 v19, T20 v20, T21 v21,
+    T22 v22, T23 v23, T24 v24, T25 v25, T26 v26, T27 v27, T28 v28, T29 v29,
+    T30 v30, T31 v31, T32 v32, T33 v33, T34 v34, T35 v35, T36 v36, T37 v37,
+    T38 v38, T39 v39, T40 v40, T41 v41, T42 v42, T43 v43, T44 v44, T45 v45,
+    T46 v46, T47 v47, T48 v48, T49 v49, T50 v50) {
+  return internal::ValueArray50<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10, T11,
+      T12, T13, T14, T15, T16, T17, T18, T19, T20, T21, T22, T23, T24, T25,
+      T26, T27, T28, T29, T30, T31, T32, T33, T34, T35, T36, T37, T38, T39,
+      T40, T41, T42, T43, T44, T45, T46, T47, T48, T49, T50>(v1, v2, v3, v4,
+      v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19,
+      v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33,
+      v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47,
+      v48, v49, v50);
+}
+
+// Bool() allows generating tests with parameters in a set of (false, true).
+//
+// Synopsis:
+// Bool()
+//   - returns a generator producing sequences with elements {false, true}.
+//
+// It is useful when testing code that depends on Boolean flags. Combinations
+// of multiple flags can be tested when several Bool()'s are combined using
+// Combine() function.
+//
+// In the following example all tests in the test case FlagDependentTest
+// will be instantiated twice with parameters false and true.
+//
+// class FlagDependentTest : public testing::TestWithParam<bool> {
+//   virtual void SetUp() {
+//     external_flag = GetParam();
+//   }
+// }
+// INSTANTIATE_TEST_CASE_P(BoolSequence, FlagDependentTest, Bool());
+//
+inline internal::ParamGenerator<bool> Bool() {
+  return Values(false, true);
+}
+
+# if GTEST_HAS_COMBINE
+// Combine() allows the user to combine two or more sequences to produce
+// values of a Cartesian product of those sequences' elements.
+//
+// Synopsis:
+// Combine(gen1, gen2, ..., genN)
+//   - returns a generator producing sequences with elements coming from
+//     the Cartesian product of elements from the sequences generated by
+//     gen1, gen2, ..., genN. The sequence elements will have a type of
+//     tuple<T1, T2, ..., TN> where T1, T2, ..., TN are the types
+//     of elements from sequences produces by gen1, gen2, ..., genN.
+//
+// Combine can have up to 10 arguments. This number is currently limited
+// by the maximum number of elements in the tuple implementation used by Google
+// Test.
+//
+// Example:
+//
+// This will instantiate tests in test case AnimalTest each one with
+// the parameter values tuple("cat", BLACK), tuple("cat", WHITE),
+// tuple("dog", BLACK), and tuple("dog", WHITE):
+//
+// enum Color { BLACK, GRAY, WHITE };
+// class AnimalTest
+//     : public testing::TestWithParam<tuple<const char*, Color> > {...};
+//
+// TEST_P(AnimalTest, AnimalLooksNice) {...}
+//
+// INSTANTIATE_TEST_CASE_P(AnimalVariations, AnimalTest,
+//                         Combine(Values("cat", "dog"),
+//                                 Values(BLACK, WHITE)));
+//
+// This will instantiate tests in FlagDependentTest with all variations of two
+// Boolean flags:
+//
+// class FlagDependentTest
+//     : public testing::TestWithParam<tuple<bool, bool> > {
+//   virtual void SetUp() {
+//     // Assigns external_flag_1 and external_flag_2 values from the tuple.
+//     tie(external_flag_1, external_flag_2) = GetParam();
+//   }
+// };
+//
+// TEST_P(FlagDependentTest, TestFeature1) {
+//   // Test your code using external_flag_1 and external_flag_2 here.
+// }
+// INSTANTIATE_TEST_CASE_P(TwoBoolSequence, FlagDependentTest,
+//                         Combine(Bool(), Bool()));
+//
+template <typename Generator1, typename Generator2>
+internal::CartesianProductHolder2<Generator1, Generator2> Combine(
+    const Generator1& g1, const Generator2& g2) {
+  return internal::CartesianProductHolder2<Generator1, Generator2>(
+      g1, g2);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3>
+internal::CartesianProductHolder3<Generator1, Generator2, Generator3> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3) {
+  return internal::CartesianProductHolder3<Generator1, Generator2, Generator3>(
+      g1, g2, g3);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4>
+internal::CartesianProductHolder4<Generator1, Generator2, Generator3,
+    Generator4> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4) {
+  return internal::CartesianProductHolder4<Generator1, Generator2, Generator3,
+      Generator4>(
+      g1, g2, g3, g4);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5>
+internal::CartesianProductHolder5<Generator1, Generator2, Generator3,
+    Generator4, Generator5> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5) {
+  return internal::CartesianProductHolder5<Generator1, Generator2, Generator3,
+      Generator4, Generator5>(
+      g1, g2, g3, g4, g5);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6>
+internal::CartesianProductHolder6<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6) {
+  return internal::CartesianProductHolder6<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6>(
+      g1, g2, g3, g4, g5, g6);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7>
+internal::CartesianProductHolder7<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7) {
+  return internal::CartesianProductHolder7<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7>(
+      g1, g2, g3, g4, g5, g6, g7);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7, typename Generator8>
+internal::CartesianProductHolder8<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7, Generator8> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7, const Generator8& g8) {
+  return internal::CartesianProductHolder8<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7, Generator8>(
+      g1, g2, g3, g4, g5, g6, g7, g8);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7, typename Generator8, typename Generator9>
+internal::CartesianProductHolder9<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7, Generator8,
+    Generator9> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7, const Generator8& g8, const Generator9& g9) {
+  return internal::CartesianProductHolder9<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7, Generator8, Generator9>(
+      g1, g2, g3, g4, g5, g6, g7, g8, g9);
+}
+
+template <typename Generator1, typename Generator2, typename Generator3,
+    typename Generator4, typename Generator5, typename Generator6,
+    typename Generator7, typename Generator8, typename Generator9,
+    typename Generator10>
+internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
+    Generator4, Generator5, Generator6, Generator7, Generator8, Generator9,
+    Generator10> Combine(
+    const Generator1& g1, const Generator2& g2, const Generator3& g3,
+        const Generator4& g4, const Generator5& g5, const Generator6& g6,
+        const Generator7& g7, const Generator8& g8, const Generator9& g9,
+        const Generator10& g10) {
+  return internal::CartesianProductHolder10<Generator1, Generator2, Generator3,
+      Generator4, Generator5, Generator6, Generator7, Generator8, Generator9,
+      Generator10>(
+      g1, g2, g3, g4, g5, g6, g7, g8, g9, g10);
+}
+# endif  // GTEST_HAS_COMBINE
+
+
+
+# define TEST_P(test_case_name, test_name) \
+  class GTEST_TEST_CLASS_NAME_(test_case_name, test_name) \
+      : public test_case_name { \
+   public: \
+    GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \
+    virtual void TestBody(); \
+   private: \
+    static int AddToRegistry() { \
+      ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
+          GetTestCasePatternHolder<test_case_name>(\
+              #test_case_name, \
+              ::testing::internal::CodeLocation(\
+                  __FILE__, __LINE__))->AddTestPattern(\
+                      #test_case_name, \
+                      #test_name, \
+                      new ::testing::internal::TestMetaFactory< \
+                          GTEST_TEST_CLASS_NAME_(\
+                              test_case_name, test_name)>()); \
+      return 0; \
+    } \
+    static int gtest_registering_dummy_ GTEST_ATTRIBUTE_UNUSED_; \
+    GTEST_DISALLOW_COPY_AND_ASSIGN_(\
+        GTEST_TEST_CLASS_NAME_(test_case_name, test_name)); \
+  }; \
+  int GTEST_TEST_CLASS_NAME_(test_case_name, \
+                             test_name)::gtest_registering_dummy_ = \
+      GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
+  void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody()
+
+// The optional last argument to INSTANTIATE_TEST_CASE_P allows the user
+// to specify a function or functor that generates custom test name suffixes
+// based on the test parameters. The function should accept one argument of
+// type testing::TestParamInfo<class ParamType>, and return std::string.
+//
+// testing::PrintToStringParamName is a builtin test suffix generator that
+// returns the value of testing::PrintToString(GetParam()). It does not work
+// for std::string or C strings.
+//
+// Note: test names must be non-empty, unique, and may only contain ASCII
+// alphanumeric characters or underscore.
+
+# define INSTANTIATE_TEST_CASE_P(prefix, test_case_name, generator, ...) \
+  ::testing::internal::ParamGenerator<test_case_name::ParamType> \
+      gtest_##prefix##test_case_name##_EvalGenerator_() { return generator; } \
+  ::std::string gtest_##prefix##test_case_name##_EvalGenerateName_( \
+      const ::testing::TestParamInfo<test_case_name::ParamType>& info) { \
+    return ::testing::internal::GetParamNameGen<test_case_name::ParamType> \
+        (__VA_ARGS__)(info); \
+  } \
+  int gtest_##prefix##test_case_name##_dummy_ GTEST_ATTRIBUTE_UNUSED_ = \
+      ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
+          GetTestCasePatternHolder<test_case_name>(\
+              #test_case_name, \
+              ::testing::internal::CodeLocation(\
+                  __FILE__, __LINE__))->AddTestCaseInstantiation(\
+                      #prefix, \
+                      &gtest_##prefix##test_case_name##_EvalGenerator_, \
+                      &gtest_##prefix##test_case_name##_EvalGenerateName_, \
+                      __FILE__, __LINE__)
+
+}  // namespace testing
+
+#endif  // GTEST_HAS_PARAM_TEST
+
+#endif  // GTEST_INCLUDE_GTEST_GTEST_PARAM_TEST_H_


Property changes on: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-param-test.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-printers.h
===================================================================
--- trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-printers.h	                        (rev 0)
+++ trunk/Build/source/texk/dvisvgm/dvisvgm-src/tests/gtest/include/gtest/gtest-printers.h	2017-02-13 17:57:19 UTC (rev 43208)
@@ -0,0 +1,993 @@
+// Copyright 2007, Google Inc.
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+// Author: wan at google.com (Zhanyong Wan)
+
+// Google Test - The Google C++ Testing Framework
+//
+// This file implements a universal value printer that can print a
+// value of any type T:
+//
+//   void ::testing::internal::UniversalPrinter<T>::Print(value, ostream_ptr);
+//
+// A user can teach this function how to print a class type T by
+// defining either operator<<() or PrintTo() in the namespace that
+// defines T.  More specifically, the FIRST defined function in the
+// following list will be used (assuming T is defined in namespace
+// foo):
+//
+//   1. foo::PrintTo(const T&, ostream*)
+//   2. operator<<(ostream&, const T&) defined in either foo or the
+//      global namespace.
+//
+// If none of the above is defined, it will print the debug string of
+// the value if it is a protocol buffer, or print the raw bytes in the
+// value otherwise.
+//
+// To aid debugging: when T is a reference type, the address of the
+// value is also printed; when T is a (const) char pointer, both the
+// pointer value and the NUL-terminated string it points to are
+// printed.
+//
+// We also provide some convenient wrappers:
+//
+//   // Prints a value to a string.  For a (const or not) char
+//   // pointer, the NUL-terminated string (but not the pointer) is
+//   // printed.
+//   std::string ::testing::PrintToString(const T& value);
+//
+//   // Prints a value tersely: for a reference type, the referenced
+//   // value (but not the address) is printed; for a (const or not) char
+//   // pointer, the NUL-terminated string (but not the pointer) is
+//   // printed.
+//   void ::testing::internal::UniversalTersePrint(const T& value, ostream*);
+//
+//   // Prints value using the type inferred by the compiler.  The difference
+//   // from UniversalTersePrint() is that this function prints both the
+//   // pointer and the NUL-terminated string for a (const or not) char pointer.
+//   void ::testing::internal::UniversalPrint(const T& value, ostream*);
+//
+//   // Prints the fields of a tuple tersely to a string vector, one
+//   // element for each field. Tuple support must be enabled in
+//   // gtest-port.h.
+//   std::vector<string> UniversalTersePrintTupleFieldsToStrings(
+//       const Tuple& value);
+//
+// Known limitation:
+//
+// The print primitives print the elements of an STL-style container
+// using the compiler-inferred type of *iter where iter is a
+// const_iterator of the container.  When const_iterator is an input
+// iterator but not a forward iterator, this inferred type may not
+// match value_type, and the print output may be incorrect.  In
+// practice, this is rarely a problem as for most containers
+// const_iterator is a forward iterator.  We'll fix this if there's an
+// actual need for it.  Note that this fix cannot rely on value_type
+// being defined as many user-defined container types don't have
+// value_type.
+
+#ifndef GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
+#define GTEST_INCLUDE_GTEST_GTEST_PRINTERS_H_
+
+#include <ostream>  // NOLINT
+#include <sstream>
+#include <string>
+#include <utility>
+#include <vector>
+#include "gtest/internal/gtest-port.h"
+#include "gtest/internal/gtest-internal.h"
+
+#if GTEST_HAS_STD_TUPLE_
+# include <tuple>
+#endif
+
+namespace testing {
+
+// Definitions in the 'internal' and 'internal2' name spaces are
+// subject to change without notice.  DO NOT USE THEM IN USER CODE!
+namespace internal2 {
+
+// Prints the given number of bytes in the given object to the given
+// ostream.
+GTEST_API_ void PrintBytesInObjectTo(const unsigned char* obj_bytes,
+                                     size_t count,
+                                     ::std::ostream* os);
+
+// For selecting which printer to use when a given type has neither <<
+// nor PrintTo().
+enum TypeKind {
+  kProtobuf,              // a protobuf type
+  kConvertibleToInteger,  // a type implicitly convertible to BiggestInt
+                          // (e.g. a named or unnamed enum type)
+  kOtherType              // anything else
+};
+
+// TypeWithoutFormatter<T, kTypeKind>::PrintValue(value, os) is called
+// by the universal printer to print a value of type T when neither
+// operator<< nor PrintTo() is defined for T, where kTypeKind is the
+// "kind" of T as defined by enum TypeKind.
+template <typename T, TypeKind kTypeKind>
+class TypeWithoutFormatter {
+ public:
+  // This default version is called when kTypeKind is kOtherType.
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    PrintBytesInObjectTo(reinterpret_cast<const unsigned char*>(&value),
+                         sizeof(value), os);
+  }
+};
+
+// We print a protobuf using its ShortDebugString() when the string
+// doesn't exceed this many characters; otherwise we print it using
+// DebugString() for better readability.
+const size_t kProtobufOneLinerMaxLength = 50;
+
+template <typename T>
+class TypeWithoutFormatter<T, kProtobuf> {
+ public:
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    const ::testing::internal::string short_str = value.ShortDebugString();
+    const ::testing::internal::string pretty_str =
+        short_str.length() <= kProtobufOneLinerMaxLength ?
+        short_str : ("\n" + value.DebugString());
+    *os << ("<" + pretty_str + ">");
+  }
+};
+
+template <typename T>
+class TypeWithoutFormatter<T, kConvertibleToInteger> {
+ public:
+  // Since T has no << operator or PrintTo() but can be implicitly
+  // converted to BiggestInt, we print it as a BiggestInt.
+  //
+  // Most likely T is an enum type (either named or unnamed), in which
+  // case printing it as an integer is the desired behavior.  In case
+  // T is not an enum, printing it as an integer is the best we can do
+  // given that it has no user-defined printer.
+  static void PrintValue(const T& value, ::std::ostream* os) {
+    const internal::BiggestInt kBigInt = value;
+    *os << kBigInt;
+  }
+};
+
+// Prints the given value to the given ostream.  If the value is a
+// protocol message, its debug string is printed; if it's an enum or
+// of a type implicitly convertible to BiggestInt, it's printed as an
+// integer; otherwise the bytes in the value are printed.  This is
+// what UniversalPrinter<T>::Print() does when it knows nothing about
+// type T and T has neither << operator nor PrintTo().
+//
+// A user can override this behavior for a class type Foo by defining
+// a << operator in the namespace where Foo is defined.
+//
+// We put this operator in namespace 'internal2' instead of 'internal'
+// to simplify the implementation, as much code in 'internal' needs to
+// use << in STL, which would conflict with our own << were it defined
+// in 'internal'.
+//
+// Note that this operator<< takes a generic std::basic_ostream<Char,
+// CharTraits> type instead of the more restricted std::ostream.  If
+// we define it to take an std::ostream instead, we'll get an
+// "ambiguous overloads" compiler error when trying to print a type
+// Foo that supports streaming to std::basic_ostream<Char,
+// CharTraits>, as the compiler cannot tell whether
+// operator<<(std::ostream&, const T&) or
+// operator<<(std::basic_stream<Char, CharTraits>, const Foo&) is more
+// specific.
+template <typename Char, typename CharTraits, typename T>
+::std::basic_ostream<Char, CharTraits>& operator<<(
+    ::std::basic_ostream<Char, CharTraits>& os, const T& x) {
+  TypeWithoutFormatter<T,
+      (internal::IsAProtocolMessage<T>::value ? kProtobuf :
+       internal::ImplicitlyConvertible<const T&, internal::BiggestInt>::value ?
+       kConvertibleToInteger : kOtherType)>::PrintValue(x, &os);
+  return os;
+}
+
+}  // namespace internal2
+}  // namespace testing
+
+// This namespace MUST NOT BE NESTED IN ::testing, or the name look-up
+// magic needed for implementing UniversalPrinter won't work.
+namespace testing_internal {
+
+// Used to print a value that is not an STL-style container when the
+// user doesn't define PrintTo() for it.
+template <typename T>
+void DefaultPrintNonContainerTo(const T& value, ::std::ostream* os) {
+  // With the following statement, during unqualified name lookup,
+  // testing::internal2::operator<< appears as if it was declared in
+  // the nearest enclosing namespace that contains both
+  // ::testing_internal and ::testing::internal2, i.e. the global
+  // namespace.  For more details, refer to the C++ Standard section
+  // 7.3.4-1 [namespace.udir].  This allows us to fall back onto
+  // testing::internal2::operator<< in case T doesn't come with a <<
+  // operator.
+  //
+  // We cannot write 'using ::testing::internal2::operator<<;', which
+  // gcc 3.3 fails to compile due to a compiler bug.
+  using namespace ::testing::internal2;  // NOLINT
+
+  // Assuming T is defined in namespace foo, in the next statement,
+  // the compiler will consider all of:
+  //
+  //   1. foo::operator<< (thanks to Koenig look-up),
+  //   2. ::operator<< (as the current namespace is enclosed in ::),
+  //   3. testing::internal2::operator<< (thanks to the using statement above).
+  //
+  // The operator<< whose type matches T best will be picked.
+  //
+  // We deliberately allow #2 to be a candidate, as sometimes it's
+  // impossible to define #1 (e.g. when foo is ::std, defining
+  // anything in it is undefined behavior unless you are a compiler
+  // vendor.).
+  *os << value;
+}
+
+}  // namespace testing_internal
+
+namespace testing {
+namespace internal {
+
+// FormatForComparison<ToPrint, OtherOperand>::Format(value) formats a
+// value of type ToPrint that is an operand of a comparison assertion
+// (e.g. ASSERT_EQ).  OtherOperand is the type of the other operand in
+// the comparison, and is used to help determine the best way to
+// format the value.  In particular, when the value is a C string
+// (char pointer) and the other operand is an STL string object, we
+// want to format the C string as a string, since we know it is
+// compared by value with the string object.  If the value is a char
+// pointer but the other operand is not an STL string object, we don't
+// know whether the pointer is supposed to point to a NUL-terminated
+// string, and thus want to print it as a pointer to be safe.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+
+// The default case.
+template <typename ToPrint, typename OtherOperand>
+class FormatForComparison {
+ public:
+  static ::std::string Format(const ToPrint& value) {
+    return ::testing::PrintToString(value);
+  }
+};
+
+// Array.
+template <typename ToPrint, size_t N, typename OtherOperand>
+class FormatForComparison<ToPrint[N], OtherOperand> {
+ public:
+  static ::std::string Format(const ToPrint* value) {
+    return FormatForComparison<const ToPrint*, OtherOperand>::Format(value);
+  }
+};
+
+// By default, print C string as pointers to be safe, as we don't know
+// whether they actually point to a NUL-terminated string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(CharType)                \
+  template <typename OtherOperand>                                      \
+  class FormatForComparison<CharType*, OtherOperand> {                  \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(static_cast<const void*>(value)); \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const char);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(wchar_t);
+GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_(const wchar_t);
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_POINTER_
+
+// If a C string is compared with an STL string object, we know it's meant
+// to point to a NUL-terminated string, and thus can print it as a string.
+
+#define GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(CharType, OtherStringType) \
+  template <>                                                           \
+  class FormatForComparison<CharType*, OtherStringType> {               \
+   public:                                                              \
+    static ::std::string Format(CharType* value) {                      \
+      return ::testing::PrintToString(value);                           \
+    }                                                                   \
+  }
+
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::std::string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::std::string);
+
+#if GTEST_HAS_GLOBAL_STRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(char, ::string);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const char, ::string);
+#endif
+
+#if GTEST_HAS_GLOBAL_WSTRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::wstring);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::wstring);
+#endif
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(wchar_t, ::std::wstring);
+GTEST_IMPL_FORMAT_C_STRING_AS_STRING_(const wchar_t, ::std::wstring);
+#endif
+
+#undef GTEST_IMPL_FORMAT_C_STRING_AS_STRING_
+
+// Formats a comparison assertion (e.g. ASSERT_EQ, EXPECT_LT, and etc)
+// operand to be used in a failure message.  The type (but not value)
+// of the other operand may affect the format.  This allows us to
+// print a char* as a raw pointer when it is compared against another
+// char* or void*, and print it as a C string when it is compared
+// against an std::string object, for example.
+//
+// INTERNAL IMPLEMENTATION - DO NOT USE IN A USER PROGRAM.
+template <typename T1, typename T2>
+std::string FormatForComparisonFailureMessage(
+    const T1& value, const T2& /* other_operand */) {
+  return FormatForComparison<T1, T2>::Format(value);
+}
+
+// UniversalPrinter<T>::Print(value, ostream_ptr) prints the given
+// value to the given ostream.  The caller must ensure that
+// 'ostream_ptr' is not NULL, or the behavior is undefined.
+//
+// We define UniversalPrinter as a class template (as opposed to a
+// function template), as we need to partially specialize it for
+// reference types, which cannot be done with function templates.
+template <typename T>
+class UniversalPrinter;
+
+template <typename T>
+void UniversalPrint(const T& value, ::std::ostream* os);
+
+// Used to print an STL-style container when the user doesn't define
+// a PrintTo() for it.
+template <typename C>
+void DefaultPrintTo(IsContainer /* dummy */,
+                    false_type /* is not a pointer */,
+                    const C& container, ::std::ostream* os) {
+  const size_t kMaxCount = 32;  // The maximum number of elements to print.
+  *os << '{';
+  size_t count = 0;
+  for (typename C::const_iterator it = container.begin();
+       it != container.end(); ++it, ++count) {
+    if (count > 0) {
+      *os << ',';
+      if (count == kMaxCount) {  // Enough has been printed.
+        *os << " ...";
+        break;
+      }
+    }
+    *os << ' ';
+    // We cannot call PrintTo(*it, os) here as PrintTo() doesn't
+    // handle *it being a native array.
+    internal::UniversalPrint(*it, os);
+  }
+
+  if (count > 0) {
+    *os << ' ';
+  }
+  *os << '}';
+}
+
+// Used to print a pointer that is neither a char pointer nor a member
+// pointer, when the user doesn't define PrintTo() for it.  (A member
+// variable pointer or member function pointer doesn't really point to
+// a location in the address space.  Their representation is
+// implementation-defined.  Therefore they will be printed as raw
+// bytes.)
+template <typename T>
+void DefaultPrintTo(IsNotContainer /* dummy */,
+                    true_type /* is a pointer */,
+                    T* p, ::std::ostream* os) {
+  if (p == NULL) {
+    *os << "NULL";
+  } else {
+    // C++ doesn't allow casting from a function pointer to any object
+    // pointer.
+    //
+    // IsTrue() silences warnings: "Condition is always true",
+    // "unreachable code".
+    if (IsTrue(ImplicitlyConvertible<T*, const void*>::value)) {
+      // T is not a function type.  We just call << to print p,
+      // relying on ADL to pick up user-defined << for their pointer
+      // types, if any.
+      *os << p;
+    } else {
+      // T is a function type, so '*os << p' doesn't do what we want
+      // (it just prints p as bool).  We want to print p as a const
+      // void*.  However, we cannot cast it to const void* directly,
+      // even using reinterpret_cast, as earlier versions of gcc
+      // (e.g. 3.4.5) cannot compile the cast when p is a function
+      // pointer.  Casting to UInt64 first solves the problem.
+      *os << reinterpret_cast<const void*>(
+          reinterpret_cast<internal::UInt64>(p));
+    }
+  }
+}
+
+// Used to print a non-container, non-pointer value when the user
+// doesn't define PrintTo() for it.
+template <typename T>
+void DefaultPrintTo(IsNotContainer /* dummy */,
+                    false_type /* is not a pointer */,
+                    const T& value, ::std::ostream* os) {
+  ::testing_internal::DefaultPrintNonContainerTo(value, os);
+}
+
+// Prints the given value using the << operator if it has one;
+// otherwise prints the bytes in it.  This is what
+// UniversalPrinter<T>::Print() does when PrintTo() is not specialized
+// or overloaded for type T.
+//
+// A user can override this behavior for a class type Foo by defining
+// an overload of PrintTo() in the namespace where Foo is defined.  We
+// give the user this option as sometimes defining a << operator for
+// Foo is not desirable (e.g. the coding style may prevent doing it,
+// or there is already a << operator but it doesn't do what the user
+// wants).
+template <typename T>
+void PrintTo(const T& value, ::std::ostream* os) {
+  // DefaultPrintTo() is overloaded.  The type of its first two
+  // arguments determine which version will be picked.  If T is an
+  // STL-style container, the version for container will be called; if
+  // T is a pointer, the pointer version will be called; otherwise the
+  // generic version will be called.
+  //
+  // Note that we check for container types here, prior to we check
+  // for protocol message types in our operator<<.  The rationale is:
+  //
+  // For protocol messages, we want to give people a chance to
+  // override Google Mock's format by defining a PrintTo() or
+  // operator<<.  For STL containers, other formats can be
+  // incompatible with Google Mock's format for the container
+  // elements; therefore we check for container types here to ensure
+  // that our format is used.
+  //
+  // The second argument of DefaultPrintTo() is needed to bypass a bug
+  // in Symbian's C++ compiler that prevents it from picking the right
+  // overload between:
+  //
+  //   PrintTo(const T& x, ...);
+  //   PrintTo(T* x, ...);
+  DefaultPrintTo(IsContainerTest<T>(0), is_pointer<T>(), value, os);
+}
+
+// The following list of PrintTo() overloads tells
+// UniversalPrinter<T>::Print() how to print standard types (built-in
+// types, strings, plain arrays, and pointers).
+
+// Overloads for various char types.
+GTEST_API_ void PrintTo(unsigned char c, ::std::ostream* os);
+GTEST_API_ void PrintTo(signed char c, ::std::ostream* os);
+inline void PrintTo(char c, ::std::ostream* os) {
+  // When printing a plain char, we always treat it as unsigned.  This
+  // way, the output won't be affected by whether the compiler thinks
+  // char is signed or not.
+  PrintTo(static_cast<unsigned char>(c), os);
+}
+
+// Overloads for other simple built-in types.
+inline void PrintTo(bool x, ::std::ostream* os) {
+  *os << (x ? "true" : "false");
+}
+
+// Overload for wchar_t type.
+// Prints a wchar_t as a symbol if it is printable or as its internal
+// code otherwise and also as its decimal code (except for L'\0').
+// The L'\0' char is printed as "L'\\0'". The decimal code is printed
+// as signed integer when wchar_t is implemented by the compiler
+// as a signed type and is printed as an unsigned integer when wchar_t
+// is implemented as an unsigned type.
+GTEST_API_ void PrintTo(wchar_t wc, ::std::ostream* os);
+
+// Overloads for C strings.
+GTEST_API_ void PrintTo(const char* s, ::std::ostream* os);
+inline void PrintTo(char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const char*>(s), os);
+}
+
+// signed/unsigned char is often used for representing binary data, so
+// we print pointers to it as void* to be safe.
+inline void PrintTo(const signed char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(signed char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(const unsigned char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+inline void PrintTo(unsigned char* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const void*>(s), os);
+}
+
+// MSVC can be configured to define wchar_t as a typedef of unsigned
+// short.  It defines _NATIVE_WCHAR_T_DEFINED when wchar_t is a native
+// type.  When wchar_t is a typedef, defining an overload for const
+// wchar_t* would cause unsigned short* be printed as a wide string,
+// possibly causing invalid memory accesses.
+#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED)
+// Overloads for wide C strings
+GTEST_API_ void PrintTo(const wchar_t* s, ::std::ostream* os);
+inline void PrintTo(wchar_t* s, ::std::ostream* os) {
+  PrintTo(ImplicitCast_<const wchar_t*>(s), os);
+}
+#endif
+
+// Overload for C arrays.  Multi-dimensional arrays are printed
+// properly.
+
+// Prints the given number of elements in an array, without printing
+// the curly braces.
+template <typename T>
+void PrintRawArrayTo(const T a[], size_t count, ::std::ostream* os) {
+  UniversalPrint(a[0], os);
+  for (size_t i = 1; i != count; i++) {
+    *os << ", ";
+    UniversalPrint(a[i], os);
+  }
+}
+
+// Overloads for ::string and ::std::string.
+#if GTEST_HAS_GLOBAL_STRING
+GTEST_API_ void PrintStringTo(const ::string&s, ::std::ostream* os);
+inline void PrintTo(const ::string& s, ::std::ostream* os) {
+  PrintStringTo(s, os);
+}
+#endif  // GTEST_HAS_GLOBAL_STRING
+
+GTEST_API_ void PrintStringTo(const ::std::string&s, ::std::ostream* os);
+inline void PrintTo(const ::std::string& s, ::std::ostream* os) {
+  PrintStringTo(s, os);
+}
+
+// Overloads for ::wstring and ::std::wstring.
+#if GTEST_HAS_GLOBAL_WSTRING
+GTEST_API_ void PrintWideStringTo(const ::wstring&s, ::std::ostream* os);
+inline void PrintTo(const ::wstring& s, ::std::ostream* os) {
+  PrintWideStringTo(s, os);
+}
+#endif  // GTEST_HAS_GLOBAL_WSTRING
+
+#if GTEST_HAS_STD_WSTRING
+GTEST_API_ void PrintWideStringTo(const ::std::wstring&s, ::std::ostream* os);
+inline void PrintTo(const ::std::wstring& s, ::std::ostream* os) {
+  PrintWideStringTo(s, os);
+}
+#endif  // GTEST_HAS_STD_WSTRING
+
+#if GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
+// Helper function for printing a tuple.  T must be instantiated with
+// a tuple type.
+template <typename T>
+void PrintTupleTo(const T& t, ::std::ostream* os);
+#endif  // GTEST_HAS_TR1_TUPLE || GTEST_HAS_STD_TUPLE_
+
+#if GTEST_HAS_TR1_TUPLE
+// Overload for ::std::tr1::tuple.  Needed for printing function arguments,
+// which are packed as tuples.
+
+// Overloaded PrintTo() for tuples of various arities.  We support
+// tuples of up-to 10 fields.  The following implementation works
+// regardless of whether tr1::tuple is implemented using the
+// non-standard variadic template feature or not.
+
+inline void PrintTo(const ::std::tr1::tuple<>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1>
+void PrintTo(const ::std::tr1::tuple<T1>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2>
+void PrintTo(const ::std::tr1::tuple<T1, T2>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7, typename T8>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7, typename T8, typename T9>
+void PrintTo(const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9>& t,
+             ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+
+template <typename T1, typename T2, typename T3, typename T4, typename T5,
+          typename T6, typename T7, typename T8, typename T9, typename T10>
+void PrintTo(
+    const ::std::tr1::tuple<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>& t,
+    ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+#endif  // GTEST_HAS_TR1_TUPLE
+
+#if GTEST_HAS_STD_TUPLE_
+template <typename... Types>
+void PrintTo(const ::std::tuple<Types...>& t, ::std::ostream* os) {
+  PrintTupleTo(t, os);
+}
+#endif  // GTEST_HAS_STD_TUPLE_
+
+// Overload for std::pair.
+template <typename T1, typename T2>
+void PrintTo(const ::std::pair<T1, T2>& value, ::std::ostream* os) {
+  *os << '(';
+  // We cannot use UniversalPrint(value.first, os) here, as T1 may be
+  // a reference type.  The same for printing value.second.
+  UniversalPrinter<T1>::Print(value.first, os);
+  *os << ", ";
+  UniversalPrinter<T2>::Print(value.second, os);
+  *os << ')';
+}
+
+// Implements printing a non-reference type T by letting the compiler
+// pick the right overload of PrintTo() for T.
+template <typename T>
+class UniversalPrinter {
+ public:
+  // MSVC warns about adding const to a function type, so we want to
+  // disable the warning.
+  GTEST_DISABLE_MSC_WARNINGS_PUSH_(4180)
+
+  // Note: we deliberately don't call this PrintTo(), as that name
+  // conflicts with ::testing::internal::PrintTo in the body of the
+  // function.
+  static void Print(const T& value, ::std::ostream* os) {
+    // By default, ::testing::internal::PrintTo() is used for printing
+    // the value.
+    //
+    // Thanks to Koenig look-up, if T is a class and has its own
+    // PrintTo() function defined in its namespace, that function will
+    // be visible here.  Since it is more specific than the generic ones
+    // in ::testing::internal, it will be picked by the compiler in the
+    // following statement - exactly what we want.
+    PrintTo(value, os);
+  }
+
+  GTEST_DISABLE_MSC_WARNINGS_POP_()
+};
+
+// UniversalPrintArray(begin, len, os) prints an array of 'len'
+// elements, starting at address 'begin'.
+template <typename T>
+void UniversalPrintArray(const T* begin, size_t len, ::std::ostream* os) {
+  if (len == 0) {
+    *os << "{}";
+  } else {
+    *os << "{ ";
+    const size_t kThreshold = 18;
+    const size_t kChunkSize = 8;
+    // If the array has more than kThreshold elements, we'll have to
+    // omit some details by printing only the first and the last
+    // kChunkSize elements.
+    // TODO(wan at google.com): let the user control the threshold using a flag.
+    if (len <= kThreshold) {
+      PrintRawArrayTo(begin, len, os);
+    } else {
+      PrintRawArrayTo(begin, kChunkSize, os);
+      *os << ", ..., ";
+      PrintRawArrayTo(begin + len - kChunkSize, kChunkSize, os);
+    }
+    *os << " }";
+  }
+}
+// This overload prints a (const) char array compactly.
+GTEST_API_ void UniversalPrintArray(
+    const char* begin, size_t len, ::std::ostream* os);
+
+// This overload prints a (const) wchar_t array compactly.
+GTEST_API_ void UniversalPrintArray(
+    const wchar_t* begin, size_t len, ::std::ostream* os);
+
+// Implements printing an array type T[N].
+template <typename T, size_t N>
+class UniversalPrinter<T[N]> {
+ public:

@@ Diff output truncated at 1234567 characters. @@


More information about the tex-live-commits mailing list