diff --git a/bochs/configure b/bochs/configure
index 48c337b3f..a97529b52 100755
--- a/bochs/configure
+++ b/bochs/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in,v 1.155 2002/10/26 21:51:19 bdenney Exp .
+# From configure.in Id: configure.in,v 1.156 2002/10/27 13:28:30 bdenney Exp .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -20515,6 +20515,7 @@ if test "$with_wx" = yes; then
 _ACEOF
 
   SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_WX)"
+  SPECIFIC_GUI_SUPPORT_OBJS="$SPECIFIC_GUI_SUPPORT_OBJS \$(GUI_OBJS_WX_SUPPORT)"
   WX_CFLAGS="\`$WX_CONFIG --cflags\`"
   WX_CXXFLAGS="\`$WX_CONFIG --cxxflags\`"
   GUI_LINK_OPTS_WX="\`$WX_CONFIG --libs\`"
@@ -20582,9 +20583,12 @@ _ACEOF
 fi
 
 if test "$bx_plugins" = 1; then
+  # every item in this list will be compiled as a plugin. Do not include
+  # support objs; they will be mentioned in plugin-specific makefile rules.
   GUI_PLUGIN_OBJS="$GUI_PLUGIN_OBJS $SPECIFIC_GUI_OBJS"
 else
-  GUI_NON_PLUGIN_OBJS="$GUI_NON_PLUGIN_OBJS $SPECIFIC_GUI_OBJS"
+  # include support objs
+  GUI_NON_PLUGIN_OBJS="$GUI_NON_PLUGIN_OBJS $SPECIFIC_GUI_OBJS $SPECIFIC_GUI_SUPPORT_OBJS"
 fi
 
 
diff --git a/bochs/configure.in b/bochs/configure.in
index 2e8e9c7d8..23ac851d1 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -2,7 +2,7 @@ dnl // Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.50)
 AC_INIT(bochs.h)
-AC_REVISION([[$Id: configure.in,v 1.156 2002-10-27 13:28:30 bdenney Exp $]])
+AC_REVISION([[$Id: configure.in,v 1.157 2002-10-28 05:49:42 bdenney Exp $]])
 AC_CONFIG_HEADER(config.h)
 AC_CONFIG_HEADER(ltdlconf.h)
 
@@ -1717,6 +1717,7 @@ if test "$with_wx" = yes; then
   fi
   AC_DEFINE(BX_WITH_WX, 1)
   SPECIFIC_GUI_OBJS="$SPECIFIC_GUI_OBJS \$(GUI_OBJS_WX)"
+  SPECIFIC_GUI_SUPPORT_OBJS="$SPECIFIC_GUI_SUPPORT_OBJS \$(GUI_OBJS_WX_SUPPORT)"
   WX_CFLAGS="\`$WX_CONFIG --cflags\`"
   WX_CXXFLAGS="\`$WX_CONFIG --cxxflags\`"
   GUI_LINK_OPTS_WX="\`$WX_CONFIG --libs\`"
@@ -1775,9 +1776,12 @@ if test "$display_libs" = " wxWindows"; then
 fi
 
 if test "$bx_plugins" = 1; then
+  # every item in this list will be compiled as a plugin. Do not include
+  # support objs; they will be mentioned in plugin-specific makefile rules.
   GUI_PLUGIN_OBJS="$GUI_PLUGIN_OBJS $SPECIFIC_GUI_OBJS"
 else
-  GUI_NON_PLUGIN_OBJS="$GUI_NON_PLUGIN_OBJS $SPECIFIC_GUI_OBJS"
+  # include support objs
+  GUI_NON_PLUGIN_OBJS="$GUI_NON_PLUGIN_OBJS $SPECIFIC_GUI_OBJS $SPECIFIC_GUI_SUPPORT_OBJS"
 fi
 
 AC_SUBST(GUI_CFLAGS)
diff --git a/bochs/gui/Makefile.in b/bochs/gui/Makefile.in
index 0aeac5ecd..065c9119f 100644
--- a/bochs/gui/Makefile.in
+++ b/bochs/gui/Makefile.in
@@ -57,7 +57,8 @@ GUI_OBJS_NOGUI = nogui.o
 GUI_OBJS_TERM  = term.o
 GUI_OBJS_RFB = rfb.o
 GUI_OBJS_AMIGAOS = amigaos.o
-GUI_OBJS_WX = wx.o wxmain.o wxdialog.o
+GUI_OBJS_WX = wx.o
+GUI_OBJS_WX_SUPPORT = wxmain.o wxdialog.o
 OBJS_THAT_CANNOT_BE_PLUGINS = keymap.o gui.o siminterface.o control.o
 OBJS_THAT_CAN_BE_PLUGINS = @GUI_OBJS@
 
@@ -89,15 +90,15 @@ lib%.la: %.lo
 	$(LIBTOOL) $(CXX) -module $< -o $@ -rpath $(PLUGIN_PATH)
 
 # special link rules for plugins that require more than one object file
-libwx.la: $(GUI_OBJS_WX:.o=.lo)
-	$(LIBTOOL) $(CXX) -module $(GUI_OBJS_WX:.o=.lo) -o libwx.la `@WX_CONFIG@ --cxxflags` -rpath $(PLUGIN_PATH)
+libwx.la: $(GUI_OBJS_WX:.o=.lo) $(GUI_OBJS_WX_SUPPORT:.o=.lo)
+	$(LIBTOOL) $(CXX) -module $(GUI_OBJS_WX:.o=.lo) $(GUI_OBJS_WX_SUPPORT:.o=.lo) -o libwx.la `wx-config --cxxflags` -rpath $(PLUGIN_PATH)
 
 #### building DLLs for win32  (tested on cygwin only)
 %.dll: %.o
 	$(CXX) $(CXXFLAGS) -shared -o $@ $< $(WIN32_DLL_IMPORT_LIBRARY) -luser32 -lgdi32 -lcomdlg32 -lcomctl32
 
-wx.dll: $(GUI_OBJS_WX)
-	$(CXX) $(CXXFLAGS) -shared -o wx.dll $(GUI_OBJS_WX) $(WIN32_DLL_IMPORT_LIBRARY) `wx-config --libs` -luser32 -lgdi32 -lcomdlg32 -lcomctl32
+wx.dll: $(GUI_OBJS_WX) $(GUI_OBJS_WX_SUPPORT)
+	$(CXX) $(CXXFLAGS) -shared -o wx.dll $(GUI_OBJS_WX) $(GUI_OBJS_WX_SUPPORT) $(WIN32_DLL_IMPORT_LIBRARY) `wx-config --libs` -luser32 -lgdi32 -lcomdlg32 -lcomctl32
 
 # no need to build DLLs for beos.o
 # no need to build DLLs for x.o