From: ellson <devnull@localhost>
Date: Fri, 26 May 2006 15:55:07 +0000 (+0000)
Subject: - need extern for GDCodeGen  (linking from convenience libs seems to be more strict)
X-Git-Tag: LAST_LIBGRAPH~32^2~6526
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=08467d75e68e99a9b936e05334812ce4fa87fc42;p=graphviz

- 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 191c7d365..32697e217 100644
--- 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 52392d351..18f907e53 100644
--- 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