Implement cairo_draw()

configure.ac

@@ -140,6 +140,19 @@ AC_ARG_ENABLE([openmp], [AS_HELP_STRING([--enable-openmp],[enable openmp [defaul
         )
 AC_SUBST(OPENMP_LDFLAGS)
 
+[USING_CAIRO=yes]
+AC_MSG_CHECKING(whether to enable cairo drawing...)
+AC_ARG_ENABLE([cairo], [AS_HELP_STRING([--disable-cairo],[disable cairo drawing [default=enabled] ])],
+        if test $enableval = no; then
+           [USING_CAIRO=no]
+           [AC_MSG_RESULT(no)]
+        else
+           [AC_MSG_RESULT(yes)]
+        fi
+        ,
+        [AC_MSG_RESULT(yes)]
+        )
+
 dnl Override prefix with default value if not set
 if test "x${prefix}" = "xNONE"; then
   prefix=${ac_default_prefix}
@@ -232,6 +245,16 @@ AC_CHECK_HEADER([CGAL/version.h],
                 [AC_MSG_ERROR([CGAL headers not found])])
 
 
+
+dnl cairo
+if test "$USING_CAIRO" = "yes"; then
+   PKG_CHECK_MODULES(CAIROMM, [cairomm-1.0], AC_DEFINE([HAVE_CAIROMM], [1],
+                     [Cairomm is available]), [])
+   AC_SUBST(CAIROMM_CFLAGS)
+   AC_SUBST(CAIROMM_LIBS)
+   AC_PYTHON_MODULE(cairo)
+fi
+
 dnl Checks for typedefs, structures, and compiler characteristics.
 dnl Checks for library functions.
 
@@ -338,6 +361,7 @@ src/graph/topology/Makefile
 src/graph/flow/Makefile
 src/graph/layout/Makefile
 src/graph/search/Makefile
+src/graph/draw/Makefile
 src/graph_tool/Makefile
 ])
 AC_OUTPUT

src/graph/Makefile.am

 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = centrality clustering community correlations flow generation layout search stats topology util
+SUBDIRS = centrality clustering community correlations draw flow generation layout search stats topology util
 
 AM_CPPFLAGS =\
     -I$(srcdir)/.. \

src/graph/draw/Makefile.am

+## Process this file with automake to produce Makefile.in
+
+AM_CPPFLAGS = $(MOD_CPPFLAGS) $(CAIROMM_CFLAGS)
+
+AM_CFLAGS = $(AM_CXXFLAGS)
+
+libgraph_tool_drawdir = $(pythondir)/graph_tool/draw
+
+libgraph_tool_draw_LTLIBRARIES = libgraph_tool_draw.la
+
+libgraph_tool_draw_la_includedir = $(pythondir)/graph_tool/include
+
+libgraph_tool_draw_la_LIBADD = $(MOD_LIBADD)
+
+libgraph_tool_draw_la_LDFLAGS = $(MOD_LDFLAGS) $(CAIROMM_LIBS)
+
+libgraph_tool_draw_la_SOURCES = \
+    graph_cairo_draw.cc
+
+libgraph_tool_draw_la_include_HEADERS = 

src/graph_tool/Makefile.am

@@ -42,7 +42,11 @@ graph_tool_community_PYTHON = \
 graph_tool_communitydir = $(MOD_DIR)/community
 
 graph_tool_draw_PYTHON = \
-    draw/__init__.py
+    draw/__init__.py \
+    draw/cairo_draw.py \
+    draw/graphviz_draw.py
+graph_tool_draw_DATA = \
+    draw/graph-tool-logo.svg
 graph_tool_drawdir = $(MOD_DIR)/draw
 
 graph_tool_util_PYTHON = \