dvisvgm: enable support for PostScript specials

git-svn-id: svn://tug.org/texlive/trunk@16063 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 371 insertions, 139 deletions

diff --git a/Build/source/texk/dvisvgm/ChangeLog b/Build/source/texk/dvisvgm/ChangeLog
index 92577b2f235..345a41a9508 100644
--- a/Build/source/texk/dvisvgm/ChangeLog
+++ b/Build/source/texk/dvisvgm/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am, configure.ac: Allow to link with libgs, load
+	libgs.so at runtime, or disable PostScript support.
+
 2009-11-13  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* Imported release 0.8.7.
diff --git a/Build/source/texk/dvisvgm/Makefile.am b/Build/source/texk/dvisvgm/Makefile.am
index 562acab3a6a..96d153afd71 100644
--- a/Build/source/texk/dvisvgm/Makefile.am
+++ b/Build/source/texk/dvisvgm/Makefile.am
@@ -29,7 +29,8 @@ dist-hook:
 
 INCLUDES = -I$(top_srcdir)/$(DVISVGM_TREE)/src
 INCLUDES += -I$(top_srcdir)/$(DVISVGM_TREE)/potracelib
-INCLUDES += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES)
+INCLUDES += $(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES)
+INCLUDES += $(ZLIB_INCLUDES) $(LIBGS_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 
@@ -52,7 +53,8 @@ config.force: $(dvisvgm_dependencies)
 
 DISTCLEANFILES = config.force
 
-LDADD = $(noinst_LIBRARIES) $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+LDADD = $(noinst_LIBRARIES) $(KPATHSEA_LIBS) $(FREETYPE2_LIBS)
+LDADD += $(ZLIB_LIBS) $(LIBGS_LIBS)
 
 noinst_LIBRARIES = libdvisvgm.a libpotrace.a
 
@@ -67,7 +69,6 @@ nodist_libdvisvgm_a_SOURCES = \
 	$(DVISVGM_TREE)/src/ColorSpecialHandler.cpp \
 	$(DVISVGM_TREE)/src/CommandLine.cpp \
 	$(DVISVGM_TREE)/src/Directory.cpp \
-	$(DVISVGM_TREE)/src/DLLoader.cpp \
 	$(DVISVGM_TREE)/src/DVIActions.cpp \
 	$(DVISVGM_TREE)/src/DVIReader.cpp \
 	$(DVISVGM_TREE)/src/DvisvgmSpecialHandler.cpp \
@@ -108,6 +109,11 @@ nodist_libdvisvgm_a_SOURCES = \
 	$(DVISVGM_TREE)/src/XMLNode.cpp \
 	$(DVISVGM_TREE)/src/XMLString.cpp
 
+if dlloader
+nodist_libdvisvgm_a_SOURCES += \
+	$(DVISVGM_TREE)/src/DLLoader.cpp
+endif dlloader
+
 $(libdvisvgm_a_OBJECTS): libpotrace.a
 
 nodist_libpotrace_a_SOURCES = \
diff --git a/Build/source/texk/dvisvgm/Makefile.in b/Build/source/texk/dvisvgm/Makefile.in
index c14d964849f..fa7d272c629 100644
--- a/Build/source/texk/dvisvgm/Makefile.in
+++ b/Build/source/texk/dvisvgm/Makefile.in
@@ -36,6 +36,9 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 bin_PROGRAMS = dvisvgm$(EXEEXT)
+@dlloader_TRUE@am__append_1 = \
+@dlloader_TRUE@	$(DVISVGM_TREE)/src/DLLoader.cpp
+
 subdir = .
 DIST_COMMON = README $(am__configure_deps) \
 	$(srcdir)/../../build-aux/config.guess \
@@ -76,19 +79,20 @@ LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 libdvisvgm_a_AR = $(AR) $(ARFLAGS)
 libdvisvgm_a_LIBADD =
+@dlloader_TRUE@am__objects_1 = DLLoader.$(OBJEXT)
 nodist_libdvisvgm_a_OBJECTS = BgColorSpecialHandler.$(OBJEXT) \
 	Bitmap.$(OBJEXT) BoundingBox.$(OBJEXT) Calculator.$(OBJEXT) \
 	CharmapTranslator.$(OBJEXT) CmdLineParserBase.$(OBJEXT) \
 	Color.$(OBJEXT) ColorSpecialHandler.$(OBJEXT) \
-	CommandLine.$(OBJEXT) Directory.$(OBJEXT) DLLoader.$(OBJEXT) \
-	DVIActions.$(OBJEXT) DVIReader.$(OBJEXT) \
-	DvisvgmSpecialHandler.$(OBJEXT) DVIToSVG.$(OBJEXT) \
-	DVIToSVGActions.$(OBJEXT) EmSpecialHandler.$(OBJEXT) \
-	FileFinder.$(OBJEXT) FileSystem.$(OBJEXT) Font.$(OBJEXT) \
-	FontCache.$(OBJEXT) FontEncoding.$(OBJEXT) \
-	FontEngine.$(OBJEXT) FontGlyph.$(OBJEXT) FontManager.$(OBJEXT) \
-	FontMap.$(OBJEXT) GFReader.$(OBJEXT) GFGlyphTracer.$(OBJEXT) \
-	GFTracer.$(OBJEXT) Ghostscript.$(OBJEXT) InputBuffer.$(OBJEXT) \
+	CommandLine.$(OBJEXT) Directory.$(OBJEXT) DVIActions.$(OBJEXT) \
+	DVIReader.$(OBJEXT) DvisvgmSpecialHandler.$(OBJEXT) \
+	DVIToSVG.$(OBJEXT) DVIToSVGActions.$(OBJEXT) \
+	EmSpecialHandler.$(OBJEXT) FileFinder.$(OBJEXT) \
+	FileSystem.$(OBJEXT) Font.$(OBJEXT) FontCache.$(OBJEXT) \
+	FontEncoding.$(OBJEXT) FontEngine.$(OBJEXT) \
+	FontGlyph.$(OBJEXT) FontManager.$(OBJEXT) FontMap.$(OBJEXT) \
+	GFReader.$(OBJEXT) GFGlyphTracer.$(OBJEXT) GFTracer.$(OBJEXT) \
+	Ghostscript.$(OBJEXT) InputBuffer.$(OBJEXT) \
 	InputReader.$(OBJEXT) Length.$(OBJEXT) Matrix.$(OBJEXT) \
 	Message.$(OBJEXT) MetafontWrapper.$(OBJEXT) PageSize.$(OBJEXT) \
 	PSInterpreter.$(OBJEXT) PsSpecialHandler.$(OBJEXT) \
@@ -96,7 +100,7 @@ nodist_libdvisvgm_a_OBJECTS = BgColorSpecialHandler.$(OBJEXT) \
 	SVGFontEmitter.$(OBJEXT) SVGFontTraceEmitter.$(OBJEXT) \
 	SVGTree.$(OBJEXT) TFM.$(OBJEXT) TpicSpecialHandler.$(OBJEXT) \
 	VFReader.$(OBJEXT) XMLDocument.$(OBJEXT) XMLNode.$(OBJEXT) \
-	XMLString.$(OBJEXT)
+	XMLString.$(OBJEXT) $(am__objects_1)
 libdvisvgm_a_OBJECTS = $(nodist_libdvisvgm_a_OBJECTS)
 libpotrace_a_AR = $(AR) $(ARFLAGS)
 libpotrace_a_LIBADD =
@@ -110,7 +114,8 @@ dvisvgm_OBJECTS = $(nodist_dvisvgm_OBJECTS)
 dvisvgm_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 dvisvgm_DEPENDENCIES = $(noinst_LIBRARIES) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/../../build-aux/depcomp
 am__depfiles_maybe = depfiles
@@ -218,6 +223,8 @@ KPATHSEA_INCLUDES = @KPATHSEA_INCLUDES@
 KPATHSEA_LIBS = @KPATHSEA_LIBS@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
+LIBGS_INCLUDES = @LIBGS_INCLUDES@
+LIBGS_LIBS = @LIBGS_LIBS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LIBTOOL = @LIBTOOL@
@@ -316,7 +323,8 @@ ACLOCAL_AMFLAGS = -I ../../m4
 EXTRA_DIST = $(DVISVGM_TREE) $(DVISVGM_TREE)-PATCHES
 INCLUDES = -I$(top_srcdir)/$(DVISVGM_TREE)/src \
 	-I$(top_srcdir)/$(DVISVGM_TREE)/potracelib \
-	$(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES)
+	$(KPATHSEA_INCLUDES) $(FREETYPE2_INCLUDES) $(ZLIB_INCLUDES) \
+	$(LIBGS_INCLUDES)
 AM_CFLAGS = $(WARNING_CFLAGS)
 AM_CXXFLAGS = $(WARNING_CXXFLAGS)
 nodist_man_MANS = \
@@ -328,9 +336,10 @@ nodist_dvisvgm_SOURCES = \
 
 dvisvgm_dependencies = $(KPATHSEA_DEPEND) $(ZLIB_DEPEND) $(FREETYPE2_DEPEND)
 DISTCLEANFILES = config.force
-LDADD = $(noinst_LIBRARIES) $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) $(ZLIB_LIBS)
+LDADD = $(noinst_LIBRARIES) $(KPATHSEA_LIBS) $(FREETYPE2_LIBS) \
+	$(ZLIB_LIBS) $(LIBGS_LIBS)
 noinst_LIBRARIES = libdvisvgm.a libpotrace.a
