- need extern for GDCodeGen (linking from convenience libs seems to be more strict)

- typo causing FEATURES/vmalloc to not get built

diff --git a/lib/common/fontmetrics.c b/lib/common/fontmetrics.c
index 191c7d36502c690ff0a75a0a28a80edc9cf95e07..32697e217e05c6e0b62224d200dd1c81b3e09c8a 100644 (file)
--- a/lib/common/fontmetrics.c
+++ b/lib/common/fontmetrics.c
@@ -119,6 +119,10 @@ static double courFontWidth[] = {
     0.5999, 0.5999, 0.5999, 0.5999, 0.5999, 0.5999, 0.5999, 0.5999,    /* øùúû     */
 };
 
+#if defined(WITH_CODEGENS) && !defined(HAVE_GD_FREETYPE) && defined(HAVE_LIBGD)
+extern codegen_t GD_CodeGen;
+#endif
+
 /* estimate_textsize:
  * Estimate width and height of text, for given face and size, in points.
  * Value is stored para->width.

diff --git a/lib/vmalloc/Makefile.am b/lib/vmalloc/Makefile.am
index 52392d3513a4ac9dda40236c692c1af342b8ba57..18f907e5355b686be682f27dcf368c25735f73bf 100644 (file)
--- a/lib/vmalloc/Makefile.am
+++ b/lib/vmalloc/Makefile.am
@@ -16,7 +16,7 @@ ${top_builddir}/FEATURE/vmalloc: ${top_srcdir}/lib/vmalloc/features/vmalloc
        mkdir -p ${top_builddir}/FEATURE
        @KSH@ ${top_srcdir}/iffe - set cc $(CC) $(CCMODE) $(CXFLAGS) : run ${top_srcdir}/lib/vmalloc/features/vmalloc > $@
 
-$(libvmalloc_la_OBJECTS): ${top_builddir}/FEATURE/vmalloc
+$(libvmalloc_C_la_OBJECTS): ${top_builddir}/FEATURE/vmalloc
 
 DISTCLEANFILES = ${top_builddir}/FEATURE/vmalloc