diff --git a/trunk/desmume/configure.ac b/trunk/desmume/configure.ac
index 7723269bc..959fd2f67 100644
--- a/trunk/desmume/configure.ac
+++ b/trunk/desmume/configure.ac
@@ -10,7 +10,7 @@ AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_RANLIB
 
-AC_LANG(C)
+AC_LANG(C++)
 
 AC_C_BIGENDIAN
 
@@ -46,6 +46,8 @@ case $target in
 		;;
 esac
 
+AC_ARG_ENABLE(debug, AC_HELP_STRING(--enable-debug, enable debug information) , AC_DEFINE(DEBUG))
+
 AC_CONFIG_FILES([Makefile
 	src/Makefile
 	src/gtk/Makefile