-nodist_libdvisvgm_a_SOURCES = \
+nodist_libdvisvgm_a_SOURCES =  \
 	$(DVISVGM_TREE)/src/BgColorSpecialHandler.cpp \
 	$(DVISVGM_TREE)/src/Bitmap.cpp \
 	$(DVISVGM_TREE)/src/BoundingBox.cpp \
@@ -341,7 +350,6 @@ nodist_libdvisvgm_a_SOURCES = \
 	$(DVISVGM_TREE)/src/ColorSpecialHandler.cpp \
 	$(DVISVGM_TREE)/src/CommandLine.cpp \
 	$(DVISVGM_TREE)/src/Directory.cpp \
-	$(DVISVGM_TREE)/src/DLLoader.cpp \
 	$(DVISVGM_TREE)/src/DVIActions.cpp \
 	$(DVISVGM_TREE)/src/DVIReader.cpp \
 	$(DVISVGM_TREE)/src/DvisvgmSpecialHandler.cpp \
@@ -350,8 +358,7 @@ nodist_libdvisvgm_a_SOURCES = \
 	$(DVISVGM_TREE)/src/EmSpecialHandler.cpp \
 	$(DVISVGM_TREE)/src/FileFinder.cpp \
 	$(DVISVGM_TREE)/src/FileSystem.cpp \
