--- configure.orig	Tue Nov 28 16:12:16 2000
+++ configure	Tue Nov 28 16:12:52 2000
@@ -4033,6 +4033,9 @@
 fi
 
 
+if [ x"${HAVE_ESOUND}" != x"yes" ]; then
+  have_esd=no
+fi
 
 if test "x$have_esd" = xyes; then
   HAVE_ESD_TRUE=
@@ -4314,6 +4317,9 @@
   rm -f conf.mikmodtest
 
 
+if [ x"${HAVE_MIKMOD}" != x"yes" ]; then
+  have_mikmod=no
+fi
 
 if test "x$have_mikmod" = xyes; then
   HAVE_MIKMOD_TRUE=
@@ -4574,6 +4580,11 @@
   
   rm -f conf.vorbistest
 
+if [ x"${HAVE_VORBIS}" != x"yes" ]; then
+  have_ogg=no
+  have_vorbis=no
+fi
+
 have_oggvorbis=no
 if test "x$have_ogg" = xyes
 then
@@ -7551,14 +7562,14 @@
 
 if test -n "$GCC"
 then
-	CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -funroll-all-loops -finline-functions -ffast-math"
+	CFLAGS="$CFLAGS -Wall -fomit-frame-pointer -finline-functions -ffast-math"
 fi
 
 arch_type=other
 ARCH_DEFINES=""
 case "$host" in 
 	i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
-		CFLAGS="$CFLAGS -m486"
+		CFLAGS="$CFLAGS"
 		ARCH_DEFINES="-DI386_ASSEM"
 		arch_type=ix86
 	;;
@@ -8315,10 +8326,6 @@
       *) # Relative path.
         ac_sub_cache_file="$ac_dots$cache_file" ;;
       esac
-  case "$ac_given_INSTALL" in
-        [/$]*) INSTALL="$ac_given_INSTALL" ;;
-        *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-        esac
 
       echo "running ${CONFIG_SHELL-/bin/sh} $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_sub_srcdir"
       # The eval makes quoting arguments work.