Add --enable-graphviz option for graphviz:

Graphviz API is changed in 2014* version.
And the version on ubuntu 13.10  is 2013*
Which causes build fail.

Makefile.in

@@ -258,6 +258,8 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+GVC_DEPS_CFLAGS = @GVC_DEPS_CFLAGS@
+GVC_DEPS_LIBS = @GVC_DEPS_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@

config.status

@@ -816,8 +816,12 @@ cat >>"$ac_tmp/subs1.awk" <<\_ACAWK &&
 S["am__EXEEXT_FALSE"]=""
 S["am__EXEEXT_TRUE"]="#"
 S["LTLIBOBJS"]=""
-S["DEPS_LIBS"]="-L/opt/local/lib -lpcre -lcheck -lgvc -lcgraph -lcdt "
+S["DEPS_LIBS"]="-L/opt/local/lib -lpcre -lcheck "
-S["DEPS_CFLAGS"]="-D_THREAD_SAFE -I/opt/local/include -I/opt/local/include/graphviz "
+S["DEPS_CFLAGS"]="-D_THREAD_SAFE -I/opt/local/include "
+S["GRAPHVIZ_FALSE"]=""
+S["GRAPHVIZ_TRUE"]="#"
+S["GVC_DEPS_LIBS"]=""
+S["GVC_DEPS_CFLAGS"]=""
 S["PKG_CONFIG_LIBDIR"]=""
 S["PKG_CONFIG_PATH"]=""
 S["PKG_CONFIG"]="/opt/local/bin/pkg-config"

configure

@@ -633,6 +633,10 @@ am__EXEEXT_TRUE
 LTLIBOBJS
 DEPS_LIBS
 DEPS_CFLAGS
+GRAPHVIZ_FALSE
+GRAPHVIZ_TRUE
+GVC_DEPS_LIBS
+GVC_DEPS_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
@@ -766,6 +770,7 @@ with_gnu_ld
 with_sysroot
 enable_libtool_lock
 with_check
+enable_graphviz
 '
       ac_precious_vars='build_alias
 host_alias
@@ -779,6 +784,8 @@ CPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
+GVC_DEPS_CFLAGS
+GVC_DEPS_LIBS
 DEPS_CFLAGS
 DEPS_LIBS'
 
@@ -1410,6 +1417,7 @@ Optional Features:
   --disable-dependency-tracking
                           speeds up one-time build
   --disable-libtool-lock  avoid locking (might break parallel builds)
+  --enable-graphviz       Enable graphviz feature
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1435,6 +1443,10 @@ Some influential environment variables:
               directories to add to pkg-config's search path
   PKG_CONFIG_LIBDIR
               path overriding pkg-config's built-in search path
+  GVC_DEPS_CFLAGS
+              C compiler flags for GVC_DEPS, overriding pkg-config
+  GVC_DEPS_LIBS
+              linker flags for GVC_DEPS, overriding pkg-config
   DEPS_CFLAGS C compiler flags for DEPS, overriding pkg-config
   DEPS_LIBS   linker flags for DEPS, overriding pkg-config
 
@@ -13009,6 +13021,8 @@ done
 
 
 
+
+
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
@@ -13122,21 +13136,29 @@ $as_echo "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
+# Check whether --enable-graphviz was given.
+if test "${enable_graphviz+set}" = set; then :
+  enableval=$enable_graphviz;
+fi
+
+
+if test "x$enable_graphviz" = "xyes"; then :
+
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPS" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GVC_DEPS" >&5
-$as_echo_n "checking for DEPS... " >&6; }
+$as_echo_n "checking for GVC_DEPS... " >&6; }
 
-if test -n "$DEPS_CFLAGS"; then
+if test -n "$GVC_DEPS_CFLAGS"; then
-    pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS"
+    pkg_cv_GVC_DEPS_CFLAGS="$GVC_DEPS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check libgvc\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgvc\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libpcre check libgvc") 2>&5
+  ($PKG_CONFIG --exists --print-errors "libgvc") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check libgvc" 2>/dev/null`
+  pkg_cv_GVC_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libgvc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13144,16 +13166,16 @@ fi
  else
     pkg_failed=untried
 fi
-if test -n "$DEPS_LIBS"; then
+if test -n "$GVC_DEPS_LIBS"; then
-    pkg_cv_DEPS_LIBS="$DEPS_LIBS"
+    pkg_cv_GVC_DEPS_LIBS="$GVC_DEPS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check libgvc\""; } >&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgvc\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libpcre check libgvc") 2>&5
+  ($PKG_CONFIG --exists --print-errors "libgvc") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check libgvc" 2>/dev/null`
+  pkg_cv_GVC_DEPS_LIBS=`$PKG_CONFIG --libs "libgvc" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -13174,14 +13196,118 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check libgvc" 2>&1`
+	        GVC_DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgvc" 2>&1`
         else
