# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1363894737 0
# Node ID 67e88056ad4f9d63e4819b420c51c4580add8b63
# Parent  3907aac7df1ce61abf836cbd52280df101aafb4a
c core can now be disabled, and has proper defaults.

diff -r 3907aac7df1c -r 67e88056ad4f configure.ac
--- a/configure.ac	Thu Mar 21 19:06:58 2013 +0000
+++ b/configure.ac	Thu Mar 21 19:38:57 2013 +0000
@@ -5,6 +5,8 @@
 
 AC_CONFIG_AUX_DIR([build-aux])
 
+AC_CANONICAL_TARGET
+
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
 AC_CONFIG_SRCDIR([src/gb/GB.cpp])
@@ -12,11 +14,17 @@
 AC_CONFIG_HEADERS([config.h])
 
 
-#AC_CANONICAL_TARGET
+AS_CASE([$target], 
+        [i?86-*-*], [VBA_USE_C_CORE=no]
+ 	[*]       , [VBA_USE_C_CORE=yes])
 
-dnl AS_CASE([$target], 
-dnl         [i?86-*-*], [VBA_USE_C_CORE=no; VBA_USE_MMX=yes]
-dnl 	[*]       , [VBA_USE_C_CORE=yes; VBA_USE_MMX=no])
+AC_ARG_ENABLE(c-core,
+  AC_HELP_STRING([--enable-c-core],[enable C core (default is no on x86 targets)]),
+  [VBA_USE_C_CORE=$enableval])
+
+AS_CASE([$VBA_USE_C_CORE],
+        [yes], [AM_CXXFLAGS="$AM_CXXFLAGS -DC_CORE"],
+	[no],  [])
 
 # Checks for programs.
 AC_PROG_CXX
@@ -28,6 +36,7 @@
 AC_PROG_MKDIR_P
 AC_PATH_PROG(NASM, nasm)
 
+
 # Checks for libraries.
 AC_CHECK_LIB(z, gzopen,
   , AC_MSG_ERROR([*** Cannot compile without zlib.]))
@@ -88,12 +97,14 @@
 		 src/prof/Makefile
 		 src/sdl/Makefile])
 
-### RLM: investigate this further
-AC_SUBST([AM_CXXFLAGS], [-DC_CORE])
-#AC_SUBST([AM_CXXFLAGS], [-fno-exceptions])
-#CXXFLAGS="$CXXFLAGS -DC_CORE"	
-
-echo "**************************"
-echo $CXXFLAGS
+AC_SUBST([AM_CXXFLAGS])
 
 AC_OUTPUT
+
+
+echo "********   RLM   ****************"
+echo "target= $target"
+echo "VBA_USE_C_CORE= $VBA_USE_C_CORE"
+echo "VBA_USE_MMX= $VBA_USE_MMX"
+echo "AM_CXXFLAGS= $AM_CXXFLAGS"
+echo "enable_c_core= $enable_c_core"