--- a/configure.in	Wed Nov 21 11:52:13 2007 +0000
+++ b/configure.in	Sat Jan 26 03:45:49 2008 +0000
@@ -8,10 +8,20 @@
 AC_ISC_POSIX
 AC_PROG_CC
 AM_PROG_CC_STDC
+AM_PROG_AS
 AC_HEADER_STDC
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
-
+AC_ARG_ENABLE( trace, 
+   AS_HELP_STRING( [--enable-trace], [Enable generation of IO traces (warning: hurts performance)]),
+   [if test "$enableval" == "yes"; then
+     AC_DEFINE(ENABLE_TRACE_IO, 1, [Enable IO tracing])
+    fi] )
+AC_ARG_ENABLE( watch,
+   AS_HELP_STRING( [--enable-watch], [Enable watchpoints in the debugger (warning: hurts performance)]),
+   [if test "$enableval" == "yes"; then
+     AC_DEFINE(ENABLE_WATCH, 1, [Enable watchpoints])
+   fi] )
 dnl ----------- Check for mandatory dependencies --------------
 dnl Building on MAC?
 AC_CHECK_HEADER([Carbon/Carbon.h], [
@@ -60,6 +70,7 @@
 	echo "Warning: No translator available for $host. Building emulation core only";;
 esac
 AM_CONDITIONAL(BUILD_SH4X86, [test "$SH4_TRANSLATOR" = "x86" -o "$SH4_TRANSLATOR" = "x86_64"])
+AM_CONDITIONAL(BUILD_X86_64, [test "$SH4_TRANSLATOR" = "x86_64"])
 
 dnl ------------------ Optional driver support -------------------
 dnl Check for esound