summaryrefslogtreecommitdiff
path: root/x11-servers
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>1999-09-02 02:39:17 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>1999-09-02 02:39:17 +0000
commit181cde1f812091716a341b10c1f01a4e5510f721 (patch)
tree5d65c2f81be5d1a63be1bfe1749e5d45a96af1bf /x11-servers
parentUpgrade to 3.3.5 (diff)
Upgrade to 3.3.5
Allow compilation of XF86Setup with tcl/tk 8.1
Notes
Notes: svn path=/head/; revision=21187
Diffstat (limited to 'x11-servers')
-rw-r--r--x11-servers/XFree86-4-Server-snap/scripts/configure9
-rw-r--r--x11-servers/XFree86-4-Server/scripts/configure9
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 e19c0c5e5310..ad5fabce1e19 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; do
+for v in 42 80 81; do
if [ -f /usr/local/lib/libtk$v.a ]; then
tkversion=$v
case $tkversion in
@@ -50,6 +50,11 @@ for v in 42 80; do
tclLversion=8.0
tkLversion=8.0
;;
+ 81)
+ tclversion=81
+ tclLversion=8.1
+ tkLversion=8.1
+ ;;
esac
fi
done
@@ -161,7 +166,7 @@ else
cat >> $F <<END
#define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 compaq mga oak al2101 ali \
- cl64xx video7 ark mx realtek apm s3v \
+ cl64xx video7 ark mx realtek apm s3_savage s3v \
s3_svga neo chips cyrix rendition p9x00 \
spc8110 i740 tdfx generic
diff --git a/x11-servers/XFree86-4-Server/scripts/configure b/x11-servers/XFree86-4-Server/scripts/configure
index e19c0c5e5310..ad5fabce1e19 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; do
+for v in 42 80 81; do
if [ -f /usr/local/lib/libtk$v.a ]; then
tkversion=$v
case $tkversion in
@@ -50,6 +50,11 @@ for v in 42 80; do
tclLversion=8.0
tkLversion=8.0
;;
+ 81)
+ tclversion=81
+ tclLversion=8.1
+ tkLversion=8.1
+ ;;
esac
fi
done
@@ -161,7 +166,7 @@ else
cat >> $F <<END
#define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
cirrus ncr77c22 compaq mga oak al2101 ali \
- cl64xx video7 ark mx realtek apm s3v \
+ cl64xx video7 ark mx realtek apm s3_savage s3v \
s3_svga neo chips cyrix rendition p9x00 \
spc8110 i740 tdfx generic