Fix Issue 278, gmenu deeply needed even if gnome-panel applet is disa…

…bled.

applet/Makefile.am

@@ -98,17 +98,15 @@ GlobalMenu_PanelApplet_LDADD = \
 		$(GLIB_LIBS) \
 		$(GTK_LIBS) \
 		$(WNCK_LIBS) \
-		$(PANEL_LIBS) \
-		$(GMENU_LIBS) \
+		$(GNOME_PANEL_LIBS) \
 		../libgnomenu/libgnomenu.la \
 		libapplet.la \
 		$(NULL)
 GlobalMenu_PanelApplet_CPPFLAGS = \
 		$(GLIB_CFLAGS) \
 		$(GTK_CFLAGS) \
 		$(WNCK_CFLAGS) \
-		$(PANEL_CFLAGS) \
-		$(GMENU_CFLAGS) \
+		$(GNOME_PANEL_CFLAGS) \
 		-I$(top_srcdir) \
 		-include $(CONFIG_HEADER) \
 		-DGMENU_I_KNOW_THIS_IS_UNSTABLE \

configure.ac

@@ -86,11 +86,15 @@ AC_ARG_WITH(
 	[],
 	[with_gnome_panel=yes])
 AS_IF([test "x$with_gnome_panel" != xno],
-	[PKG_CHECK_MODULES(PANEL, [libpanelapplet-2.0 >= $PANEL_REQUIRED, libnotify >= 0.4.0],
+	[PKG_CHECK_MODULES(GNOME_PANEL, 
+		[	libpanelapplet-2.0 >= $PANEL_REQUIRED, 
+			libnotify >= $NOTIFY_REQUIRED,
+			libgnome-menu >= $GMENU_REQUIRED
+		],
 		[
 		with_gnome_panel=true;
-		AC_SUBST(PANEL_CFLAGS)
-		AC_SUBST(PANEL_LIBS)
+		AC_SUBST(GNOME_PANEL_CFLAGS)
+		AC_SUBST(GNOME_PANEL_LIBS)
 		],
 		[
 		with_gnome_panel=false;
@@ -123,9 +127,6 @@ AS_IF([test "x$with_xfce4_panel" != xno],
 AM_CONDITIONAL(WITH_XFCE4_PANEL, [test "x$with_xfce4_panel" = xtrue ]) 
 
 
-PKG_CHECK_MODULES(GMENU, libgnome-menu >= $GMENU_REQUIRED)
-AC_SUBST(GMENU_FLAGS)
-AC_SUBST(GMENU_LIBS)
 
 # path: bad way; move them back to the Makefiles according to GNU rules?