Index: lib/sfio/sfhdr.h
--- lib/sfio/sfhdr.h.orig	Fri Apr 27 04:17:42 2001
+++ lib/sfio/sfhdr.h	Tue Feb 18 19:26:37 2003
@@ -143,6 +143,10 @@
 #include	<errno.h>
 #include	<ctype.h>
 
+#ifndef va_copy
+#define va_copy(to,fr) ((to)=(fr))
+#endif
+
 #if vt_threaded
 
 /* initialization */
@@ -254,7 +258,9 @@
 #include        <limits.h>
 #else
 #if _hdr_values
+#ifdef HAVE_VALUES_H
 #include	<values.h>
+#endif
 #if !defined(SF_MAXDOUBLE) && defined(MAXDOUBLE)
 #define SF_MAXDOUBLE	MAXDOUBLE
 #endif
Index: plugin/gd/gvrender_gd.c
--- plugin/gd/gvrender_gd.c.orig	2007-11-08 20:42:15 +0100
+++ plugin/gd/gvrender_gd.c	2007-11-10 18:37:15 +0100
@@ -34,6 +34,10 @@
 #ifdef HAVE_LIBGD
 #include "gd.h"
 
+#ifndef HAVE_GD_FONTCONFIG
+#define HAVE_GD_FONTCONFIG
+#endif
+
 typedef enum {
 	FORMAT_GIF,
 	FORMAT_JPEG,
Index: plugin/gd/gvtextlayout_gd.c
--- plugin/gd/gvtextlayout_gd.c.orig	2007-11-08 20:42:15 +0100
+++ plugin/gd/gvtextlayout_gd.c	2007-11-10 18:37:31 +0100
@@ -29,6 +29,10 @@
 #ifdef HAVE_LIBGD
 #include "gd.h"
 
+#ifndef HAVE_GD_FONTCONFIG
+#define HAVE_GD_FONTCONFIG
+#endif
+
 #if defined(HAVE_LIBGD) && defined(HAVE_GD_FREETYPE)
 
 /* fontsize at which text is omitted entirely */
Index: cmd/dot/Makefile.am
--- cmd/dot/Makefile.am	2007/08/28 12:28:57	1.1
+++ cmd/dot/Makefile.am	2007/08/28 13:08:51
@@ -96,6 +96,7 @@
        	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
 endif
 else
+if WITH_PANGOCAIRO
 dot_static_LDADD = \
 	$(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
 	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
@@ -107,6 +108,18 @@
 	$(top_builddir)/lib/graph/libgraph_C.la \
 	$(top_builddir)/lib/cdt/libcdt_C.la \
        	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
+else
+dot_static_LDADD = \
+	$(top_builddir)/plugin/dot_layout/.libs/libgvplugin_dot_layout_C.a \
+	$(top_builddir)/plugin/neato_layout/.libs/libgvplugin_neato_layout_C.a \
+	$(top_builddir)/plugin/core/.libs/libgvplugin_core_C.a \
+	$(top_builddir)/plugin/gd/.libs/libgvplugin_gd_C.a \
+	$(top_builddir)/lib/gvc/libgvc_C.la \
+	$(top_builddir)/lib/pathplan/libpathplan_C.la \
+	$(top_builddir)/lib/graph/libgraph_C.la \
+	$(top_builddir)/lib/cdt/libcdt_C.la \
+       	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
+endif
 endif

 dot_builtins_SOURCES =3D dot.c $(top_srcdir)/lib/gvc/dot_builtins.c $(top_srcdir)/lib/gvc/no_demand_loading.c
@@ -138,6 +151,7 @@
        	@ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @MATH_LIBS@
 endif
 else
+if WITH_PANGOCAIRO
 dot_builtins_LDADD = \
 	$(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
 	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
@@ -149,6 +163,18 @@
 	$(top_builddir)/lib/graph/libgraph.la \
 	$(top_builddir)/lib/cdt/libcdt.la \
        	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
+else
+dot_builtins_LDADD = \
+	$(top_builddir)/plugin/dot_layout/libgvplugin_dot_layout.la \
+	$(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la \
+	$(top_builddir)/plugin/core/libgvplugin_core.la \
+	$(top_builddir)/plugin/gd/libgvplugin_gd.la \
+	$(top_builddir)/lib/gvc/libgvc_builtins.la \
+	$(top_builddir)/lib/pathplan/libpathplan.la \
+	$(top_builddir)/lib/graph/libgraph.la \
+	$(top_builddir)/lib/cdt/libcdt.la \
+       	@GD_LIBS@ @ICONV_LIBS@ @FONTCONFIG_LIBS@ @FREETYPE2_LIBS@ @JPEG_LIBS@ @PNG_LIBS@ @EXPAT_LIBS@ @Z_LIBS@ @LIBGEN_LIBS@ @LIBLTDL@ @SOCKET_LIBS@ @IPSEPCOLA_LIBS@ @PANGOCAIRO_LIBS@ @MATH_LIBS@
+endif
 endif