diff --git a/desmume/configure.ac b/desmume/configure.ac
index 386967996..87e4d00cc 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -166,8 +166,10 @@ if test "x$HAVE_ALSA" = "xno"; then
    AC_DEFINE([FAKE_MIC])
 fi
 
-dnl - disabled until it compiles
-AM_CONDITIONAL([HAVE_LIBAGG], [test "${HAVE_LIBAGG}x" = "yes"])
+AM_CONDITIONAL([HAVE_LIBAGG], [test "${HAVE_LIBAGG}" = "yes"])
+if test "x$HAVE_LIBAGG" = "xyes"; then
+   AC_DEFINE([HAVE_LIBAGG])
+fi
 
 dnl - set conditional for glib, needed to avoid commandline.cpp compilation for cli frontend since it depends on glib
 AM_CONDITIONAL([HAVE_GLIB], [test "${FOUND_GLIB}" = "yes"])
diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index 8e9d3da7c..0bdefac39 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -19,7 +19,6 @@ libdesmume_a_SOURCES = \
 	debug.cpp debug.h driver.h \
 	Disassembler.cpp Disassembler.h \
 	dscard.h fat.h FIFO.cpp FIFO.h \
-	GPU_osd.cpp GPU_osd.h \
 	GPU.cpp GPU.h \
 	GPU_osd.cpp GPU_osd.h \
         mem.h mc.cpp mc.h \
@@ -48,8 +47,8 @@ libdesmume_a_SOURCES = \
 	addons/compactFlash.cpp addons/gbagame.cpp addons/none.cpp addons/rumblepak.cpp addons/guitarGrip.cpp fs.h \
 	cheatSystem.cpp cheatSystem.h \
 	texcache.cpp texcache.h rasterize.cpp rasterize.h \
-	version.h \
-	aggdraw.cpp
+	version.h
+
 if HAVE_GLIB
 libdesmume_a_SOURCES += commandline.h commandline.cpp
 endif
@@ -59,7 +58,7 @@ else
 libdesmume_a_SOURCES += mic.cpp
 endif
 if HAVE_LIBAGG
-
+libdesmume_a_SOURCES += aggdraw.cpp
 endif
 if HAVE_LUA
 libdesmume_a_SOURCES += lua-engine.cpp