Index: scripts/configure
===================================================================
RCS file: /home/ncvs/ports/x11/XFree86/scripts/configure,v
retrieving revision 1.55
diff -u -r1.55 configure
--- scripts/configure	2000/01/17 16:58:46	1.55
+++ scripts/configure	2000/02/05 20:02:55
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 yesno () {
+  if [ x$RELEASE_XFREE_BUILD = x ]; then
   answ=X;
   while [ $answ = X ]; do
     echo -n "$1 [YES] "
@@ -14,8 +15,13 @@
       ;;
     esac
   done
+  else
+  answ="YES";
+  fi
 }
 noyes() {
+  if [ x$RELEASE_XFREE_BUILD = x ]; then
+  answ=X;
   answ=X;
   while [ $answ = X ]; do
     echo -n "$1 [NO] "
@@ -29,6 +35,9 @@
       ;;
     esac
   done
+  else
+  answ="YES";
+  fi
 }
 F=$WRKDIR/.config
 configure () {
@@ -128,7 +137,7 @@
   echo "*** then you must build the VGA server"
 fi
 # force the compilation of the EGC server for pc98.
-if [ X"${MACHINE}" = X"pc98" ]; then
+if [ X"${MACHINE}" = X"pc98" -o x$RELEASE_XFREE_BUILD != x ]; then
     echo "#define BuildPC98Servers	YES"  >>$F
     echo "#undef XF98EGCServer"           >>$F
     echo "#define XF98EGCServer     YES"  >>$F
@@ -140,14 +149,8 @@
 	echo "#undef XF98${i}Server"           >>$F
 	echo "#define XF98${i}Server   $answ"  >>$F
     done
-    echo "#undef XF86SVGAServer"           >>$F
-    echo "#define XF86SVGAServer     NO"  >>$F
-    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
-    for i in $servers; do
-	echo "#undef XF86${i}Server"           >>$F
-    echo "#define XF86${i}Server   NO"  >>$F
-    done
-elif [ X"${MACHINE}" = X"alpha" ]; then
+fi
+if [ X"${MACHINE}" = X"alpha" ]; then
 # force the compilation of the SVGA server.
     echo "#undef XF86SVGAServer"           >>$F
     echo "#define XF86SVGAServer     YES"  >>$F
@@ -159,7 +162,8 @@
 	echo "#undef XF86${i}Server"           >>$F
 	echo "#define XF86${i}Server   $answ"  >>$F
     done
-else
+fi
+if [ X"${MACHINE}" = X"i386" ]; then
 # force the compilation of the SVGA server.
     echo "#undef XF86SVGAServer"           >>$F
     echo "#define XF86SVGAServer     YES"  >>$F
@@ -173,11 +177,28 @@
     done
 fi
 
+#
+# Deny building i386 servers if running for pc98
+#
+if [ X"${MACHINE}" = X"pc98" ]; then
+    echo "#undef XF86SVGAServer"           >>$F
+    echo "#define XF86SVGAServer     NO"  >>$F
+    servers="VGA16 VGA16Dual Mono MonoDual S3 S3V I8514 Mach8 Mach32 Mach64 P9000 AGX  W32 I128 GLINT"
+    for i in $servers; do
+	echo "#undef XF86${i}Server"           >>$F
+    echo "#define XF86${i}Server   NO"  >>$F
+    done
+fi
+
 echo
 ok=0
 while [ $ok != 1 ]; do 
   echo -n "default server to install. [none] "
-  read answ
+  if [ x$RELEASE_XFREE_BUILD = x ]; then
+    read answ
+  else
+    answ=
+  fi
   if [ X$answ = X ]; then answ=none; ok=1; fi
   if [ $answ != none ]; then
     for i in $selected; do if [ $i = $answ ]; then