-	$(DVISVGM_TREE)/src/Font.cpp \
-	$(DVISVGM_TREE)/src/FontCache.cpp \
+	$(DVISVGM_TREE)/src/Font.cpp $(DVISVGM_TREE)/src/FontCache.cpp \
 	$(DVISVGM_TREE)/src/FontEncoding.cpp \
 	$(DVISVGM_TREE)/src/FontEngine.cpp \
 	$(DVISVGM_TREE)/src/FontGlyph.cpp \
@@ -363,8 +370,7 @@ nodist_libdvisvgm_a_SOURCES = \
 	$(DVISVGM_TREE)/src/Ghostscript.cpp \
 	$(DVISVGM_TREE)/src/InputBuffer.cpp \
 	$(DVISVGM_TREE)/src/InputReader.cpp \
-	$(DVISVGM_TREE)/src/Length.cpp \
-	$(DVISVGM_TREE)/src/Matrix.cpp \
+	$(DVISVGM_TREE)/src/Length.cpp $(DVISVGM_TREE)/src/Matrix.cpp \
 	$(DVISVGM_TREE)/src/Message.cpp \
 	$(DVISVGM_TREE)/src/MetafontWrapper.cpp \
 	$(DVISVGM_TREE)/src/PageSize.cpp \
@@ -374,14 +380,12 @@ nodist_libdvisvgm_a_SOURCES = \
 	$(DVISVGM_TREE)/src/StreamReader.cpp \
 	$(DVISVGM_TREE)/src/SVGFontEmitter.cpp \
 	$(DVISVGM_TREE)/src/SVGFontTraceEmitter.cpp \
-	$(DVISVGM_TREE)/src/SVGTree.cpp \
-	$(DVISVGM_TREE)/src/TFM.cpp \
+	$(DVISVGM_TREE)/src/SVGTree.cpp $(DVISVGM_TREE)/src/TFM.cpp \
 	$(DVISVGM_TREE)/src/TpicSpecialHandler.cpp \
 	$(DVISVGM_TREE)/src/VFReader.cpp \
 	$(DVISVGM_TREE)/src/XMLDocument.cpp \
 	$(DVISVGM_TREE)/src/XMLNode.cpp \
-	$(DVISVGM_TREE)/src/XMLString.cpp
-
+	$(DVISVGM_TREE)/src/XMLString.cpp $(am__append_1)
 nodist_libpotrace_a_SOURCES = \
 	$(DVISVGM_TREE)/potracelib/curve.c \
 	$(DVISVGM_TREE)/potracelib/decompose.c \
@@ -805,20 +809,6 @@ Directory.obj: $(DVISVGM_TREE)/src/Directory.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Directory.obj `if test -f '$(DVISVGM_TREE)/src/Directory.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/Directory.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/Directory.cpp'; fi`
 
