summaryrefslogtreecommitdiff
path: root/x11/XFree86/scripts
diff options
context:
space:
mode:
authorJean-Marc Zucconi <jmz@FreeBSD.org>1998-03-08 17:14:39 +0000
committerJean-Marc Zucconi <jmz@FreeBSD.org>1998-03-08 17:14:39 +0000
commit0fd4c68036c423a0bb43aabe75c5c65baa9b41b3 (patch)
tree9bd6f557bcb643bd0858cd6810a905233ad4e48c /x11/XFree86/scripts
parentFix things so it packages. (diff)
Upgrade to version 3.3.2.
Notes
Notes: svn path=/head/; revision=10075
Diffstat (limited to 'x11/XFree86/scripts')
-rw-r--r--x11/XFree86/scripts/configure32
1 files changed, 21 insertions, 11 deletions
diff --git a/x11/XFree86/scripts/configure b/x11/XFree86/scripts/configure
index fdac66d27e98..24ae1683d3b4 100644
--- a/x11/XFree86/scripts/configure
+++ b/x11/XFree86/scripts/configure
@@ -65,28 +65,38 @@ fi
echo "#undef XF86SVGAServer" >>$F
echo "#define XF86SVGAServer YES" >>$F
servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX W32 I128"
+selected=SVGA
for i in $servers; do
yesno "Do you want to build the $i server? [YES] "
+ if [ $answ = YES ]; then selected="$selected $i"; fi
echo "#undef XF86${i}Server" >>$F
echo "#define XF86${i}Server $answ" >>$F
done
echo
-echo -n "default server to install. [none] "
-read answ
-if [ X$answ = X ]; then answ=none; fi
-if [ $answ != none ]; then
- echo "#define ServerToInstall XF86_$answ" >>$F
-fi
-
+ok=0
+while [ $ok != 1 ]; do
+ echo -n "default server to install. [none] "
+ read answ
+ if [ X$answ = X ]; then answ=none; ok=1; fi
+ if [ $answ != none ]; then
+ for i in $selected; do if [ $i = $answ ]; then
+ ok=1
+ echo "#define ServerToInstall XF86_$answ" >>$F
+ fi
+ done
+ fi
+ if [ $ok = 0 ]; then echo you must choose a server among $selected; fi
+done
echo
yesno "Do you want to build Xvfb? [YES] "
echo "#define XVirtualFramebufferServer $answ" >>$F
cat >> $F <<END
-#define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
- cirrus ncr77c22 mga oak al2101 ali cl64xx \
- video7 chips ark mx realtek apm s3v generic
+#define XF86SvgaDrivers nv et4000 et3000 pvga1 gvga ati sis tvga8900 \
+ cirrus ncr77c22 compaq mga oak al2101 ali \
+ cl64xx video7 ark mx realtek apm \
+ s3v s3_svga chips generic
#define XF86Vga16Drivers et4000 et3000 ncr77c22 ati sis tvga8900 oak \
cl64xx generic
@@ -153,7 +163,7 @@ if [ $answ = NO ]; then
fi
echo
-echo "Build static libraries in addition to shared libraries? [YES] "
+yesno "Build static libraries in addition to shared libraries? [YES] "
if [ $answ = YES ]; then
echo "#define ForceNormalLib YES" >> $F
fi