- get it to compile

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 40105854cb093e2b5ade3bfdf9e457299d0e23ce..4089c8f13aa653cfc72f58bdc036f0f79a6645b3 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -57,8 +57,9 @@ if WITH_MYLIBGD
 dot_static_LDADD = \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_dot_layout_C.a \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_neato_layout_C.a \
+       $(top_builddir)/lib/plugin/.libs/libgvplugin_core_C.a \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_gd_C.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_pangocairo_C.a \
+       $(top_builddir)/lib/plugin/.libs/libgvplugin_pango_C.a \
        $(top_builddir)/lib/gvc/libgvc_C.la \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \
        $(top_builddir)/lib/pack/libpack_C.la \
@@ -70,8 +71,9 @@ else
 dot_static_LDADD = \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_dot_layout_C.a \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_neato_layout_C.a \
+       $(top_builddir)/lib/plugin/.libs/libgvplugin_core_C.a \
        $(top_builddir)/lib/plugin/.libs/libgvplugin_gd_C.a \
-       $(top_builddir)/lib/plugin/.libs/libgvplugin_pangocairo_C.a \
+       $(top_builddir)/lib/plugin/.libs/libgvplugin_pango_C.a \
        $(top_builddir)/lib/gvc/libgvc_C.la \
        $(top_builddir)/lib/pathplan/libpathplan_C.la \
        $(top_builddir)/lib/pack/libpack_C.la \

diff --git a/lib/gvc/dot_builtins.c b/lib/gvc/dot_builtins.c
index 2e8610f6499c1e7aeb9a92da9449d677532a3920..36f94c80d77ee4e3c6fe5f64a35a254b0180a623 100644 (file)
--- a/lib/gvc/dot_builtins.c
+++ b/lib/gvc/dot_builtins.c
@@ -30,5 +30,6 @@ const lt_symlist_t lt_preloaded_symbols[] = {
        { "gvplugin_neato_layout_LTX_library", (void*)(&gvplugin_neato_layout_LTX_library) },
        { "gvplugin_pango_LTX_library", (void*)(&gvplugin_gd_LTX_library) },
        { "gvplugin_gd_LTX_library", (void*)(&gvplugin_gd_LTX_library) },
+       { "gvplugin_core_LTX_library", (void*)(&gvplugin_core_LTX_library) },
        { 0, 0 }
 };

diff --git a/plugin/core/gvplugin_core.c b/plugin/core/gvplugin_core.c
index f53e31e3c60dece60050b2ad3976a013aced9cb6..864ce70f3b37176b562afbb5b9bb985164d6c2ad 100644 (file)
--- a/plugin/core/gvplugin_core.c
+++ b/plugin/core/gvplugin_core.c
@@ -16,11 +16,11 @@
 
 #include "gvplugin.h"
 
-extern gvplugin_installed_t gvrender_core_ps_types;
+//extern gvplugin_installed_t gvrender_core_ps_types;
 extern gvplugin_installed_t gvrender_core_svg_types;
 
 static gvplugin_api_t apis[] = {
-    {API_render, &gvrender_core_ps_types},
+//    {API_render, &gvrender_core_ps_types},
     {API_render, &gvrender_core_svg_types},
     {(api_t)0, NULL},
 };

diff --git a/plugin/core/gvrender_core_svg.c b/plugin/core/gvrender_core_svg.c
index ca2c3c77252862c753c13f5479825530abf9b6c1..b69d41c11a1680b7d4983119b2f4affe5e8f4b1e 100644 (file)
--- a/plugin/core/gvrender_core_svg.c
+++ b/plugin/core/gvrender_core_svg.c
@@ -614,7 +614,7 @@ gvrender_features_t svggen_features = {
     RGBA_BYTE,                 /* color_type */
 };
 
-gvplugin_installed_t gvrender_svggen_types[] = {
+gvplugin_installed_t gvrender_core_svg_types[] = {
     {FORMAT_SVG, "svg", -1, &svggen_engine, &svggen_features},
 #if HAVE_LIBZ
     {FORMAT_SVGZ, "svgz", -1, &svggen_engine, &svggen_features},

diff --git a/tclpkg/tcldot/Makefile.am b/tclpkg/tcldot/Makefile.am
index 902a0fffbe99f2c32cd8203f0d9993edb48a3116..cb204139f3d69fe324544d90c357019e0c83c4c3 100644 (file)
--- a/tclpkg/tcldot/Makefile.am
+++ b/tclpkg/tcldot/Makefile.am
@@ -58,8 +58,9 @@ libtcldot_builtin_la_LIBADD = \
        $(top_builddir)/tclpkg/tclstubs/libtclstubs_C.la \
        $(top_builddir)/lib/plugin/libgvplugin_dot_layout_C.la \
        $(top_builddir)/lib/plugin/libgvplugin_neato_layout_C.la \
+       $(top_builddir)/lib/plugin/libgvplugin_core_C.la \
        $(top_builddir)/lib/plugin/libgvplugin_gd_C.la \
-       $(top_builddir)/lib/plugin/libgvplugin_pangocairo_C.la \
+       $(top_builddir)/lib/plugin/libgvplugin_pango_C.la \
        $(top_builddir)/lib/gvc/libgvc_C.la \
        $(top_builddir)/lib/graph/libgraph_C.la \
        $(top_builddir)/lib/cdt/libcdt_C.la \