--- configure.orig	Thu Sep 21 19:06:59 2000
+++ configure	Thu Sep 21 19:10:00 2000
@@ -4024,7 +4024,9 @@
   echo "$ac_t""no" 1>&6
 fi
 
-
+if [ x"${HAVE_ESD_OVERRIDE}" != x"" ]; then
+  have_esd=no
+fi
 
 if test "x$have_esd" = xyes; then
   HAVE_ESD_TRUE=
@@ -4305,7 +4307,9 @@
   
   rm -f conf.mikmodtest
 
-
+if [ x"${HAVE_MIKMOD_OVERRIDE}" != x"" ]; then
+  have_mikmod=no
+fi
 
 if test "x$have_mikmod" = xyes; then
   HAVE_MIKMOD_TRUE=
@@ -5551,7 +5555,7 @@
   cat conftest.$ac_ext >&5
   rm -rf conftest*
   CATOBJEXT=.mo
-		   DATADIRNAME=lib
+		   DATADIRNAME=share
 fi
 rm -f conftest*
 		INSTOBJEXT=.mo
@@ -7205,7 +7209,7 @@
 ARCH_DEFINES=""
 case "$host" in 
 	i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
-		CFLAGS="$CFLAGS -m486"
+		CFLAGS="$CFLAGS"
 		ARCH_DEFINES="-DI386_ASSEM"
 		arch_type=ix86
 	;;