[gnome-settings-daemon] media-keys: Clean up upower req

[Bastien Nocera <hadess src gnome org>]

commit 63e69deda056d41ad8f68f5cfe40d76970037866
Author: Bastien Nocera <hadess hadess net>
Date:   Tue Sep 13 15:45:02 2011 +0100

    media-keys: Clean up upower req

 configure.ac                   |    3 ++-
 plugins/media-keys/Makefile.am |    3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 1128b3c..9e349ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -53,6 +53,7 @@ GCONF_REQUIRED_VERSION=2.6.1
 GIO_REQUIRED_VERSION=2.26.0
 GNOME_DESKTOP_REQUIRED_VERSION=3.1.5
 LIBNOTIFY_REQUIRED_VERSION=0.7.3
+UPOWER_GLIB_REQUIRED_VERSION=0.9.1
 
 EXTRA_COMPILE_WARNINGS(yes)
 
@@ -210,7 +211,7 @@ dnl ---------------------------------------------------------------------------
 dnl - media-keys plugin stuff
 dnl ---------------------------------------------------------------------------
 
-PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0])
+PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 upower-glib >= $UPOWER_GLIB_REQUIRED_VERSION])
 
 dnl ---------------------------------------------------------------------------
 dnl - GConf<->GSettings bridge
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 546db35..7a5ca7a 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -94,7 +94,6 @@ libmedia_keys_la_CPPFLAGS = \
 libmedia_keys_la_CFLAGS = \
 	$(PLUGIN_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(UPOWER_CFLAGS)		\
 	$(MEDIA_KEYS_CFLAGS)		\
 	$(AM_CFLAGS)
 
@@ -104,7 +103,6 @@ libmedia_keys_la_LDFLAGS = 		\
 libmedia_keys_la_LIBADD  = 		\
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
-	$(UPOWER_LIBS)							\
 	$(MEDIA_KEYS_LIBS)						\
 	$(SETTINGS_PLUGIN_LIBS)						\
 	-lm
@@ -184,7 +182,6 @@ test_media_keys_LDADD = \
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\
 	$(MEDIA_KEYS_LIBS)			\
-	$(UPOWER_LIBS)				\
 	$(GST_LIBS)				\
 	-lm