From: ellson <devnull@localhost>
Date: Sun, 23 Dec 2007 11:44:49 +0000 (+0000)
Subject: add support for tcl/tk8.5
X-Git-Tag: LAST_LIBGRAPH~32^2~4957
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d31329985c8a2483889ce897eb725c89e65b92a7;p=graphviz

add support for tcl/tk8.5
---

diff --git a/configure.ac b/configure.ac
index 411c1e0b3..d689d89e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1092,12 +1092,15 @@ AC_ARG_WITH(tclsh,
     TCLSH=$withval,)
 
 if test "x$TCLSH" = "x"; then
-    AC_PATH_PROG(TCLSH,tclsh8.4)
+    AC_PATH_PROG(TCLSH,tclsh8.5)
     if test "x$TCLSH" = "x"; then
-        AC_PATH_PROG(TCLSH,tclsh8.3)
+        AC_PATH_PROG(TCLSH,tclsh8.4)
         if test "x$TCLSH" = "x"; then
-            AC_PATH_PROG(TCLSH,tclsh)
-        fi
+            AC_PATH_PROG(TCLSH,tclsh8.3)
+            if test "x$TCLSH" = "x"; then
+                AC_PATH_PROG(TCLSH,tclsh)
+            fi
+	fi
     fi
     if test "x$TCLSH" = "x"; then
         AC_MSG_WARN([Unable to find a tclsh. The Tcl packages will not be built])
@@ -1239,13 +1242,16 @@ if test "$HAVE_TK" = "1"; then
         [AC_HELP_STRING([--with-wish=PROG], [use a specific wish])],
         WISH=$withval,)
     if test "x$WISH" = "x"; then
-        AC_PATH_PROG(WISH,wish8.4)
+        AC_PATH_PROG(WISH,wish8.5)
         if test "x$WISH" = "x"; then
-    	    AC_PATH_PROG(WISH,wish8.3)
-    	    if test "x$WISH" = "x"; then
-                AC_PATH_PROG(WISH,wish)
+            AC_PATH_PROG(WISH,wish8.4)
+            if test "x$WISH" = "x"; then
+    	        AC_PATH_PROG(WISH,wish8.3)
+    	        if test "x$WISH" = "x"; then
+                    AC_PATH_PROG(WISH,wish)
+                fi
             fi
-        fi
+	fi
     fi
     if test "x$WISH" = "x"; then
         AC_MSG_WARN([Unable to find a wish. The Tk packages will not be built])