From b9b1fd4e223d0eaf6252899e2da6b6359090b0fb Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Tue, 2 May 2006 05:50:38 +0000
Subject: [PATCH] Don't build a built-in GUI with --enable-standalone-gui was
 requested

---
 SheepShaver/src/Unix/Makefile.in  | 4 ++--
 SheepShaver/src/Unix/configure.ac | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/SheepShaver/src/Unix/Makefile.in b/SheepShaver/src/Unix/Makefile.in
index c4ceb15e..96a55f87 100644
--- a/SheepShaver/src/Unix/Makefile.in
+++ b/SheepShaver/src/Unix/Makefile.in
@@ -73,10 +73,10 @@ GUI_APP = SheepShaverGUI
 GUI_APP_EXE = $(GUI_APP)$(EXEEXT)
 GUI_APP_APP = $(GUI_APP).app
 PROGS += $(GUI_APP_EXE)
-endif
-
+else
 CXXFLAGS += $(GUI_CFLAGS)
 LIBS += $(GUI_LIBS)
+endif
 
 ## Rules
 .PHONY: modules install uninstall clean distclean depend dep
diff --git a/SheepShaver/src/Unix/configure.ac b/SheepShaver/src/Unix/configure.ac
index 5e836393..b0d6dd12 100644
--- a/SheepShaver/src/Unix/configure.ac
+++ b/SheepShaver/src/Unix/configure.ac
@@ -246,10 +246,8 @@ UISRCS=../dummy/prefs_editor_dummy.cpp
 case "x$WANT_GTK" in
 xgtk2*)
   AM_PATH_GTK_2_0(1.3.15, [
-    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
     GUI_CFLAGS="$GTK_CFLAGS"
     GUI_LIBS="$GTK_LIBS"
-    UISRCS=prefs_editor_gtk.cpp
     WANT_GTK=gtk2
   ], [
     case "x${WANT_GTK}x" in
@@ -267,15 +265,17 @@ xgtk2*)
 esac
 if [[ "x$WANT_GTK" = "xgtk" ]]; then
   AM_PATH_GTK(1.2.0, [
-    AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
     GUI_CFLAGS="$GTK_CFLAGS"
     GUI_LIBS="$GTK_LIBS"
-    UISRCS=prefs_editor_gtk.cpp
   ], [
     AC_MSG_WARN([Could not find GTK+, disabling user interface.])
     WANT_GTK=no
   ])
 fi
+if [[ "x$WANT_GTK" != "xno" -a "x$WANT_STANDALONE_GUI" = "xno" ]]; then
+  AC_DEFINE(ENABLE_GTK, 1, [Define if using GTK.])
+  UISRCS=prefs_editor_gtk.cpp
+fi
 AC_SUBST(GUI_CFLAGS)
 AC_SUBST(GUI_LIBS)