From ec66cee0b6fb7a439ed62336fc6ee17ca2bc9c57 Mon Sep 17 00:00:00 2001 From: John Ellson Date: Wed, 22 Feb 2012 15:23:12 -0500 Subject: [PATCH] disable cgraph until protonode issue resolved --- configure.ac | 6 +++--- tclpkg/gv/gv.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 7e9cef20a..58ee0ec17 100644 --- a/configure.ac +++ b/configure.ac @@ -3038,11 +3038,11 @@ dnl ----------------------------------- dnl CGRAPH AC_ARG_WITH(cgraph, - [AS_HELP_STRING([--with-cgraph=yes],[Use CGRAPH library])], - [], [with_cgraph=yes]) + [AS_HELP_STRING([--with-cgraph=no],[Use CGRAPH library])], + [], [with_cgraph=no]) if test "x$with_cgraph" != "xyes"; then - use_cgraph="No (disabled)" + use_cgraph="No (disabled by default - experimental)" else use_cgraph="Yes" AC_DEFINE_UNQUOTED(WITH_CGRAPH,1,[Define if you want CGRAPH]) diff --git a/tclpkg/gv/gv.cpp b/tclpkg/gv/gv.cpp index 4195c423f..8b64e5b25 100644 --- a/tclpkg/gv/gv.cpp +++ b/tclpkg/gv/gv.cpp @@ -365,13 +365,13 @@ char *setv(Agedge_t *e, char *attr, char *val) return NULL; g = agroot(agraphof(agtail(e))); #ifndef WITH_CGRAPH - if ( AGTYPE(e) == AGRAPH ) { - // FIXME - protonode - } a = agfindattr(g->proto->e, attr); if (!a) a = agedgeattr(g, attr, emptystring); #else + if ( AGTYPE(e) == AGRAPH ) { + // FIXME - protoedge + } a = agattr(g, AGEDGE, attr, NULL); if (!a) a = agattr(g, AGEDGE, attr, emptystring); @@ -484,7 +484,7 @@ Agnode_t *protonode(Agraph_t *g) } Agedge_t *protoedge(Agraph_t *g) - +{ if (!g) return NULL; return g->proto->e; -- 2.40.0