From: John Ellson <ellson@research.att.com>
Date: Tue, 26 Feb 2013 00:22:05 +0000 (-0500)
Subject: apply guile config fix suggested by redhat packager
X-Git-Tag: LAST_LIBGRAPH~32^2~228
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=38ffb5fb8e1fada1759ea7f4f8365f25c5edd9f2;p=graphviz

apply guile config fix suggested by redhat packager
---

diff --git a/configure.ac b/configure.ac
index 2f43f6665..2199b8c09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -710,7 +710,7 @@ else
           GUILE_LIBS=
 	  # don't die if PKG_CHECK_MODULES not available - el4, el5
           PKG_CHECK_MODULES([GUILE],
-		[guile >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"],
+		[guile-2.0 >= "$GUILE_VERSION_MAJOR.$GUILE_VERSION_MINOR"],
 		GUILE_INCLUDES="$GUILE_CFLAGS",
           	[
 			PKG_CHECK_MODULES([GUILE],
diff --git a/tclpkg/tcldot/tcldot-util.c b/tclpkg/tcldot/tcldot-util.c
index 4c149cf9d..b8d4f0996 100644
--- a/tclpkg/tcldot/tcldot-util.c
+++ b/tclpkg/tcldot/tcldot-util.c
@@ -27,12 +27,14 @@ size_t Tcldot_channel_writer(GVJ_t *job, const char *s, size_t len)
 
 void reset_layout(GVC_t *gvc, Agraph_t * sg)
 {
+#ifndef WITH_CGRAPH
     Agraph_t *g = agroot(sg);
 
     if (GD_drawing(g)) {	/* only cleanup once between layouts */
 	gvFreeLayout(gvc, g);
 	GD_drawing(g) = NULL;
     }
+#endif
 }
 
 #ifdef WITH_CGRAPH
@@ -332,7 +334,11 @@ void tcldot_layout(GVC_t *gvc, Agraph_t * g, char *engine)
     Agsym_t *a;
     int rc;
 
+#ifndef WITH_CGRAPH
     reset_layout(gvc, g);		/* in case previously drawn */
+#else
+    gvFreeLayout(gvc, g);               /* in case previously drawn */
+#endif
 
 /* support old behaviors if engine isn't specified*/
     if (!engine || *engine == '\0') {