diff --git a/desmume/configure.ac b/desmume/configure.ac
index 7bebc01a3..68a826a8c 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -171,7 +171,11 @@ AC_SUBST(PO_FILES_IN)
 dnl - Gdb stub
 AC_ARG_ENABLE(gdb-stub,
               [AC_HELP_STRING(--enable-gdb-stub, enable gdb stub)],
-              [AC_DEFINE(GDB_STUB)])
+              [
+			AC_DEFINE(GDB_STUB)
+			wantgdbstub=yes
+		])
+AM_CONDITIONAL([HAVE_GDB_STUB], [test "${wantgdbstub}" = "yes"])
 
 dnl - Compiler warnings
 
diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am
index 35c3f8bc0..e905eb705 100644
--- a/desmume/src/Makefile.am
+++ b/desmume/src/Makefile.am
@@ -1,8 +1,12 @@
 include $(top_srcdir)/src/desmume.mk
 
 EXTRA_DIST = build.bat instruction_tabdef.inc thumb_tabdef.inc fs-linux.cpp fs-windows.cpp
-DIST_SUBDIRS = . gdbstub cli cocoa gtk gtk-glade windows
+if HAVE_GDB_STUB
 SUBDIRS = . gdbstub $(UI_DIR)
+else
+SUBDIRS = . $(UI_DIR)
+endif
+DIST_SUBDIRS = . gdbstub cli cocoa gtk gtk-glade windows
 noinst_LIBRARIES = libdesmume.a
 libdesmume_a_SOURCES = \
         armcpu.cpp armcpu.h ARM9.h \
@@ -28,8 +32,10 @@ libdesmume_a_SOURCES = \
         saves.cpp saves.h \
         SPU.cpp SPU.h \
 	softrender.cpp softrender.h softrender_config.h \
-	gdbstub.h \
 	matrix.cpp matrix.h \
 	gfx3d.cpp gfx3d.h \
         thumb_instructions.cpp thumb_instructions.h types.h
+if HAVE_GDB_STUB
+libdesmume_a_SOURCES += gdbstub.h
+endif
 libdesmume_a_LIBADD = fs-$(desmume_arch).$(OBJEXT)
diff --git a/desmume/src/cli/Makefile.am b/desmume/src/cli/Makefile.am
index 562b278df..fa1fb9d8c 100644
--- a/desmume/src/cli/Makefile.am
+++ b/desmume/src/cli/Makefile.am
@@ -4,4 +4,7 @@ AM_CFLAGS += $(SDL_CFLAGS)
 
 bin_PROGRAMS = desmume-cli
 desmume_cli_SOURCES = main.cpp ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp
-desmume_cli_LDADD = ../libdesmume.a ../gdbstub/libgdbstub.a $(SDL_LIBS)
+desmume_cli_LDADD = ../libdesmume.a $(SDL_LIBS)
+if HAVE_GDB_STUB
+desmume_cli_LDADD += ../gdbstub/libgdbstub.a
+endif
diff --git a/desmume/src/gtk-glade/Makefile.am b/desmume/src/gtk-glade/Makefile.am
index 815a4d8c2..a58f7520b 100644
--- a/desmume/src/gtk-glade/Makefile.am
+++ b/desmume/src/gtk-glade/Makefile.am
@@ -27,6 +27,9 @@ desmume_glade_SOURCES =  \
 	gdk_3Demu.cpp gdk_3Demu.h \
 	../sndsdl.h ../sndsdl.cpp ../ctrlssdl.h ../ctrlssdl.cpp
 
-desmume_glade_LDADD = ../libdesmume.a ../gdbstub/libgdbstub.a \
+desmume_glade_LDADD = ../libdesmume.a \
 			$(SDL_LIBS) $(GTKGLEXT_LIBS) $(LIBGLADE_LIBS) \
 			$(GTHREAD_LIBS)
+if HAVE_GDB_STUB
+desmume_glade_LDADD += ../gdbstub/libgdbstub.a
+endif
diff --git a/desmume/src/gtk/Makefile.am b/desmume/src/gtk/Makefile.am
index 29dfa167b..2c113e343 100644
--- a/desmume/src/gtk/Makefile.am
+++ b/desmume/src/gtk/Makefile.am
@@ -19,5 +19,8 @@ desmume_SOURCES = \
 	../ctrlssdl.h ../ctrlssdl.cpp \
 	gdk_3Demu.cpp gdk_3Demu.h \
 	 main.cpp
-desmume_LDADD = ../libdesmume.a ../gdbstub/libgdbstub.a \
+desmume_LDADD = ../libdesmume.a \
 	$(SDL_LIBS) $(GTK_LIBS) $(GTKGLEXT_LIBS) $(GTHREAD_LIBS)
+if HAVE_GDB_STUB
+desmume_LDADD += ../gdbstub/libgdbstub.a
+endif
diff --git a/desmume/src/windows/Makefile.am b/desmume/src/windows/Makefile.am
index fecea46de..6794d6cc6 100644
--- a/desmume/src/windows/Makefile.am
+++ b/desmume/src/windows/Makefile.am
@@ -20,6 +20,9 @@ desmume_SOURCES = \
 	colorconv.h colorctrl.c colorctrl.h \
 	lightView.c lightView.h \
 	matrixView.c matrixView.h
-desmume_LDADD = ../libdesmume.a yopyop_private.o ../gdbstub/libgdbstub.a
+desmume_LDADD = ../libdesmume.a yopyop_private.o
+if HAVE_GDB_STUB
+desmume_LDADD += ../gdbstub/libgdbstub.a
+endif
 yopyop_private.o: yopyop_private.rc resources.rc resource.h
 	windres yopyop_private.rc -o yopyop_private.o