Description: Fix build with libcgraph

Author: Tom Callaway <spot@fedoraproject.org>

Origin: vendor, http://pkgs.fedoraproject.org/cgit/flowcanvas.git/commit/?id=925fa22d9466bcfa9cf7a434527f40ea8906e8da

Forwarded: no

Last-Update: 2013-10-24

Index: b/src/Canvas.cpp

===================================================================

--- a/src/Canvas.cpp

+++ b/src/Canvas.cpp

@@ -1253,21 +1253,21 @@

 	 */

 	GVC_t* gvc = gvContext();

-	Agraph_t* G = agopen((char*)"g", AGDIGRAPH);

+	Agraph_t* G = agopen((char*)"g", Agdirected, NULL);

 	nodes.gvc = gvc;

 	nodes.G = G;

 	if (_direction == HORIZONTAL)

-		agraphattr(G, (char*)"rankdir", (char*)"LR");

+		agattr(G, AGRAPH, (char*)"rankdir", (char*)"LR");

 	else

-		agraphattr(G, (char*)"rankdir", (char*)"TD");

+		agattr(G, AGRAPH, (char*)"rankdir", (char*)"TD");

 	unsigned id = 0;

 	for (ItemList::const_iterator i = _items.begin(); i != _items.end(); ++i) {

 		std::ostringstream ss;

 		ss << "n" << id++;

-		Agnode_t* node = agnode(G, strdup(ss.str().c_str()));

+		Agnode_t* node = agnode(G, strdup(ss.str().c_str()), true);

 		if (boost::dynamic_pointer_cast<Module>(*i)) {

 			ss.str("");

 			ss << (*i)->width() / 96.0;

@@ -1310,7 +1310,7 @@

 		assert(src_node && dst_node);

-		Agedge_t* edge = agedge(G, src_node, dst_node);

+		Agedge_t* edge = agedge(G, src_node, dst_node, NULL, true);

 		if (use_length_hints && c->length_hint() != 0) {

 			std::ostringstream len_ss;

@@ -1325,7 +1325,7 @@

 		if (partner) {

 			GVNodes::iterator p = nodes.find(partner);

 			if (p != nodes.end())

-				agedge(G, i->second, p->second);

+				agedge(G, i->second, p->second, NULL, true);

 		}

 	}

Index: b/wscript

===================================================================

--- a/wscript

+++ b/wscript

@@ -39,6 +39,7 @@

 	autowaf.configure(conf)

 	autowaf.display_header('FlowCanvas Configuration')

 	conf.check_tool('compiler_cxx')

+	conf.env['LIB_AGRAPH'] = ['cgraph' if l == 'graph' else l for l in conf.env['LIB_AGRAPH']]

 	autowaf.check_pkg(conf, 'libgvc', uselib_store='AGRAPH',

 	                  atleast_version='2.8', mandatory=False)

 	autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GLIBMM',