50 lines
1 KiB
Text
50 lines
1 KiB
Text
--- configure.orig Wed Sep 20 00:30:29 2000
|
|
+++ configure Wed Sep 27 12:22:43 2000
|
|
@@ -4022,7 +4022,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=
|
|
@@ -4303,7 +4305,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=
|
|
@@ -5549,7 +5553,7 @@
|
|
cat conftest.$ac_ext >&5
|
|
rm -rf conftest*
|
|
CATOBJEXT=.mo
|
|
- DATADIRNAME=lib
|
|
+ DATADIRNAME=share
|
|
fi
|
|
rm -f conftest*
|
|
INSTOBJEXT=.mo
|
|
@@ -7171,14 +7175,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
|
|
;;
|