diff options
| author | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-01-16 23:42:45 +0000 |
|---|---|---|
| committer | Jean-Marc Zucconi <jmz@FreeBSD.org> | 2000-01-16 23:42:45 +0000 |
| commit | be8e2b9ee340bac35bd9e93ceccbd1d616b098c4 (patch) | |
| tree | ec9180664195874d2ea2ff4eb26ce6494a626bc2 /x11-servers | |
| parent | a4c5653368317b2655badd3941fa48682ed74dda (diff) | |
| download | ports-be8e2b9ee340bac35bd9e93ceccbd1d616b098c4.tar.gz ports-be8e2b9ee340bac35bd9e93ceccbd1d616b098c4.zip | |
Revert my previous commit. The problem is not with tcl/tk 8.2
Notes
Notes:
svn path=/head/; revision=24784
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/XFree86-4-Server-snap/scripts/configure | 9 | ||||
| -rw-r--r-- | x11-servers/XFree86-4-Server/scripts/configure | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/x11-servers/XFree86-4-Server-snap/scripts/configure b/x11-servers/XFree86-4-Server-snap/scripts/configure index c9a05b229697..5dcca08200f0 100644 --- a/x11-servers/XFree86-4-Server-snap/scripts/configure +++ b/x11-servers/XFree86-4-Server-snap/scripts/configure @@ -36,7 +36,7 @@ rm -f $F # Tk detection tkversion= -for v in 42 80 81 42jp 80jp; do +for v in 42 80 81 82 42jp 80jp; do if [ -f /usr/local/lib/libtk$v.a ]; then tkversion=$v case $tkversion in @@ -65,6 +65,11 @@ for v in 42 80 81 42jp 80jp; do tclLversion=8.1 tkLversion=8.1 ;; + 82) + tclversion=82 + tclLversion=8.2 + tkLversion=8.2 + ;; esac fi done @@ -108,7 +113,7 @@ else cat <<EOF *** I don't see the static library for tk version $tkversion in /usr/local/lib. *** XF86Setup will not be installed. If you want to build this program -*** install tk 4.2, 8.0 or 8.1 first (does not work with versions 8.2 and 8.3) +*** install tk 4.2 or 8.x first. EOF fi diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure index c9a05b229697..5dcca08200f0 100644 --- a/x11-servers/XFree86-4-Server/scripts/configure +++ b/x11-servers/XFree86-4-Server/scripts/configure @@ -36,7 +36,7 @@ rm -f $F # Tk detection tkversion= -for v in 42 80 81 42jp 80jp; do +for v in 42 80 81 82 42jp 80jp; do if [ -f /usr/local/lib/libtk$v.a ]; then tkversion=$v case $tkversion in @@ -65,6 +65,11 @@ for v in 42 80 81 42jp 80jp; do tclLversion=8.1 tkLversion=8.1 ;; + 82) + tclversion=82 + tclLversion=8.2 + tkLversion=8.2 + ;; esac fi done @@ -108,7 +113,7 @@ else cat <<EOF *** I don't see the static library for tk version $tkversion in /usr/local/lib. *** XF86Setup will not be installed. If you want to build this program -*** install tk 4.2, 8.0 or 8.1 first (does not work with versions 8.2 and 8.3) +*** install tk 4.2 or 8.x first. EOF fi |