add -lgvc to resolve undefined symbols that only seem to bother Ubuntu

diff --git a/plugin/gd/Makefile.am b/plugin/gd/Makefile.am
index 26f6bf08c87671ff3149e28636d635304ecc48d6..f06019f8c2598606e6538e36421d1b71148c689a 100644 (file)
--- a/plugin/gd/Makefile.am
+++ b/plugin/gd/Makefile.am
@@ -27,9 +27,11 @@ libgvplugin_gd_la_SOURCES = $(libgvplugin_gd_C_la_SOURCES)
 if WITH_MYLIBGD
 libgvplugin_gd_la_LIBADD = \
        $(top_builddir)/lib/gd/libgvgd_C.la \
+       $(top_builddir)/lib/gvc/libgvc.la \
        @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @MATH_LIBS@
 else
-libgvplugin_gd_la_LIBADD = @GD_LIBS@ @MATH_LIBS@
+libgvplugin_gd_la_LIBADD = \
+       $(top_builddir)/lib/gvc/libgvc.la @GD_LIBS@ @MATH_LIBS@
 endif
 
 EXTRA_DIST = Makefile.old

diff --git a/plugin/gdk_pixbuf/Makefile.am b/plugin/gdk_pixbuf/Makefile.am
index e4d298c3c53b55fc10fceaaa32f6801212c7fee1..5b44bd41cb85e8ea5a0f20675002d81f28ff0300 100644 (file)
--- a/plugin/gdk_pixbuf/Makefile.am
+++ b/plugin/gdk_pixbuf/Makefile.am
@@ -21,7 +21,8 @@ libgvplugin_gdk_pixbuf_C_la_SOURCES = \
 
 libgvplugin_gdk_pixbuf_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_gdk_pixbuf_la_SOURCES = $(libgvplugin_gdk_pixbuf_C_la_SOURCES)
-libgvplugin_gdk_pixbuf_la_LIBADD = @GDK_PIXBUF_LIBS@
+libgvplugin_gdk_pixbuf_la_LIBADD = \
+       $(top_builddir)/lib/gvc/libgvc.la @GDK_PIXBUF_LIBS@
 
 EXTRA_DIST = Makefile.old
 

diff --git a/plugin/pango/Makefile.am b/plugin/pango/Makefile.am
index a3b00925e03ede12b81149887aaafd3d78f3d439..4705a9700c23d51b87f6ef3235c3695d60eaa1b1 100644 (file)
--- a/plugin/pango/Makefile.am
+++ b/plugin/pango/Makefile.am
@@ -23,7 +23,9 @@ libgvplugin_pango_C_la_SOURCES = \
 
 libgvplugin_pango_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_pango_la_SOURCES = $(libgvplugin_pango_C_la_SOURCES)
-libgvplugin_pango_la_LIBADD = @PANGOCAIRO_LIBS@ @FONTCONFIG_LIBS@ @MATH_LIBS@
+libgvplugin_pango_la_LIBADD = \
+       $(top_builddir)/lib/gvc/libgvc.la @PANGOCAIRO_LIBS@ @FONTCONFIG_LIBS@ @MATH_LIBS@
+
 
 EXTRA_DIST = Makefile.old