Built XF86Setup only if tk4.2/tcl7.6 is there. Other versions do not seem to

work.

6 files changed, 24 insertions, 18 deletions

diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure
index 24ae1683d3b4..fcc38caf0028 100644
--- a/x11-servers/XFree86-4-Server-snap/scripts/configure
+++ b/x11-servers/XFree86-4-Server-snap/scripts/configure
@@ -21,7 +21,8 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 1 2; do
+###### only tk 4.2/tcl 7.6 is known to work
+for v in 2; do
   if [ -f /usr/local/lib/libtk4$v.a ]; then
     tkversion=$v
   fi
@@ -46,9 +47,9 @@ if [ X$tkversion != X ]; then
   echo "#define TclLibName		tcl7$tclversion" >>$F
 else
 cat <<EOF
-*** I don't see the static library for tk version 4 in /usr/local/lib.
+*** I don't see the static library for tk version 4.2 in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk first.
+*** install tk 4.2 first.
 
 EOF
 fi
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index 24ae1683d3b4..fcc38caf0028 100644
--- a/x11-servers/XFree86-4-Server/scripts/configure
+++ b/x11-servers/XFree86-4-Server/scripts/configure
@@ -21,7 +21,8 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 1 2; do
+###### only tk 4.2/tcl 7.6 is known to work
+for v in 2; do
   if [ -f /usr/local/lib/libtk4$v.a ]; then
     tkversion=$v
   fi
@@ -46,9 +47,9 @@ if [ X$tkversion != X ]; then
   echo "#define TclLibName		tcl7$tclversion" >>$F
 else
 cat <<EOF
-*** I don't see the static library for tk version 4 in /usr/local/lib.
+*** I don't see the static library for tk version 4.2 in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk first.
+*** install tk 4.2 first.
 
 EOF
 fi
diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure
index 24ae1683d3b4..fcc38caf0028 100644
--- a/x11/XFree86-4-clients/scripts/configure
+++ b/x11/XFree86-4-clients/scripts/configure
@@ -21,7 +21,8 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 1 2; do
+###### only tk 4.2/tcl 7.6 is known to work
+for v in 2; do
   if [ -f /usr/local/lib/libtk4$v.a ]; then
     tkversion=$v
   fi
@@ -46,9 +47,9 @@ if [ X$tkversion != X ]; then
   echo "#define TclLibName		tcl7$tclversion" >>$F
 else
 cat <<EOF
-*** I don't see the static library for tk version 4 in /usr/local/lib.
+*** I don't see the static library for tk version 4.2 in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk first.
+*** install tk 4.2 first.
 
 EOF
 fi
diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure
index 24ae1683d3b4..fcc38caf0028 100644
--- a/x11/XFree86-4-libraries/scripts/configure
+++ b/x11/XFree86-4-libraries/scripts/configure
@@ -21,7 +21,8 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 1 2; do
+###### only tk 4.2/tcl 7.6 is known to work
+for v in 2; do
   if [ -f /usr/local/lib/libtk4$v.a ]; then
     tkversion=$v
   fi
@@ -46,9 +47,9 @@ if [ X$tkversion != X ]; then
   echo "#define TclLibName		tcl7$tclversion" >>$F
 else
 cat <<EOF
-*** I don't see the static library for tk version 4 in /usr/local/lib.
+*** I don't see the static library for tk version 4.2 in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk first.
+*** install tk 4.2 first.
 
 EOF
 fi
diff --git a/x11/XFree86-4/scripts/configure b/x11/XFree86-4/scripts/configure
index 24ae1683d3b4..fcc38caf0028 100644
--- a/x11/XFree86-4/scripts/configure
+++ b/x11/XFree86-4/scripts/configure
@@ -21,7 +21,8 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 1 2; do
+###### only tk 4.2/tcl 7.6 is known to work
+for v in 2; do
   if [ -f /usr/local/lib/libtk4$v.a ]; then
     tkversion=$v
   fi
@@ -46,9 +47,9 @@ if [ X$tkversion != X ]; then
   echo "#define TclLibName		tcl7$tclversion" >>$F
 else
 cat <<EOF
-*** I don't see the static library for tk version 4 in /usr/local/lib.
+*** I don't see the static library for tk version 4.2 in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk first.
+*** install tk 4.2 first.
 
 EOF
 fi
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index 24ae1683d3b4..fcc38caf0028 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -21,7 +21,8 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 1 2; do
+###### only tk 4.2/tcl 7.6 is known to work
+for v in 2; do
   if [ -f /usr/local/lib/libtk4$v.a ]; then
     tkversion=$v
   fi
@@ -46,9 +47,9 @@ if [ X$tkversion != X ]; then
   echo "#define TclLibName		tcl7$tclversion" >>$F
 else
 cat <<EOF
-*** I don't see the static library for tk version 4 in /usr/local/lib.
+*** I don't see the static library for tk version 4.2 in /usr/local/lib.
 *** XF86Setup will not be installed. If you want to build this program
-*** install tk first.
+*** install tk 4.2 first.
 
 EOF
 fi