fix --disable-gvrender

diff --git a/cmd/dot/Makefile.am b/cmd/dot/Makefile.am
index 836ca7e13ea978a7d57ddc608095544d3d1d7b1a..48903ccad21fb4ddd5fcef8cdaed3f8e677bc0ce 100644 (file)
--- a/cmd/dot/Makefile.am
+++ b/cmd/dot/Makefile.am
@@ -39,7 +39,14 @@ dot_SOURCES = dot.c args.c plugins.c
 if DISABLE_GVRENDER
 dot_LDADD = \
         $(top_builddir)/lib/common/libcommon.la \
-        $(top_builddir)/lib/gvc/libgvc.la
+        $(top_builddir)/lib/gvc/libgvc.la \
+       $(top_builddir)/lib/fdpgen/libfdpgen.la \
+       $(top_builddir)/lib/twopigen/libtwopigen.la \
+       $(top_builddir)/lib/circogen/libcircogen.la \
+       $(top_builddir)/lib/neatogen/libneatogen.la \
+       $(top_builddir)/lib/dotgen/libdotgen.la \
+        $(top_builddir)/lib/pathplan/libpathplan.la \
+        $(top_builddir)/lib/graph/libgraph.la
 else
 dot_LDADD = \
        $(top_builddir)/lib/common/libcommon.la \

diff --git a/cmd/dot/plugins.c b/cmd/dot/plugins.c
index c5f2ca2fee32e2d3098a95aef67ce6e5de133838..3d3783ece0e0da0b815d558de705b9aaa717581a 100644 (file)
--- a/cmd/dot/plugins.c
+++ b/cmd/dot/plugins.c
@@ -21,7 +21,7 @@
 #include        "macros.h"
 #include        "gvrender.h"
 
-#if ENABLE_GVRENDER
+#ifndef DISABLE_GVRENDER
 extern gvplugin_t gvplugin_cairo_LTX_plugin,
     gvplugin_gd_LTX_plugin,
     gvplugin_text_LTX_plugin,
@@ -29,7 +29,7 @@ extern gvplugin_t gvplugin_cairo_LTX_plugin,
 #endif
 
 gvplugin_t *builtins[] = {
-#if ENABLE_GVRENDER
+#ifndef DISABLE_GVRENDER
     &gvplugin_cairo_LTX_plugin,
     &gvplugin_gd_LTX_plugin,
     &gvplugin_text_LTX_plugin,

diff --git a/cmd/tools/plugins.c b/cmd/tools/plugins.c
index c5f2ca2fee32e2d3098a95aef67ce6e5de133838..3d3783ece0e0da0b815d558de705b9aaa717581a 100644 (file)
--- a/cmd/tools/plugins.c
+++ b/cmd/tools/plugins.c
@@ -21,7 +21,7 @@
 #include        "macros.h"
 #include        "gvrender.h"
 
-#if ENABLE_GVRENDER
+#ifndef DISABLE_GVRENDER
 extern gvplugin_t gvplugin_cairo_LTX_plugin,
     gvplugin_gd_LTX_plugin,
     gvplugin_text_LTX_plugin,
@@ -29,7 +29,7 @@ extern gvplugin_t gvplugin_cairo_LTX_plugin,
 #endif
 
 gvplugin_t *builtins[] = {
-#if ENABLE_GVRENDER
+#ifndef DISABLE_GVRENDER
     &gvplugin_cairo_LTX_plugin,
     &gvplugin_gd_LTX_plugin,
     &gvplugin_text_LTX_plugin,

diff --git a/lib/gvc/gvemit.c b/lib/gvc/gvemit.c
index 3920be01088aab74c1c6532b05177d101903a516..1fef649b1404b9b557bd4dcca9c1fd2a5c2dc67d 100644 (file)
--- a/lib/gvc/gvemit.c
+++ b/lib/gvc/gvemit.c
@@ -19,7 +19,10 @@
 #endif
 
 #include <stdio.h>
+
+#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER)
 #include <cairo.h>
+#endif
 
 #include "const.h"
 #include "types.h"
@@ -29,7 +32,7 @@
 
 extern void emit_graph(GVC_t * gvc, graph_t * g, int flags);
 
-#ifndef X_DISPLAY_MISSING
+#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER)
 
 #define PANFACTOR 10
 #define ZOOMFACTOR 1.1
@@ -567,7 +570,7 @@ static int toggle_fit_cb(win_t * win)
 void gvemit_graph(GVC_t * gvc, graph_t * g, int flags)
 {
    if (flags & GVRENDER_X11_EVENTS) {
-#ifndef X_DISPLAY_MISSING
+#if !defined(X_DISPLAY_MISSING) && !defined(DISABLE_GVRENDER)
        win_t win;
        const char *display=NULL;
        int argb=0;