--- configure.in.orig	2006-04-25 04:44:32.000000000 -0400
+++ configure.in	2006-04-25 05:02:05.000000000 -0400
@@ -15,8 +15,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
@@ -84,7 +82,9 @@
 CFLAGS="$CFLAGS -I$opengl_prefix/include"
 LDFLAGS-"$LDFLAGS -L$opengl_prefix/lib"
 fi
+if test x$x_libraries != x; then
 LDFLAGS="$LDFLAGS -L$x_libraries"
+fi
 AC_CHECK_LIB(GL, glGetError,found_opengl="yes",,)
 if test x$found_opengl = xyes; then
         echo checking for OpenGL... yes
@@ -112,40 +112,25 @@
 	dnl It is actually easier to debug zsnes with no optimization
 	dnl enabled. 
 
-	CFLAGS="$CFLAGS -DDEBUG -O0 -fno-omit-frame-pointer -ggdb3"
+	CFLAGS="$CFLAGS -DDEBUG -fno-omit-frame-pointer -ggdb3"
 	NFLAGS="$NFLAGS -DDEBUG -g -s -O1" dnl -O0 doesnt work
 	ZSNESEXE="zsnesd"
 else
 	AC_MSG_RESULT(no)
 	
-	CFLAGS="$CFLAGS -O3 -ffast-math -fomit-frame-pointer -fexpensive-optimizations -s"
-	NFLAGS="$NFLAGS -O1"
 	ZSNESEXE="zsnes"
-fi
 
-AC_MSG_CHECKING(which processor class to optimize for)
-if test x$debug != xyes; then
-	case "$target" in
-		i486-*-*)
-			CFLAGS="$CFLAGS -march=i486"
-			AC_MSG_RESULT(486)
-			;;
-		i586-*-*)
-			CFLAGS="$CFLAGS -march=pentium"
-			AC_MSG_RESULT(586)
-			;;
-		i686-*-*)
-			CFLAGS="$CFLAGS -march=pentiumpro"
-			dnl CFLAGS="$CFLAGS -march=pentium3 -mmmx -msse -mfpmath=sse,387"
-			AC_MSG_RESULT(686)
-			;;
-		*)
-			AC_MSG_RESULT(386)
-			AC_MSG_WARN(*** This is probably not what you want use --target)
-			;;
-	esac
-else
-	AC_MSG_RESULT(no optimization because debug enabled)
+	AC_ARG_ENABLE(release, [  --enable-release        Build ultra-optimized binary (zsnes) ],release=$enableval)
+	AC_MSG_CHECKING(if you want crazy optimizations)
+
+	if test x$release = xyes; then
+		AC_MSG_RESULT(yes)
+		NFLAGS="$NFLAGS -O99999999"
+	else
+		AC_MSG_RESULT(no)
+		NFLAGS="$NFLAGS -O1"
+	fi
+
 fi
 
 dnl Checks for header files.