From 8e77431249a6351d09ad472dfdbd9fe33b4e1d1b Mon Sep 17 00:00:00 2001
Message-Id: <8e77431249a6351d09ad472dfdbd9fe33b4e1d1b.1715429496.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Thu, 25 Mar 1999 23:36:10 +0000
Subject: [PATCH] Compile to nothing in absence of GTK, for the benefit of
 parent packages which contain non-GTK-dependent parts.
Organization: Straylight/Edgeware

From: mdw <mdw>

---
 cancel.c     | 12 +++++++++++-
 configure.in | 11 ++++++++---
 mdwfocus.c   | 12 +++++++++++-
 msg.c        | 12 +++++++++++-
 4 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/cancel.c b/cancel.c
index c7605dd..d29b823 100644
--- a/cancel.c
+++ b/cancel.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: cancel.c,v 1.1 1998/12/11 09:44:21 mdw Exp $
+ * $Id: cancel.c,v 1.2 1999/03/25 23:36:07 mdw Exp $
  *
  * Handle Escape keypresses, directing them to cancel buttons
  *
@@ -29,11 +29,17 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: cancel.c,v $
+ * Revision 1.2  1999/03/25 23:36:07  mdw
+ * Compile to nothing in absence of GTK, for the benefit of parent packages
+ * which contain non-GTK-dependent parts.
+ *
  * Revision 1.1  1998/12/11 09:44:21  mdw
  * Initial version.
  *
  */
 
+#ifdef HAVE_GTK
+
 /*----- Header files ------------------------------------------------------*/
 
 #include <gtk/gtk.h>
@@ -73,3 +79,7 @@ void cancel(GtkWindow *win, GtkWidget *w)
 }
 
 /*----- That's all, folks -------------------------------------------------*/
+
+#else
+  int mgLib_cancel = 0;
+#endif
diff --git a/configure.in b/configure.in
index 5f71233..4ed3643 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl -*-fundamental-*-
 dnl
-dnl $Id: configure.in,v 1.3 1999/03/24 22:22:59 mdw Exp $
+dnl $Id: configure.in,v 1.4 1999/03/25 23:36:08 mdw Exp $
 dnl
 dnl Configuration script for mgLib
 dnl
@@ -28,6 +28,10 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 dnl ----- Revision history --------------------------------------------------
 dnl
 dnl $Log: configure.in,v $
+dnl Revision 1.4  1999/03/25 23:36:08  mdw
+dnl Compile to nothing in absence of GTK, for the benefit of parent packages
+dnl which contain non-GTK-dependent parts.
+dnl
 dnl Revision 1.3  1999/03/24 22:22:59  mdw
 dnl Remove redundant call to AC_PROG_INSTALL.
 dnl
@@ -47,8 +51,9 @@ AC_CHECK_PROG(AR, ar, ar)
 AC_PROG_RANLIB
 
 AM_PATH_GTK(1.0.0,
-            [LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS"],
-            [AC_MSG_ERROR([couldn't find GTK])])
+            [LIBS="$LIBS $GTK_LIBS" CFLAGS="$CFLAGS $GTK_CFLAGS"
+	     AC_DEFINE(HAVE_GTK)],
+            [AC_MSG_WARN([couldn't find GTK])])
 
 mdw_OPT_mLib_DEBUG(mgLib)
 
diff --git a/mdwfocus.c b/mdwfocus.c
index 918d751..b238e50 100644
--- a/mdwfocus.c
+++ b/mdwfocus.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: mdwfocus.c,v 1.1 1998/12/11 09:44:21 mdw Exp $
+ * $Id: mdwfocus.c,v 1.2 1999/03/25 23:36:09 mdw Exp $
  *
  * Tell my hacked `fvwm' to focus this window
  *
@@ -29,11 +29,17 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: mdwfocus.c,v $
+ * Revision 1.2  1999/03/25 23:36:09  mdw
+ * Compile to nothing in absence of GTK, for the benefit of parent packages
+ * which contain non-GTK-dependent parts.
+ *
  * Revision 1.1  1998/12/11 09:44:21  mdw
  * Initial version.
  *
  */
 
+#ifdef HAVE_GTK
+
 /*----- Header files ------------------------------------------------------*/
 
 #include <gtk/gtk.h>
@@ -67,3 +73,7 @@ void mdwfocus(GtkWidget *w)
 }
 
 /*----- That's all, folks -------------------------------------------------*/
+
+#else
+  int mgLib_mdwfocus = 0;
+#endif
diff --git a/msg.c b/msg.c
index 2ff0548..ff317e9 100644
--- a/msg.c
+++ b/msg.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: msg.c,v 1.2 1998/12/15 23:48:06 mdw Exp $
+ * $Id: msg.c,v 1.3 1999/03/25 23:36:10 mdw Exp $
  *
  * Display a message and get an answer
  *
@@ -29,6 +29,10 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: msg.c,v $
+ * Revision 1.3  1999/03/25 23:36:10  mdw
+ * Compile to nothing in absence of GTK, for the benefit of parent packages
+ * which contain non-GTK-dependent parts.
+ *
  * Revision 1.2  1998/12/15 23:48:06  mdw
  * Use `dstr_putf' for formatting, rather than `sprintf'.
  *
@@ -37,6 +41,8 @@
  *
  */
 
+#ifdef HAVE_GTK
+
 /*----- Header files ------------------------------------------------------*/
 
 #include <stdarg.h>
@@ -176,3 +182,7 @@ int msg(const char *buttons, const char *msg, ...)
 }
 
 /*----- That's all, folks -------------------------------------------------*/
+
+#else
+  int mgLib_msg = 0;
+#endif
-- 
[mdw]