-DLLoader.o: $(DVISVGM_TREE)/src/DLLoader.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DLLoader.o -MD -MP -MF $(DEPDIR)/DLLoader.Tpo -c -o DLLoader.o `test -f '$(DVISVGM_TREE)/src/DLLoader.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/DLLoader.cpp
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/DLLoader.Tpo $(DEPDIR)/DLLoader.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(DVISVGM_TREE)/src/DLLoader.cpp' object='DLLoader.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DLLoader.o `test -f '$(DVISVGM_TREE)/src/DLLoader.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/DLLoader.cpp
-
-DLLoader.obj: $(DVISVGM_TREE)/src/DLLoader.cpp
-@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DLLoader.obj -MD -MP -MF $(DEPDIR)/DLLoader.Tpo -c -o DLLoader.obj `if test -f '$(DVISVGM_TREE)/src/DLLoader.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/DLLoader.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/DLLoader.cpp'; fi`
-@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/DLLoader.Tpo $(DEPDIR)/DLLoader.Po
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(DVISVGM_TREE)/src/DLLoader.cpp' object='DLLoader.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DLLoader.obj `if test -f '$(DVISVGM_TREE)/src/DLLoader.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/DLLoader.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/DLLoader.cpp'; fi`
-
 DVIActions.o: $(DVISVGM_TREE)/src/DVIActions.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DVIActions.o -MD -MP -MF $(DEPDIR)/DVIActions.Tpo -c -o DVIActions.o `test -f '$(DVISVGM_TREE)/src/DVIActions.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/DVIActions.cpp
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/DVIActions.Tpo $(DEPDIR)/DVIActions.Po
@@ -1365,6 +1355,20 @@ XMLString.obj: $(DVISVGM_TREE)/src/XMLString.cpp
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o XMLString.obj `if test -f '$(DVISVGM_TREE)/src/XMLString.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/XMLString.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/XMLString.cpp'; fi`
 
+DLLoader.o: $(DVISVGM_TREE)/src/DLLoader.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DLLoader.o -MD -MP -MF $(DEPDIR)/DLLoader.Tpo -c -o DLLoader.o `test -f '$(DVISVGM_TREE)/src/DLLoader.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/DLLoader.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/DLLoader.Tpo $(DEPDIR)/DLLoader.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(DVISVGM_TREE)/src/DLLoader.cpp' object='DLLoader.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DLLoader.o `test -f '$(DVISVGM_TREE)/src/DLLoader.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/DLLoader.cpp
+
+DLLoader.obj: $(DVISVGM_TREE)/src/DLLoader.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT DLLoader.obj -MD -MP -MF $(DEPDIR)/DLLoader.Tpo -c -o DLLoader.obj `if test -f '$(DVISVGM_TREE)/src/DLLoader.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/DLLoader.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/DLLoader.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/DLLoader.Tpo $(DEPDIR)/DLLoader.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$(DVISVGM_TREE)/src/DLLoader.cpp' object='DLLoader.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o DLLoader.obj `if test -f '$(DVISVGM_TREE)/src/DLLoader.cpp'; then $(CYGPATH_W) '$(DVISVGM_TREE)/src/DLLoader.cpp'; else $(CYGPATH_W) '$(srcdir)/$(DVISVGM_TREE)/src/DLLoader.cpp'; fi`
+
 dvisvgm.o: $(DVISVGM_TREE)/src/dvisvgm.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT dvisvgm.o -MD -MP -MF $(DEPDIR)/dvisvgm.Tpo -c -o dvisvgm.o `test -f '$(DVISVGM_TREE)/src/dvisvgm.cpp' || echo '$(srcdir)/'`$(DVISVGM_TREE)/src/dvisvgm.cpp
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/dvisvgm.Tpo $(DEPDIR)/dvisvgm.Po
diff --git a/Build/source/texk/dvisvgm/ac/dvisvgm.ac b/Build/source/texk/dvisvgm/ac/dvisvgm.ac
index bd617772022..3a8f958b649 100644
--- a/Build/source/texk/dvisvgm/ac/dvisvgm.ac
+++ b/Build/source/texk/dvisvgm/ac/dvisvgm.ac
@@ -7,4 +7,10 @@ dnl
 AC_ARG_WITH([system-libgs],
             AS_HELP_STRING([--with-system-libgs],
                            [build dvisvgm with installed gs headers and library
-                            @<:@default: no, may require CPPFLAGS and LDFLAGS@:>@]))
+                            @<:@default: no@:>@]))
+AC_ARG_WITH([libgs-includes],
+            AS_HELP_STRING([--with-libgs-includes=DIR],
+                           [libgs headers installed in DIR]))
+AC_ARG_WITH([libgs-libdir],
+            AS_HELP_STRING([--with-libgs-libdir=DIR],
+                           [libgs library installed in DIR]))
diff --git a/Build/source/texk/dvisvgm/config.h.in b/Build/source/texk/dvisvgm/config.h.in
index 09dbb64a9f5..fd209743bf1 100644
--- a/Build/source/texk/dvisvgm/config.h.in
+++ b/Build/source/texk/dvisvgm/config.h.in
@@ -3,7 +3,7 @@
 /* Define to 1 if the `closedir' function returns void instead of `int'. */
 #undef CLOSEDIR_VOID
 
-/* Set to 1 if PostScript support should be disabled */
+/* Set to 1 if PostScript support should be disabled. */
 #undef DISABLE_GS
 
 /* Define to 1 if you have the <assert.h> header file. */
@@ -49,6 +49,9 @@
 /* Define to 1 if you have the `freetype2' library (-lfreetype). */
 #undef HAVE_LIBFREETYPE
 
+/* Define to 1 if you have the `gs' library (-lgs), and to 0 otherwise. */
+#undef HAVE_LIBGS
+
 /* Define to 1 if you have the `kpathsea' library (-lkpathsea). */
 #undef HAVE_LIBKPATHSEA
 
