--- configure.in.orig	2006-02-26 21:37:08.000000000 -0500
+++ configure.in	2006-04-25 03:00:21.000000000 -0400
@@ -17,8 +17,6 @@
 dnl Mingw, because it doesnt have a standard file tree. Maybe if ming do this
 dnl else do -I/usr/include. Or some shit. You figure it out.
 
-LDFLAGS="$LDFLAGS -L/usr/local/lib -L/usr/lib"
-
 dnl -- Same thing here.
 
 AC_CANONICAL_SYSTEM
@@ -112,7 +110,7 @@
   AC_MSG_RESULT(yes)
 
   dnl It is easier to debug zsnes with no optimization enabled.
-  CFLAGS="$CFLAGS -Wall -W -DDEBUG -O0 -fno-omit-frame-pointer -gstabs3"
+  CFLAGS="$CFLAGS -Wall -W -DDEBUG -fno-omit-frame-pointer -gstabs3"
   NFLAGS="$NFLAGS -DDEBUG -g -F stabs -s -O0"
   ZSNESEXE="zsnesd"
 else
@@ -124,11 +122,9 @@
 
   if test x$release = xyes; then
     AC_MSG_RESULT(yes)
-    CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -fprefetch-loop-arrays -fforce-addr -s"
     NFLAGS="$NFLAGS -O99999999"
   else
     AC_MSG_RESULT(no)
-    CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -s"
     NFLAGS="$NFLAGS -O1"
   fi
 
@@ -136,37 +132,6 @@
   CFLAGS="$CFLAGS -m32" dnl 64 bit cpus must use that for the arch detector
   AM_ARCH_DETECT()
   CFLAGS="$CFLAGSBAK"
-
-  AC_MSG_CHECKING(which cpu architecture to optimize for)
-  if test x$ARCH_INFO = x ; then
-    case "$target" in
-      x86_64-*-* | x86_64-*-*-*)
-        AC_MSG_RESULT(guessing x86-64)
-        CFLAGS="$CFLAGS -march=x86-64"
-        X8664="true"
-        ;;
-      i686-*-*)
-        AC_MSG_RESULT(guessing i686)
-        CFLAGS="$CFLAGS -march=i686"
-        ;;
-      i586-*-*)
-        AC_MSG_RESULT(guessing i586)
-        CFLAGS="$CFLAGS -march=i586"
-        ;;
-      i486-*-*)
-        AC_MSG_RESULT(guessing i486)
-        CFLAGS="$CFLAGS -march=i486"
-        ;;
-      *)
-        AC_MSG_RESULT(guessing i386)
-        CFLAGS="$CFLAGS -march=i386"
-        AC_MSG_WARN(*** This is probably not what you want *** use --target)
-        ;;
-    esac
-  else
-    AC_MSG_RESULT($ARCH_INFO)
-    CFLAGS="$CFLAGS -march=$ARCH_INFO"
-  fi
 fi
 CXXFLAGS="$CFLAGS -fno-rtti"
 PSRFLAGS="-D__UNIXSDL__"