From 1f641d04d92cff566d01915e043fcdacb21f4405 Mon Sep 17 00:00:00 2001
From: Satoshi Asami <asami@FreeBSD.org>
Date: Mon, 10 Nov 1997 11:42:18 +0000
Subject: Correctly put version info in tcl/tk libraries and header
 directories. Since tk-4.x ends at 4.2, remove check for tk-4.3 and tk-4.4. 
 This should at least make it work for 75/41 and 76/42.  Others are encouraged
 to add support for 80/80.

(fixes) PR:		4965
---
 x11/XFree86/scripts/configure | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'x11/XFree86')

diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index d5d693bbfbc7..fdac66d27e98 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -21,7 +21,7 @@ rm -f $F
 
 # Tk detection
 tkversion=
-for v in 1 2 3 4; do
+for v in 1 2; do
   if [ -f /usr/local/lib/libtk4$v.a ]; then
     tkversion=$v
   fi
@@ -30,12 +30,20 @@ if [ X$tkversion != X ]; then
   echo "Using tk-4.$tkversion"
   echo "#define HasTk			YES" >>$F
   echo "#define TkLibDir		/usr/local/lib" >>$F
-  echo "#define TkIncDir		/usr/local/include" >>$F
+  echo "#define TkIncDir		/usr/local/include/tk4.$tkversion" >>$F
   echo "#define TkLibName		tk4$tkversion" >>$F
   echo "#define HasTcl			YES" >>$F
-  echo "#define TclLibDir		/usr/lib" >>$F
-  echo "#define TclIncDir		/usr/include" >>$F
-  echo "#define TclLibName		tcl75" >>$F
+  echo "#define TclLibDir		/usr/local/lib" >>$F
+  case $tkversion in
+    1)
+      tclversion=5
+      ;;
+    2)
+      tclversion=6
+      ;;
+  esac
+  echo "#define TclIncDir		/usr/local/include/tcl7.$tclversion" >>$F
+  echo "#define TclLibName		tcl7$tclversion" >>$F
 else
 cat <<EOF
 *** I don't see the static library for tk version 4 in /usr/local/lib.
-- 
cgit v1.2.3