@@ -167,7 +170,7 @@
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
-/* The machine triplet of the target system */
+/* The machine triplet of the target system. */
 #undef TARGET_SYSTEM
 
 /* Version number of package */
diff --git a/Build/source/texk/dvisvgm/configure b/Build/source/texk/dvisvgm/configure
index 34c6534104c..710d5d4e57e 100755
--- a/Build/source/texk/dvisvgm/configure
+++ b/Build/source/texk/dvisvgm/configure
@@ -745,6 +745,10 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
 DVISVGM_TREE
+dlloader_FALSE
+dlloader_TRUE
+LIBGS_LIBS
+LIBGS_INCLUDES
 FREETYPE2_RULE
 FREETYPE2_DEPEND
 FREETYPE2_LIBS
@@ -892,6 +896,8 @@ enable_libtool_lock
 enable_largefile
 enable_compiler_warnings
 with_system_libgs
+with_libgs_includes
+with_libgs_libdir
 enable_cxx_runtime_hack
 with_system_kpathsea
 with_kpathsea_includes
@@ -1555,7 +1561,10 @@ Optional Packages:
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
   --with-system-libgs     build dvisvgm with installed gs headers and library
-                          [default: no, may require CPPFLAGS and LDFLAGS]
+                          [default: no]
+  --with-libgs-includes=DIR
+                          libgs headers installed in DIR
+  --with-libgs-libdir=DIR libgs library installed in DIR
   --with-system-kpathsea  use installed kpathsea headers and library
   --with-kpathsea-includes=DIR
                           kpathsea headers installed in DIR
@@ -4716,13 +4725,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:4719: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:4728: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4722: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:4731: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:4725: output\"" >&5)
+  (eval echo "\"\$as_me:4734: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5928,7 +5937,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5931 "configure"' > conftest.$ac_ext
+  echo '#line 5940 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7560,11 +7569,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7563: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7572: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7567: \$? = $ac_status" >&5
+   echo "$as_me:7576: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -7899,11 +7908,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7902: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7911: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7906: \$? = $ac_status" >&5
+   echo "$as_me:7915: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8004,11 +8013,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8007: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8016: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8011: \$? = $ac_status" >&5
+   echo "$as_me:8020: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8059,11 +8068,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8062: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8071: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8066: \$? = $ac_status" >&5
+   echo "$as_me:8075: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10426,7 +10435,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10429 "configure"
+#line 10438 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10522,7 +10531,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10525 "configure"
+#line 10534 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11623,6 +11632,18 @@ if test "${with_system_libgs+set}" = set; then :
 fi
 
 
+# Check whether --with-libgs-includes was given.
+if test "${with_libgs_includes+set}" = set; then :
+  withval=$with_libgs_includes;
+fi
+
+
+# Check whether --with-libgs-libdir was given.
+if test "${with_libgs_libdir+set}" = set; then :
+  withval=$with_libgs_libdir;
+fi
+
+
 
 ac_config_headers="$ac_config_headers config.h"
 
@@ -14319,11 +14340,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14322: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14343: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14326: \$? = $ac_status" >&5
+   echo "$as_me:14347: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14418,11 +14439,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14421: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14442: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14425: \$? = $ac_status" >&5
+   echo "$as_me:14446: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14470,11 +14491,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14473: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14494: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14477: \$? = $ac_status" >&5
+   echo "$as_me:14498: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15650,11 +15671,6 @@ fi
 
 
 
-# For the moment we just disable the PostScript support.
-
-$as_echo "#define DISABLE_GS 1" >>confdefs.h
-
-
 
 cat >>confdefs.h <<_ACEOF
 #define TARGET_SYSTEM "$target"
@@ -17556,12 +17572,116 @@ ${top_builddir}/../../libs/freetype2/ft2build.h:
 fi
 
 
-if test "x$enable_build" != xno || test -f config.force; then
-
-# Checks for more libraries.
 kpse_save_CPPFLAGS=$CPPFLAGS
 kpse_save_LIBS=$LIBS
 
+
+if test "x$with_system_libgs" = xyes; then
+  HAVE_LIBGS=1
+  case $with_libgs_includes in #(
+  "" | yes | no) :
+    LIBGS_INCLUDES= ;; #(
+  *) :
+    LIBGS_INCLUDES="-I$with_libgs_includes" ;;
+esac
+  case $with_libgs_libdir in #(
+  "" | yes | no) :
+    LIBGS_LIBS=-lgs ;; #(
+  *) :
+    LIBGS_LIBS="-L$with_libgs_libdir -lgs" ;;
+esac
+  eval CPPFLAGS=\"$LIBGS_INCLUDES \$CPPFLAGS\"
+eval LIBS=\"$LIBGS_LIBS \$LIBS\"
+
+  ac_fn_c_check_header_mongrel "$LINENO" "ghostscript/iapi.h" "ac_cv_header_ghostscript_iapi_h" "$ac_includes_default"
+if test "x$ac_cv_header_ghostscript_iapi_h" = x""yes; then :
+
+fi
+
+
+  ac_fn_c_check_func "$LINENO" "gsapi_new_instance" "ac_cv_func_gsapi_new_instance"
+if test "x$ac_cv_func_gsapi_new_instance" = x""yes; then :
+
+fi
+
+  if test "x$ac_cv_header_ghostscript_iapi_h:$ac_cv_func_gsapi_new_instance" != xyes:yes; then
+    as_fn_error "cannot find/use libgs" "$LINENO" 5
+  fi
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Ghostscript version 8.31 or later" >&5
+$as_echo_n "checking for Ghostscript version 8.31 or later... " >&6; }
+if test "${kpse_cv_new_gsapi+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ghostscript/iapi.h>
+int
+main ()
+{
+gs_main_inst *inst;
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  kpse_cv_new_gsapi=no
+else
+  kpse_cv_new_gsapi=yes
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_new_gsapi" >&5
+$as_echo "$kpse_cv_new_gsapi" >&6; }
+  if test "x$kpse_cv_new_gsapi" != xyes; then
+    as_fn_error "dvisvgm requires Ghostscript version 8.31 or later" "$LINENO" 5
+  fi
+else
+  HAVE_LIBGS=0
+  LIBGS_INCLUDES=
+  LIBGS_LIBS=-ldl
+  eval CPPFLAGS=\"$LIBGS_INCLUDES \$CPPFLAGS\"
+eval LIBS=\"$LIBGS_LIBS \$LIBS\"
+
+  ac_fn_c_check_header_mongrel "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default"
+if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
+
+fi
+
+
+  ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
+if test "x$ac_cv_func_dlopen" = x""yes; then :
+
+fi
+
+  if test "x$ac_cv_header_dlfcn_h:$ac_cv_func_dlopen" != xyes:yes; then
+    CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
+
+
+$as_echo "#define DISABLE_GS 1" >>confdefs.h
+
+    LIBGS_LIBS=
+  fi
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBGS $HAVE_LIBGS
+_ACEOF
+
+ if test "x$HAVE_LIBGS" = x0 && test -n "$LIBGS_LIBS"; then
+  dlloader_TRUE=
+  dlloader_FALSE='#'
+else
+  dlloader_TRUE='#'
+  dlloader_FALSE=
+fi
+
+
+if test "x$enable_build" != xno || test -f config.force; then
+
+# Checks for more libraries.
 eval CPPFLAGS=\"$ZLIB_INCLUDES \$CPPFLAGS\"
 eval LIBS=\"$ZLIB_LIBS \$LIBS\"
 