-	        DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check libgvc" 2>&1`
+	        GVC_DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgvc" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$GVC_DEPS_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libgvc) were not met:
+
+$GVC_DEPS_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables GVC_DEPS_CFLAGS
+and GVC_DEPS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables GVC_DEPS_CFLAGS
+and GVC_DEPS_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	GVC_DEPS_CFLAGS=$pkg_cv_GVC_DEPS_CFLAGS
+	GVC_DEPS_LIBS=$pkg_cv_GVC_DEPS_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+
+
+
+fi
+ if test x$enable_graphviz = xyes; then
+  GRAPHVIZ_TRUE=
+  GRAPHVIZ_FALSE='#'
+else
+  GRAPHVIZ_TRUE='#'
+  GRAPHVIZ_FALSE=
+fi
+
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DEPS" >&5
+$as_echo_n "checking for DEPS... " >&6; }
+
+if test -n "$DEPS_CFLAGS"; then
+    pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpcre check") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "libpcre check" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$DEPS_LIBS"; then
+    pkg_cv_DEPS_LIBS="$DEPS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpcre check\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libpcre check") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "libpcre check" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpcre check" 2>&1`
+        else
+	        DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpcre check" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$DEPS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libpcre check libgvc) were not met:
+	as_fn_error $? "Package requirements (libpcre check) were not met:
 
 $DEPS_PKG_ERRORS
 
@@ -13358,6 +13484,10 @@ if test -z "${HAVE_CHECK_TRUE}" && test -z "${HAVE_CHECK_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_CHECK\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${GRAPHVIZ_TRUE}" && test -z "${GRAPHVIZ_FALSE}"; then
+  as_fn_error $? "conditional \"GRAPHVIZ\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0

configure.ac

@@ -25,8 +25,21 @@ AC_FUNC_MALLOC
 AC_FUNC_REALLOC
 AC_CHECK_FUNCS([gettimeofday memset strchr strdup strndup strstr])
 
+
+
 PKG_PROG_PKG_CONFIG
