cgraph fixes

diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c
index ffa9fcc76f7805783d59e1839bd80f92047eb8c2..0c32f3dbb93bd910bb32a42203f590e3758770d8 100644 (file)
--- a/cmd/dot/dot.c
+++ b/cmd/dot/dot.c
@@ -138,8 +138,8 @@ static graph_t *create_test_graph(void)
 #ifndef WITH_CGRAPH
        node[j] = agnode(g, name);
 #else /* WITH_CGRAPH */
-       node[j] = agnode(g, name, NULL, 1);
-    agbindrec(node[j], "Agnodeinfo_t", sizeof(Agnodeinfo_t), TRUE);    //node custom data
+       node[j] = agnode(g, name, 1);
+       agbindrec(node[j], "Agnodeinfo_t", sizeof(Agnodeinfo_t), TRUE); //node custom data
 
 #endif /* WITH_CGRAPH */
     }

diff --git a/lib/dotgen/Makefile.am b/lib/dotgen/Makefile.am
index b230890c34ea8cbe87a2a9c24cae2fae1eed6a22..33c11a50c42b8c32702e952ddbaa673ce1de01c2 100644 (file)
--- a/lib/dotgen/Makefile.am
+++ b/lib/dotgen/Makefile.am
@@ -1,19 +1,22 @@
 # $Id$ $Revision$
 ## Process this file with automake to produce Makefile.in
 
+if WITH_CGRAPH
+GRAPH = cgraph
+else
+GRAPH = graph
+endif
+
 AM_CPPFLAGS = \
        -I$(top_srcdir) \
         -I$(top_srcdir)/lib/common \
         -I$(top_srcdir)/lib/gvc \
-       -I$(top_srcdir)/lib/graph \
+       -I$(top_srcdir)/lib/$(GRAPH) \
        -I$(top_srcdir)/lib/cdt \
        -I$(top_srcdir)/lib/pathplan
 
-if WITH_CGRAPH
-else
 noinst_HEADERS = dot.h dotprocs.h aspect.h
 noinst_LTLIBRARIES = libdotgen_C.la
-endif
 
 libdotgen_C_la_LDFLAGS = -no-undefined
 libdotgen_C_la_SOURCES = acyclic.c class1.c class2.c cluster.c compound.c \