@@ -17601,50 +17721,14 @@ else
 fi
 
 
-CPPFLAGS=$kpse_save_CPPFLAGS
-LIBS=$kpse_save_LIBS
-
-
 echo timestamp >config.force
 fi
 
-DVISVGM_TREE=dvisvgm-0.8.7
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-ac_link="./libtool --mode=link --tag=CXX $ac_link"
+CPPFLAGS=$kpse_save_CPPFLAGS
+LIBS=$kpse_save_LIBS
 
-CPPFLAGS="-I$srcdir/$DVISVGM_TREE/src $CPPFLAGS"
 
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include "iapi.h"
-int
-main ()
-{
-typedef struct gs_main_inst_s gs_main_inst; gs_main_inst *inst;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  gs_old_api=yes
-else
-  gs_old_api=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: gs_old_api=$gs_old_api" >&5
-$as_echo "gs_old_api=$gs_old_api" >&6; }
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-ac_link="./libtool --mode=link --tag=CC $ac_link"
+DVISVGM_TREE=dvisvgm-0.8.7
 
 
 ac_config_files="$ac_config_files Makefile"
@@ -17775,6 +17859,10 @@ 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
 fi
+if test -z "${dlloader_TRUE}" && test -z "${dlloader_FALSE}"; then
+  as_fn_error "conditional \"dlloader\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
diff --git a/Build/source/texk/dvisvgm/configure.ac b/Build/source/texk/dvisvgm/configure.ac
index ecca8d7da4c..10970810280 100644
--- a/Build/source/texk/dvisvgm/configure.ac
+++ b/Build/source/texk/dvisvgm/configure.ac
@@ -32,12 +32,8 @@ AC_PROG_CXX
 AC_PROG_CXXCPP
 KPSE_CXX_HACK
 
-# For the moment we just disable the PostScript support.
-AC_DEFINE([DISABLE_GS], 1,
-          [Set to 1 if PostScript support should be disabled])
-
 AC_DEFINE_UNQUOTED([TARGET_SYSTEM], ["$target"],
-                   [The machine triplet of the target system])
+                   [The machine triplet of the target system.])
 
 AC_SEARCH_LIBS([sqrt], [m])
 
@@ -45,6 +41,52 @@ KPSE_KPATHSEA_FLAGS
 KPSE_ZLIB_FLAGS
 KPSE_FREETYPE2_FLAGS
 
