# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1363898116 0
# Node ID 9c1b4651b731e3d197754b99123d6b584468a79a
# Parent  67e88056ad4f9d63e4819b420c51c4580add8b63
enabled optional profiling.

diff -r 67e88056ad4f -r 9c1b4651b731 configure.ac
--- a/configure.ac	Thu Mar 21 19:38:57 2013 +0000
+++ b/configure.ac	Thu Mar 21 20:35:16 2013 +0000
@@ -20,12 +20,22 @@
 
 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])
+                 [VBA_USE_C_CORE=$enableval])
 
 AS_CASE([$VBA_USE_C_CORE],
         [yes], [AM_CXXFLAGS="$AM_CXXFLAGS -DC_CORE"],
 	[no],  [])
 
+AC_ARG_ENABLE(profiling,
+  AC_HELP_STRING([--enable-profiling],[enable profiling (default is yes)]),
+  , enable_profiling=yes)
+
+AS_CASE([$enable_profiling],
+        [yes], [AM_CXXFLAGS="$AM_CXXFLAGS -DPROFILING" 
+	        VBA_SRC_EXTRA="$VBA_SRC_EXTRA prof" 
+                VBA_LIBS="$VBA_LIBS ../prof/libprof.a"],
+        [no],  [])
+
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
@@ -36,7 +46,6 @@
 AC_PROG_MKDIR_P
 AC_PATH_PROG(NASM, nasm)
 
-
 # Checks for libraries.
 AC_CHECK_LIB(z, gzopen,
   , AC_MSG_ERROR([*** Cannot compile without zlib.]))
@@ -98,6 +107,9 @@
 		 src/sdl/Makefile])
 
 AC_SUBST([AM_CXXFLAGS])
+AC_SUBST([VBA_SRC_EXTRA])
+AC_SUBST([VBA_LIBS])
+
 
 AC_OUTPUT
 
@@ -105,6 +117,8 @@
 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"
+echo "enable_profiling= $enable_profiling"
+echo "VBA_SRC_EXTRA= $VBA_SRC_EXTRA"
+echo "VBA_LIBS= $VBA_LIBS"
diff -r 67e88056ad4f -r 9c1b4651b731 src/Makefile.am
--- a/src/Makefile.am	Thu Mar 21 19:38:57 2013 +0000
+++ b/src/Makefile.am	Thu Mar 21 20:35:16 2013 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = SFMT lua gb gba common filters prof sdl
+SUBDIRS = SFMT lua gb gba common filters @VBA_SRC_EXTRA@ sdl
 
 dist_sysconf_DATA = VisualBoyAdvance.cfg
 
diff -r 67e88056ad4f -r 9c1b4651b731 src/gba/Makefile.am
--- a/src/gba/Makefile.am	Thu Mar 21 19:38:57 2013 +0000
+++ b/src/gba/Makefile.am	Thu Mar 21 20:35:16 2013 +0000
@@ -45,4 +45,4 @@
 	-DSDL				\
 	-DSYSCONFDIR=\"$(sysconfdir)\"
 
-AM_CXXFLAGS = -fno-exceptions 
+AM_CXXFLAGS = @AM_CXXFLAGS@ -fno-exceptions 
diff -r 67e88056ad4f -r 9c1b4651b731 src/sdl/Makefile.am
--- a/src/sdl/Makefile.am	Thu Mar 21 19:38:57 2013 +0000
+++ b/src/sdl/Makefile.am	Thu Mar 21 20:35:16 2013 +0000
@@ -32,7 +32,7 @@
 	../gba/libgba.a		\
 	../filters/lib386.a 	\
 	../filters/libfilter.a	\
-	../prof/libprof.a	\
+	@VBA_LIBS@		\
 	../lua/libgblua.a       
 
 # TestEmu_SOURCES = \