From 1ed744884c88aad42bfb1c79a9e720e99c7a30cc Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sat, 1 Nov 2014 10:13:40 +0000
Subject: [PATCH] Disable enhanced debugger if gui support is not available.

---
 bochs/configure    | 17 ++++++++++-------
 bochs/configure.in | 10 ++++++----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/bochs/configure b/bochs/configure
index 25e615ef3..9de655d0b 100755
--- a/bochs/configure
+++ b/bochs/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 12501 2014-10-14 15:59:10Z sshwarts .
+# From configure.in Id: configure.in 12505 2014-10-15 08:04:38Z sshwarts .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -22432,8 +22432,6 @@ if test "${enable_debugger_gui+set}" = set; then :
   enableval=$enable_debugger_gui; if test "$enableval" = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-    $as_echo "#define BX_DEBUGGER_GUI 1" >>confdefs.h
-
     gui_debugger=1
    else
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -22447,8 +22445,6 @@ else
     if test "$bx_debugger" = 1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-      $as_echo "#define BX_DEBUGGER_GUI 1" >>confdefs.h
-
       gui_debugger=1
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -24964,9 +24960,16 @@ esac
 ENH_DBG_OBJS=""
 if test "$gui_debugger" = 1; then
   if test "$needs_gtk2" = 1; then
-     ENH_DBG_OBJS="enh_dbg.o gtk_enh_dbg_osdep.o"
+    ENH_DBG_OBJS="enh_dbg.o gtk_enh_dbg_osdep.o"
+    $as_echo "#define BX_DEBUGGER_GUI 1" >>confdefs.h
+
   elif test "$DEFAULT_GUI" = win32 -o "$with_win32" = yes; then
-     ENH_DBG_OBJS="enh_dbg.o win32_enh_dbg_osdep.o"
+    ENH_DBG_OBJS="enh_dbg.o win32_enh_dbg_osdep.o"
+    $as_echo "#define BX_DEBUGGER_GUI 1" >>confdefs.h
+
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The Bochs debugger gui cannot be compiled here, disabling it" >&5
+$as_echo "$as_me: WARNING: The Bochs debugger gui cannot be compiled here, disabling it" >&2;}
   fi
 fi
 
diff --git a/bochs/configure.in b/bochs/configure.in
index 1b09af933..5faad91eb 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -847,7 +847,6 @@ AC_ARG_ENABLE(debugger-gui,
   AS_HELP_STRING([--enable-debugger-gui], [compile in support for Bochs internal debugger GUI (yes, if debugger is on)]),
   [if test "$enableval" = yes; then
     AC_MSG_RESULT(yes)
-    AC_DEFINE(BX_DEBUGGER_GUI, 1)
     gui_debugger=1
    else
     AC_MSG_RESULT(no)
@@ -857,7 +856,6 @@ AC_ARG_ENABLE(debugger-gui,
   [
     if test "$bx_debugger" = 1; then
       AC_MSG_RESULT(yes)
-      AC_DEFINE(BX_DEBUGGER_GUI, 1)
       gui_debugger=1
     else
       AC_MSG_RESULT(no)
@@ -2634,9 +2632,13 @@ AC_SUBST(CXXFLAGS_CONSOLE)
 ENH_DBG_OBJS=""
 if test "$gui_debugger" = 1; then
   if test "$needs_gtk2" = 1; then
-     ENH_DBG_OBJS="enh_dbg.o gtk_enh_dbg_osdep.o"
+    ENH_DBG_OBJS="enh_dbg.o gtk_enh_dbg_osdep.o"
+    AC_DEFINE(BX_DEBUGGER_GUI, 1)
   elif test "$DEFAULT_GUI" = win32 -o "$with_win32" = yes; then
-     ENH_DBG_OBJS="enh_dbg.o win32_enh_dbg_osdep.o"
+    ENH_DBG_OBJS="enh_dbg.o win32_enh_dbg_osdep.o"
+    AC_DEFINE(BX_DEBUGGER_GUI, 1)
+  else
+    AC_MSG_WARN([The Bochs debugger gui cannot be compiled here, disabling it])
   fi
 fi
 AC_SUBST(ENH_DBG_OBJS)