[gnome-power-manager/gnome-2-26] Only use libpanel-applet flags to build applets

[Richard Hughes <rhughes src gnome org>]

commit e2e458d1431aea64b6d49802215663fda69f2898
Author: Vincent Untz <vuntz gnome org>
Date:   Mon Jul 20 14:23:07 2009 +0200

    Only use libpanel-applet flags to build applets
    
    http://bugzilla.gnome.org/show_bug.cgi?id=575468

 applets/brightness/Makefile.am |    4 +++-
 applets/inhibit/Makefile.am    |    4 +++-
 configure.ac                   |    9 ++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)
---
diff --git a/applets/brightness/Makefile.am b/applets/brightness/Makefile.am
index 14b18b3..98856ec 100644
--- a/applets/brightness/Makefile.am
+++ b/applets/brightness/Makefile.am
@@ -4,6 +4,7 @@ INCLUDES =							\
 	$(HAL_CFLAGS)						\
 	$(DBUS_CFLAGS)						\
 	$(GNOME_CFLAGS)						\
+	$(PANEL_CFLAGS)						\
 	$(LIBNOTIFY_CFLAGS)					\
 	$(GTKUNIQUE_CFLAGS)					\
 	-DBINDIR=\"$(bindir)\"			 		\
@@ -34,7 +35,8 @@ gnome_brightness_applet_SOURCES =				\
 
 gnome_brightness_applet_LDADD =					\
 	$(DBUS_LIBS)						\
-	$(GNOME_LIBS)
+	$(GNOME_LIBS)						\
+	$(PANEL_LIBS)
 
 serverdir       = $(libdir)/bonobo/servers
 server_in_files = GNOME_BrightnessApplet.server.in
diff --git a/applets/inhibit/Makefile.am b/applets/inhibit/Makefile.am
index 6cd275f..65ed664 100644
--- a/applets/inhibit/Makefile.am
+++ b/applets/inhibit/Makefile.am
@@ -4,6 +4,7 @@ INCLUDES =							\
 	$(HAL_CFLAGS)						\
 	$(DBUS_CFLAGS)						\
 	$(GNOME_CFLAGS)						\
+	$(PANEL_CFLAGS)						\
 	$(LIBNOTIFY_CFLAGS)					\
 	$(GTKUNIQUE_CFLAGS)					\
 	-DBINDIR=\"$(bindir)\"			 		\
@@ -34,7 +35,8 @@ gnome_inhibit_applet_SOURCES =					\
 
 gnome_inhibit_applet_LDADD =					\
 	$(DBUS_LIBS)						\
-	$(GNOME_LIBS)
+	$(GNOME_LIBS)						\
+	$(PANEL_LIBS)
 
 serverdir       = $(libdir)/bonobo/servers
 server_in_files = GNOME_InhibitApplet.server.in
diff --git a/configure.ac b/configure.ac
index 02e1ded..1415e16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -89,6 +89,7 @@ dnl ---------------------------------------------------------------------------
 GLIB_REQUIRED=2.13.0
 GTK_REQUIRED=2.11.0
 GDK_REQUIRED=2.11.0
+GCONF_REQUIRED=2.10.0
 GNOME_KEYRING_REQUIRED=0.6.0
 HAL_REQUIRED=0.5.8
 DBUS_REQUIRED=0.70
@@ -146,12 +147,18 @@ PKG_CHECK_MODULES(GNOME, [
  libglade-2.0 >= $LIBGLADE_REQUIRED
  libwnck-1.0 >= $LIBWNCK_REQUIRED
  gtk+-2.0 >= $GTK_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
- libpanelapplet-2.0 >= $LIBPANEL_REQUIRED
  cairo >= $CAIRO_REQUIRED])
 AC_SUBST(GNOME_CFLAGS)
 AC_SUBST(GNOME_LIBS)
 
+PKG_CHECK_MODULES(PANEL, [
+ libpanelapplet-2.0 >= $LIBPANEL_REQUIRED])
+AC_SUBST(PANEL_CFLAGS)
+AC_SUBST(PANEL_LIBS)
+
+
 PKG_CHECK_MODULES(GDK, [
  gdk-2.0 >= $GDK_REQUIRED
  gdk-x11-2.0 >= $GDK_REQUIRED])