From af8f4e56deb437b4a957cc7007b4efe97f47d1b1 Mon Sep 17 00:00:00 2001
From: Bryce Denney <bryce@tlw.com>
Date: Thu, 21 Mar 2002 02:50:06 +0000
Subject: [PATCH] - clean up .conf files.  now all have cdrom, sound, ne2k, and
 vbe.

---
 bochs/.conf.linux        | 13 ++++++++++---
 bochs/.conf.win32-cygwin |  5 ++++-
 bochs/.conf.win32-vcpp   | 18 ++++++++----------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/bochs/.conf.linux b/bochs/.conf.linux
index df9d5bb0c..2ad47d8a0 100755
--- a/bochs/.conf.linux
+++ b/bochs/.conf.linux
@@ -1,7 +1,8 @@
 #!/bin/sh
 #
-# These are the steps I typically use to configure and compile Bochs
-# on a Linux x86 system with gcc
+# .conf.linux
+#
+# This file is used to create the binary RPMs for Linux at release time.
 #
 
 CC="gcc"
@@ -14,7 +15,13 @@ export CXX
 export CFLAGS
 export CXXFLAGS
 
-./configure --enable-fpu --enable-cdrom --enable-sb16=linux  --enable-split-hd  --enable-ne2000 ${CONFIGURE_ARGS}
+./configure --enable-cdrom \
+            --enable-sb16=linux \
+	    --enable-ne2000 \
+	    --enable-vbe \
+	    ${CONFIGURE_ARGS}
+
+
 #./configure --enable-fpu
 #./configure
 #./configure --enable-cdrom --enable-cpu-level=4
diff --git a/bochs/.conf.win32-cygwin b/bochs/.conf.win32-cygwin
index aa7f06bf5..17c7eab07 100755
--- a/bochs/.conf.win32-cygwin
+++ b/bochs/.conf.win32-cygwin
@@ -14,4 +14,7 @@ export CXX
 export CFLAGS
 export CXXFLAGS
 
-./configure --enable-cdrom --enable-sb16=win --enable-vbe
+./configure --enable-cdrom \
+            --enable-sb16=win \
+	    --enable-ne2000 \
+	    --enable-vbe
diff --git a/bochs/.conf.win32-vcpp b/bochs/.conf.win32-vcpp
index 4f7b7104a..b8a1685df 100755
--- a/bochs/.conf.win32-vcpp
+++ b/bochs/.conf.win32-vcpp
@@ -1,25 +1,23 @@
 #!/bin/sh
 
-# This configure file should be used for Win32 systems using MS Visual C++ 5.0
-# I first untar/gzip the source on a unix machine.  Run this script
-# to generate the Makefile's and config.h file.  Then copy everything
-# over to your Win32/Visual C++ system.
-
 set echo
 
-# bbd: I removed the explicit settings for CC,CFLAGS, etc.  
-#      Just let configure choose the compiler on the configure platform.
-
 #./configure --with-win32-vcpp --enable-port-e9-hack
 #./configure --with-win32-vcpp --enable-debugger --enable-disasm --enable-instrumentation="instrument/example0"
 #./configure --with-win32-vcpp --enable-debugger --enable-disasm
 #./configure --with-win32-vcpp --enable-disasm
 
-./configure --target=pentium-windows --enable-cdrom --enable-sb16=win --enable-ne2000 --enable-cpp --disable-readline
+./configure --target=pentium-windows \
+            --enable-cdrom \
+	    --enable-sb16=win \
+	    --enable-ne2000 \
+	    --enable-vbe \
+	    --enable-cpp \
+	    --disable-readline
 
 unset echo
 
-
+# Fix up all makefiles so that nmake can handle them.
 for i in `find . -name Makefile`; do
   echo Removing curly brackets in $i for NMAKE.
   mv $i $i.tmp