+KPSE_SAVE_FLAGS
+
+if test "x$with_system_libgs" = xyes; then
+  HAVE_LIBGS=1
+  AS_CASE([$with_libgs_includes],
+          ["" | yes | no], [LIBGS_INCLUDES=],
+            [LIBGS_INCLUDES="-I$with_libgs_includes"])
+  AS_CASE([$with_libgs_libdir],
+          ["" | yes | no], [LIBGS_LIBS=-lgs],
+            [LIBGS_LIBS="-L$with_libgs_libdir -lgs"])
+  KPSE_ADD_FLAGS([libgs])
+  AC_CHECK_HEADER([ghostscript/iapi.h])
+  AC_CHECK_FUNC([gsapi_new_instance])
+  if test "x$ac_cv_header_ghostscript_iapi_h:$ac_cv_func_gsapi_new_instance" != xyes:yes; then
+    AC_MSG_ERROR([cannot find/use libgs])
+  fi
+  AC_CACHE_CHECK([for Ghostscript version 8.31 or later],
+                 [kpse_cv_new_gsapi],
+                 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <ghostscript/iapi.h>]],
+                                                     [[gs_main_inst *inst;]])],
+                                    [kpse_cv_new_gsapi=no],
+                                    [kpse_cv_new_gsapi=yes])])
+  if test "x$kpse_cv_new_gsapi" != xyes; then
+    AC_MSG_ERROR([dvisvgm requires Ghostscript version 8.31 or later])
+  fi
+else
+  HAVE_LIBGS=0
+  LIBGS_INCLUDES=
+  LIBGS_LIBS=-ldl
+  KPSE_ADD_FLAGS([libgs])
+  AC_CHECK_HEADER([dlfcn.h])
+  AC_CHECK_FUNC([dlopen])
+  if test "x$ac_cv_header_dlfcn_h:$ac_cv_func_dlopen" != xyes:yes; then
+    KPSE_RESTORE_FLAGS
+    AC_DEFINE([DISABLE_GS], 1,
+              [Set to 1 if PostScript support should be disabled.])
+    LIBGS_LIBS=
+  fi
+fi
+AC_SUBST([LIBGS_INCLUDES])
+AC_SUBST([LIBGS_LIBS])
+AC_DEFINE_UNQUOTED([HAVE_LIBGS], [$HAVE_LIBGS],
+                   [Define to 1 if you have the `gs' library (-lgs),
+                    and to 0 otherwise.])
+AM_CONDITIONAL([dlloader], [test "x$HAVE_LIBGS" = x0 && test -n "$LIBGS_LIBS"])
+
 if test "x$enable_build" != xno || test -f config.force; then
 
 # Checks for more libraries.
@@ -66,24 +108,14 @@ AC_CHECK_FUNC([kpse_set_progname],
                          [Define to 1 if you have the `kpathsea' library (-lkpathsea).])],
               [AC_MSG_ERROR([cannot find/use libkpathsea])])
 
-KPSE_RESTORE_FLAGS
-
 echo timestamp >config.force
 fi
 
+KPSE_RESTORE_FLAGS
+
 DVISVGM_TREE=[dvisvgm-]dvisvgm_version
 AC_SUBST([DVISVGM_TREE])
 
-AC_LANG_PUSH([C++])
-CPPFLAGS="-I$srcdir/$DVISVGM_TREE/src $CPPFLAGS"
-
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include "iapi.h"]],
-                                   [[typedef struct gs_main_inst_s gs_main_inst; gs_main_inst *inst;]])],
-                  [gs_old_api=yes],
-                  [gs_old_api=no])
-AC_MSG_RESULT([gs_old_api=$gs_old_api])
-AC_LANG_POP([C++])
-
 AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog
