From a9f10420334f17e9c981cde15094b3dd4978183a Mon Sep 17 00:00:00 2001
From: John Ellis <johne@bellatlantic.net>
Date: Thu, 17 Sep 1998 18:26:46 +0000
Subject: [PATCH] Removed conditional build of gmenu since gtk+-1.1 is now a
 requirement.

Thu Sep 17 14:20:05 1998  John Ellis  <johne@bellatlantic.net>

        * configure.in, Makefile.am: Removed conditional build of gmenu since
        gtk+-1.1 is now a requirement.
---
 ChangeLog    |  5 +++++
 Makefile.am  | 10 +++-------
 configure.in |  6 ------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8ccab2060..4a40a61ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 17 14:20:05 1998  John Ellis  <johne@bellatlantic.net>
+
+	* configure.in, Makefile.am: Removed conditional build of gmenu since
+	gtk+-1.1 is now a requirement.
+
 1998-09-11  Alexandre Muniz  <munizao@cyberhighway.net>
 	* configure.in (AC_OUTPUT): Added applets/charpick
 
diff --git a/Makefile.am b/Makefile.am
index 4c01f0375..8c5481d0f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,3 @@
-if PROGRAM_GMENU
-gmenu = gmenu
-endif
-
 if ORBIT_INSTALLED
 control_center = control-center
 capplets = capplets
@@ -11,12 +7,12 @@ endif
 
 always_built_SUBDIRS = \
 	 gsm smproxy pixmaps desktop-links desktop-properties help-browser \
-	 gnome-terminal core-docs 
+	 gnome-terminal core-docs gmenu
 
-sometimes_built_SUBDIRS = panel applets gmenu control-center capplets
+sometimes_built_SUBDIRS = panel applets control-center capplets
 
 SUBDIRS = intl po macros \
-	 $(always_built_SUBDIRS) $(panel) $(applets) $(gmenu) $(control_center) $(capplets)
+	 $(always_built_SUBDIRS) $(panel) $(applets) $(control_center) $(capplets)
 
 #DIST_SUBDIRS = intl po macros $(always_built_SUBDIRS) \
 #	$(sometimes_built_SUBDIRS)
diff --git a/configure.in b/configure.in
index 595bef98d..6a1580cef 100644
--- a/configure.in
+++ b/configure.in
@@ -129,12 +129,6 @@ LIBS="$oLIBS"
 
 dnl AC_CONFIG_SUBDIRS(gemvt)
 
-dnl gmenu requires ctree in the devel GTK 1.1, this is a simple check
-dnl for gtk/gtkctree.h
-P_GMENU=
-AC_CHECK_HEADERS(gtk/gtkctree.h,[P_GMENU=gmenu])
-AM_CONDITIONAL(PROGRAM_GMENU, test "$P_GMENU" = "gmenu")
-
 AC_OUTPUT([
 Makefile
 po/Makefile.in