From: Emden Gansner <erg@research.att.com>
Date: Fri, 7 Oct 2011 18:48:09 +0000 (-0400)
Subject: Use ordinary dotgen even with cgraph
X-Git-Tag: LAST_LIBGRAPH~32^2~642
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dee78e6f32b1fa4310de0c7ac5c72d7968491150;p=graphviz

Use ordinary dotgen even with cgraph
---

diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am
index ef843fb52..6def5985f 100644
--- a/plugin/dot_layout/Makefile.am
+++ b/plugin/dot_layout/Makefile.am
@@ -29,7 +29,7 @@ libgvplugin_dot_layout_C_la_SOURCES = \
 	gvlayout_dot_layout.c
 if WITH_CGRAPH
 libgvplugin_dot_layout_C_la_LIBADD = \
-	$(top_builddir)/lib/dotgen2/libdotgen2_C.la
+	$(top_builddir)/lib/dotgen/libdotgen_C.la
 else
 libgvplugin_dot_layout_C_la_LIBADD = \
 	$(top_builddir)/lib/dotgen/libdotgen_C.la 
diff --git a/plugin/dot_layout/gvlayout_dot_layout.c b/plugin/dot_layout/gvlayout_dot_layout.c
index 368b48ad0..2e57cbee4 100644
--- a/plugin/dot_layout/gvlayout_dot_layout.c
+++ b/plugin/dot_layout/gvlayout_dot_layout.c
@@ -32,12 +32,12 @@ typedef enum { LAYOUT_DOT, } layout_type;
 #ifdef WITH_CGRAPH
     #pragma comment( lib, "cgraph.lib" )
     #pragma comment( lib, "dotgen2.lib" )
-    extern void dot2_layout(graph_t * g);
-    extern void dot2_cleanup(graph_t * g);
+    extern void dot_layout(graph_t * g);
+    extern void dot_cleanup(graph_t * g);
 
     gvlayout_engine_t dotgen_engine = {
-    dot2_layout,
-    dot2_cleanup,
+    dot_layout,
+    dot_cleanup,
     };