index addbb55bb6c..11f554bd776 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog
+++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-18  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	Added patch-05-libdvisvgm-dlfcn.
+	* src/Ghostscript.h: #include <dlfcn.h> only when used.
+	* src/DVIToSVG.cpp, src/Ghostscript.{cpp,h}:
+	Use defined(DISABLE_GS) instead of DISABLE_GS.
+
 2009-11-14  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	Added patch-03-libdvisvgm-uninitialized.
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-05-libdvisvgm-dlfcn b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-05-libdvisvgm-dlfcn
new file mode 100644
index 00000000000..bef0dbd8862
--- /dev/null
+++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7-PATCHES/patch-05-libdvisvgm-dlfcn
@@ -0,0 +1,79 @@
+	Do not #include <dlfcn.h> when not used (might not exits).
+
+	Use defined(DISABLE_GS) instead of DISABLE_GS, to avoid gcc
+	preprocessor warning (-Wundef).
+
+diff -ur dvisvgm-0.8.7.orig/src/DVIToSVG.cpp dvisvgm-0.8.7/src/DVIToSVG.cpp
+--- dvisvgm-0.8.7.orig/src/DVIToSVG.cpp	2009-11-09 17:36:55.000000000 +0100
++++ dvisvgm-0.8.7/src/DVIToSVG.cpp	2009-11-18 00:30:05.000000000 +0100
+@@ -18,6 +18,13 @@
+ ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
+ *************************************************************************/
+ 
++#ifdef HAVE_CONFIG_H
++#include "config.h"
++#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
++#else
++#define VERSION_STR ""
++#endif
++
+ #include <cstdlib>
+ #include <ctime>
+ #include <fstream>
+@@ -50,20 +57,13 @@
+ #include "DvisvgmSpecialHandler.h"
+ #include "EmSpecialHandler.h"
+ //#include "HtmlSpecialHandler.h"
+-#if !DISABLE_GS
++#if !defined(DISABLE_GS)
+ 	#include "PsSpecialHandler.h"
+ #endif
+ #include "TpicSpecialHandler.h"
+ ///////////////////////////////////
+ 
+ 
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
+-#else
+-#define VERSION_STR ""
+-#endif
+-
+ using namespace std;
+ 
+ // static class variables
+diff -ur dvisvgm-0.8.7.orig/src/Ghostscript.cpp dvisvgm-0.8.7/src/Ghostscript.cpp
+--- dvisvgm-0.8.7.orig/src/Ghostscript.cpp	2009-11-06 22:17:58.000000000 +0100
++++ dvisvgm-0.8.7/src/Ghostscript.cpp	2009-11-18 00:30:50.000000000 +0100
+@@ -19,7 +19,7 @@
+ *************************************************************************/
+ 
+ #include "Ghostscript.h"
+-#if !DISABLE_GS
++#if !defined(DISABLE_GS)
+ 
+ #include <cstring>
+ #include <sstream>
+diff -ur dvisvgm-0.8.7.orig/src/Ghostscript.h dvisvgm-0.8.7/src/Ghostscript.h
+--- dvisvgm-0.8.7.orig/src/Ghostscript.h	2009-11-06 22:17:58.000000000 +0100
++++ dvisvgm-0.8.7/src/Ghostscript.h	2009-11-18 00:33:30.000000000 +0100
+@@ -26,7 +26,9 @@
+ #endif
+ 
+ #include <string>
+-#if HAVE_LIBGS
++#if defined(DISABLE_GS)
++   #include "iapi.h"
++#elif HAVE_LIBGS
+    #include <ghostscript/iapi.h>
+ #else
+    #include "DLLoader.h"
+@@ -37,7 +39,7 @@
+ 	#define _Windows
+ #endif
+ 
+-#if DISABLE_GS
++#if defined(DISABLE_GS)
+ struct Ghostscript
+ {
+ 	typedef int (GSDLLCALLPTR Stdin) (void *caller, char *buf, int len);
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVG.cpp b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVG.cpp
index 102a5b30366..9366a6c11ff 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVG.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/DVIToSVG.cpp
@@ -18,6 +18,13 @@
 ** along with this program; if not, see <http://www.gnu.org/licenses/>. **
 *************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
+#else
+#define VERSION_STR ""
+#endif
+
 #include <cstdlib>
 #include <ctime>
 #include <fstream>
@@ -50,20 +57,13 @@
 #include "DvisvgmSpecialHandler.h"
 #include "EmSpecialHandler.h"
 //#include "HtmlSpecialHandler.h"
-#if !DISABLE_GS
+#if !defined(DISABLE_GS)
 	#include "PsSpecialHandler.h"
 #endif
 #include "TpicSpecialHandler.h"
 ///////////////////////////////////
 
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#define VERSION_STR VERSION " (" TARGET_SYSTEM ")"
-#else
-#define VERSION_STR ""
-#endif
-
 using namespace std;
 
 // static class variables
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.cpp b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.cpp
index 2af61f51e27..cfa244a652c 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.cpp
+++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.cpp
@@ -19,7 +19,7 @@
 *************************************************************************/
 
 #include "Ghostscript.h"
-#if !DISABLE_GS
+#if !defined(DISABLE_GS)
 
 #include <cstring>
 #include <sstream>
diff --git a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.h b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.h
index 776f29bf008..3449fed26e5 100644
--- a/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.h
+++ b/Build/source/texk/dvisvgm/dvisvgm-0.8.7/src/Ghostscript.h
@@ -26,7 +26,9 @@
 #endif
 
 #include <string>
-#if HAVE_LIBGS
+#if defined(DISABLE_GS)
+   #include "iapi.h"
+#elif HAVE_LIBGS
    #include <ghostscript/iapi.h>
 #else
    #include "DLLoader.h"
@@ -37,7 +39,7 @@
 	#define _Windows
 #endif
 
-#if DISABLE_GS
+#if defined(DISABLE_GS)
 struct Ghostscript
 {
 	typedef int (GSDLLCALLPTR Stdin) (void *caller, char *buf, int len);