-PKG_CHECK_MODULES(DEPS, [libpcre check libgvc])
+AC_ARG_ENABLE([graphviz],
+    AS_HELP_STRING([--enable-graphviz], [Enable graphviz feature]))
+
+AS_IF([test "x$enable_graphviz" = "xyes"], [
+    dnl Do the stuff needed for enabling the feature
+    PKG_CHECK_MODULES(GVC_DEPS, [libgvc])
+    AC_SUBST(GVC_DEPS_CFLAGS)
+    AC_SUBST(GVC_DEPS_LIBS)
+])
+AM_CONDITIONAL(GRAPHVIZ, test x$enable_graphviz = xyes)
+
+PKG_CHECK_MODULES(DEPS, [libpcre check])
 AC_SUBST(DEPS_CFLAGS)
 AC_SUBST(DEPS_LIBS)
 AC_CONFIG_FILES([

include/r3.h

@@ -13,7 +13,6 @@
 #include <string.h>
 #include <assert.h>
 #include <pcre.h>
-#include <gvc.h>
 
 #include "str_array.h"
 
@@ -134,6 +133,5 @@ match_entry * match_entry_create(char * path, int path_len);
 
 void match_entry_free(match_entry * entry);
 
-void r3_tree_build_ag_nodes(Agraph_t * g, Agnode_t * ag_parent_node, node * n, int node_cnt);
 
 #endif /* !NODE_H */

src/Makefile.am

@@ -1,5 +1,14 @@
 lib_LTLIBRARIES=libr3.la
-libr3_la_SOURCES=node.c edge.c list.c str.c token.c gvc.c
+libr3_la_SOURCES=node.c edge.c list.c str.c token.c
+
 libr3_la_LIBADD=$(DEPS_LIBS)
 AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall
+
+if GRAPHVIZ
+	libr3_la_SOURCES += gvc.c
+	libr3_la_LIBADD += $(GVC_DEPS_LIBS)
+	AM_CFLAGS += =$(GVC_DEPS_CFLAGS)
+endif
+
+
 # AM_CFLAGS=$(DEPS_CFLAGS)

src/Makefile.in

@@ -123,7 +123,7 @@ am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libr3_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo gvc.lo
+am_libr3_la_OBJECTS = node.lo edge.lo list.lo str.lo token.lo
 libr3_la_OBJECTS = $(am_libr3_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -220,6 +220,8 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+GVC_DEPS_CFLAGS = @GVC_DEPS_CFLAGS@
+GVC_DEPS_LIBS = @GVC_DEPS_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -312,9 +314,9 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 lib_LTLIBRARIES = libr3.la
-libr3_la_SOURCES = node.c edge.c list.c str.c token.c gvc.c
+libr3_la_SOURCES = node.c edge.c list.c str.c token.c
 libr3_la_LIBADD = $(DEPS_LIBS)
-AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall -std=c99
+AM_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include -Wall
 all: all-am
 
 .SUFFIXES:
@@ -395,7 +397,6 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edge.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gvc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/node.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/str.Plo@am__quote@
@@ -634,6 +635,11 @@ uninstall-am: uninstall-libLTLIBRARIES
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
 
+
+@GRAPHVIZ_TRUE@	libr3_la_SOURCES += gvc.c
+@GRAPHVIZ_TRUE@	libr3_la_LIBADD += $(GVC_DEPS_LIBS)
+@GRAPHVIZ_TRUE@	AM_CFLAGS += =$(GVC_DEPS_CFLAGS)
+
 # AM_CFLAGS=$(DEPS_CFLAGS)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

src/gvc.c

@@ -9,6 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include "r3.h"
+#include "r3_gvc.h"
 
 
 char * node_id_str(int id) {

tests/Makefile.am

@@ -4,16 +4,22 @@
 # else
 # TESTS                       =
 # endif
-TESTS                       = check_tree check_gvc
+TESTS                       = check_tree
-# noinst_PROGRAMS             = $(TESTS)
-check_PROGRAMS = $(TESTS)
-check_tree_SOURCES = check_tree.c bench.c
-check_tree_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@
-check_tree_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@
 
+if GRAPHVIZ
+TESTS += check_gvc
 check_gvc_SOURCES = check_gvc.c bench.c
 check_gvc_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@
 check_gvc_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@
+endif
+
+
+# noinst_PROGRAMS             = $(TESTS)
+check_tree_SOURCES = check_tree.c bench.c
+check_tree_LDADD=$(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@
+check_tree_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@
+check_PROGRAMS = $(TESTS)
+
 
 # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir)/include
 # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include

tests/Makefile.in

@@ -77,8 +77,9 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-TESTS = check_tree$(EXEEXT) check_gvc$(EXEEXT)
+TESTS = check_tree$(EXEEXT) $(am__EXEEXT_1)
-check_PROGRAMS = $(am__EXEEXT_1)
+@GRAPHVIZ_TRUE@am__append_1 = check_gvc
+check_PROGRAMS = $(am__EXEEXT_2)
 subdir = tests
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/depcomp $(top_srcdir)/test-driver
@@ -93,12 +94,14 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__EXEEXT_1 = check_tree$(EXEEXT) check_gvc$(EXEEXT)
+@GRAPHVIZ_TRUE@am__EXEEXT_1 = check_gvc$(EXEEXT)
-am_check_gvc_OBJECTS = check_gvc-check_gvc.$(OBJEXT) \
+am__EXEEXT_2 = check_tree$(EXEEXT) $(am__EXEEXT_1)
-	check_gvc-bench.$(OBJEXT)
+am__check_gvc_SOURCES_DIST = check_gvc.c bench.c
+@GRAPHVIZ_TRUE@am_check_gvc_OBJECTS = check_gvc-check_gvc.$(OBJEXT) \
+@GRAPHVIZ_TRUE@	check_gvc-bench.$(OBJEXT)
 check_gvc_OBJECTS = $(am_check_gvc_OBJECTS)
 am__DEPENDENCIES_1 =
-check_gvc_DEPENDENCIES = $(am__DEPENDENCIES_1)
+@GRAPHVIZ_TRUE@check_gvc_DEPENDENCIES = $(am__DEPENDENCIES_1)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -148,7 +151,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
 SOURCES = $(check_gvc_SOURCES) $(check_tree_SOURCES)
-DIST_SOURCES = $(check_gvc_SOURCES) $(check_tree_SOURCES)
+DIST_SOURCES = $(am__check_gvc_SOURCES_DIST) $(check_tree_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -408,6 +411,8 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
+GVC_DEPS_CFLAGS = @GVC_DEPS_CFLAGS@
+GVC_DEPS_LIBS = @GVC_DEPS_LIBS@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -499,12 +504,14 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+@GRAPHVIZ_TRUE@check_gvc_SOURCES = check_gvc.c bench.c
+@GRAPHVIZ_TRUE@check_gvc_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@
+@GRAPHVIZ_TRUE@check_gvc_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@
+
+# noinst_PROGRAMS             = $(TESTS)
 check_tree_SOURCES = check_tree.c bench.c
 check_tree_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@
 check_tree_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@
-check_gvc_SOURCES = check_gvc.c bench.c
-check_gvc_LDADD = $(DEPS_LIBS) -L$(top_builddir)/src -lr3 @CHECK_LIBS@
-check_gvc_CFLAGS = $(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include @CHECK_CFLAGS@
 
 # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir)/include
 # AM_CFLAGS=$(DEPS_CFLAGS) -I$(top_builddir) -I$(top_builddir)/include

tests/bench_str.csv

@@ -87,3 +87,4 @@
 1400372910,12755936.07
 1400373185,13716181.30
 1400374415,13164892.40
+1400376564,11239373.08

tests/check_gvc.c

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include "r3.h"
 #include "r3_str.h"
+#include "r3_gvc.h"
 #include "str_array.h"
 #include "bench.h"