Use ordinary dotgen even with cgraph

diff --git a/plugin/dot_layout/Makefile.am b/plugin/dot_layout/Makefile.am
index ef843fb523963e9839c3d3d7242d285a1b9d300c..6def5985fba9873d380bb35c606987a302f59308 100644 (file)
--- 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 368b48ad05c65a3950f898110b890869155e0904..2e57cbee49c9356fb4d52b2a5c764710100fb082 100644 (file)
--- 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,
     };