From 51a5e4c0daff3876f4a467dcc05328495b3a3c76 Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Tue, 2 May 2006 05:36:42 +0000
Subject: [PATCH] Don't build a built-in GUI if --enable-standalone-gui was
 requested.

The following configurations were tested:
./configure --without-mon --with-gtk=gtk1 --enable-jit-compiler	  [B.GTK1]
./configure --without-mon					  [B.GTK2]
./configure --without-mon --enable-standalone-gui --without-gtk	  [no GUI]
./configure --without-mon --enable-standalone-gui --with-gtk=gtk1 [S.GTK1]
./configure --enable-jit-compiler --enable-standalone-gui	  [S.GTK2]
---
 BasiliskII/src/Unix/Makefile.in  | 4 ++--
 BasiliskII/src/Unix/configure.ac | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in
index 9979746f..6ac828a9 100644
--- a/BasiliskII/src/Unix/Makefile.in
+++ b/BasiliskII/src/Unix/Makefile.in
@@ -58,10 +58,10 @@ ifeq ($(STANDALONE_GUI),yes)
 GUI_APP = BasiliskIIGUI
 GUI_APP_APP = $(GUI_APP).app
 PROGS += $(GUI_APP)$(EXEEXT)
-endif
-
+else
 CXXFLAGS += $(GUI_CFLAGS)
 LIBS += $(GUI_LIBS)
+endif
 
 ## Rules
 .PHONY: modules install installdirs uninstall mostlyclean clean distclean depend dep
diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac
index 8e15d18f..e0bd7920 100644
--- a/BasiliskII/src/Unix/configure.ac
+++ b/BasiliskII/src/Unix/configure.ac
@@ -253,10 +253,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
@@ -274,10 +272,8 @@ 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
     dnl somehow, <gnome-i18n.h> would redefine gettext() to nothing if
     dnl ENABLE_NLS is not set, thusly conflicting with C++ <string> which
     dnl includes <libintl.h>
@@ -292,6 +288,10 @@ if [[ "x$WANT_GTK" = "xgtk" ]]; then
     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)