From 87d2d31e5de27f1606b0e7acd20aa538b49adbd8 Mon Sep 17 00:00:00 2001
From: Doug Torrance <dtorrance@piedmont.edu>
Date: Sat, 9 Sep 2017 21:24:28 -0400
Subject: [PATCH] fookb: Remove --enable-wmaker compile-time option.

Now that we use libdockapp's --windowed option to allow users to choose
whether to run fookb as a dockapp or as a normal windowed application at
runtime, the --enable-wmaker option compile time option did very little.

In particular, it used a config file in ~/GNUstep/Defaults and it printed
a warning message when users used large icon files.

We now use the ~/.fookb config file in all instances and always print the
warning message.
---
 fookb/configure.ac | 17 -----------------
 fookb/images.c     |  8 ++------
 fookb/params.h     |  4 ----
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/fookb/configure.ac b/fookb/configure.ac
index ac37c18..58a57f2 100644
--- a/fookb/configure.ac
+++ b/fookb/configure.ac
@@ -19,21 +19,4 @@ PKG_CHECK_MODULES([libXpm], [xpm])
 PKG_CHECK_MODULES([WUtil], [WUtil])
 PKG_CHECK_MODULES([libdockapp], [dockapp])
 
-AC_ARG_ENABLE(
-  [wmaker],
-  [  --enable-wmaker         create windowmaker dockable application],
-  [
-    if test $enable_wmaker = yes ; then
-      AC_DEFINE(WMAKER)
-    fi
-  ],
-  [
-    AC_CHECK_PROG(HAVE_WMAKER, wmaker, yes, no)
-
-    if test $HAVE_WMAKER = yes ; then
-      AC_DEFINE(WMAKER)
-    fi
-  ]
-)
-
 AC_OUTPUT(Makefile)
diff --git a/fookb/images.c b/fookb/images.c
index 21c04e9..f5348d9 100644
--- a/fookb/images.c
+++ b/fookb/images.c
@@ -47,11 +47,9 @@ static int get_one_image(char *name, int index, Display *dpy)
 			lputs("FATAL: Icon1 has zero width!");
 			exit(EXIT_FAILURE);
 		}
-#ifdef WMAKER
 		if (w > 64) {
-			lputs("Warning: Icon width is more than 64. Strange things may happen.");
+			lputs("Warning: Icon width is more than 64. Strange things may happen if using Window Maker.");
 		}
-#endif
 	}
 
 	if (0 == h) {
@@ -60,11 +58,9 @@ static int get_one_image(char *name, int index, Display *dpy)
 			lputs("FATAL: Icon1 had zero height!");
 			exit(EXIT_FAILURE);
 		}
-#ifdef WMAKER
 		if (h > 64) {
-			lputs("Warning: Icon height is more than 64. Strange things may happen.");
+			lputs("Warning: Icon height is more than 64. Strange things may happen if using Window Maker.");
 		}
-#endif
 	}
 
 	if (w != stupid_picture[index]->width) {
diff --git a/fookb/params.h b/fookb/params.h
index d97aa2c..c15652c 100644
--- a/fookb/params.h
+++ b/fookb/params.h
@@ -9,11 +9,7 @@
 #define PARAMS_H
 
 
-#ifdef WMAKER
-#define DEFAULTS_FILE "~/GNUstep/Defaults/FOOkb"
-#else
 #define DEFAULTS_FILE "~/.fookb"
-#endif				/* WMAKER */
 
 char *read_param(char *);
 
-- 
2.11.4.GIT