[gnome-settings-daemon] xrandr: Use our own pkg-config checks

[Bastien Nocera <hadess src gnome org>]

commit 5b2f9aa84a92f96594c12df8dd65e66164bb95e8
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jun 15 11:46:29 2012 +0100

    xrandr: Use our own pkg-config checks
    
    To trim the link list.

 configure.ac               |    6 ++++++
 plugins/xrandr/Makefile.am |    8 +++-----
 2 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d08e366..803a4fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,6 +189,12 @@ dnl ---------------------------------------------------------------------------
 
 PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra])
 
+dnl ---------------------------------------------------------------------------
+dnl - xrandr plugin stuff
+dnl ---------------------------------------------------------------------------
+
+PKG_CHECK_MODULES(XRANDR, [gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION upower-glib >= $UPOWER_REQUIRED_VERSION])
+
 # ---------------------------------------------------------------------------
 # Power
 # ---------------------------------------------------------------------------
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index cacb336..1b677bb 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -49,9 +49,8 @@ libxrandr_la_CPPFLAGS =						\
 
 libxrandr_la_CFLAGS =			\
 	$(PLUGIN_CFLAGS)		\
-	$(POWER_CFLAGS)			\
+	$(XRANDR_CFLAGS)		\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
-	$(GNOME_DESKTOP_CFLAGS)		\
 	$(AM_CFLAGS)
 
 libxrandr_la_LDFLAGS = 			\
@@ -59,9 +58,8 @@ libxrandr_la_LDFLAGS = 			\
 
 libxrandr_la_LIBADD  =					\
 	$(top_builddir)/plugins/common/libcommon.la	\
-	$(POWER_LIBS)					\
-	$(SETTINGS_PLUGIN_LIBS)				\
-	$(GNOME_DESKTOP_LIBS)
+	$(XRANDR_LIBS)					\
+	$(SETTINGS_PLUGIN_LIBS)
 
 plugin_in_files =			\
 	xrandr.gnome-settings-plugin.in