apply guile config fix suggested by redhat packager

diff --git a/configure.ac b/configure.ac
index 2f43f6665d9d924e0fcde2ac53f193581c0cdd15..2199b8c09d09e08841816e3e852febb74f05bbed 100644 (file)
--- 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 4c149cf9d1d9264c72b300e9b64fcec173c7c7a3..b8d4f0996ecd6c0b6abe4283e266a2ba02ddb935 100644 (file)
--- 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') {