1 files changed, 12 insertions, 2 deletions
diff --git a/configure b/configure
index 771a7dc13d..958e773d24 100755
--- a/configure
+++ b/configure
@@ -132,6 +132,7 @@ _mt32emu=yes
 _build_hq_scalers=yes
 _build_scalers=yes
 _indeo3=auto
+_enable_prof=no
 # Default vkeybd/keymapper options
 _vkeybd=no
 _keymapper=no
@@ -788,8 +789,7 @@ for ac_option in $@; do
 		_release_build=no
 		;;
 	--enable-profiling)
-		CXXFLAGS="$CXXFLAGS -pg"
-		LDFLAGS="$LDFLAGS -pg"
+		_enable_prof=yes
 		;;
 	--with-sdl-prefix=*)
 		arg=`echo $ac_option | cut -d '=' -f 2`
@@ -2220,6 +2220,16 @@ DEFINES="$DEFINES -DDATA_PATH=\\\"$_datadir/scummvm\\\""
 DEFINES="$DEFINES -DPLUGIN_DIRECTORY=\\\"$_libdir/scummvm\\\""
 
 
+#
+# Set variables for profiling.
+# We need to do it here to prevent mess-ups with the tests e.g. on the PSP
+#
+if test "$_enable_prof" = yes ; then
+	CXXFLAGS="$CXXFLAGS -pg"
+	LDFLAGS="$LDFLAGS -pg"
+	DEFINES="$DEFINES -DENABLE_PROFILING"
+fi
+
 echo_n "Backend... "
 echo_n "$_backend"