[gnome-settings-daemon] power: Link against xext, needed for XSync API

[Bastien Nocera <hadess src gnome org>]

commit ca9cd1e000eb79f9c099b769ae5c6d48efdde2fc
Author: Bastien Nocera <hadess hadess net>
Date:   Fri Jun 15 11:35:47 2012 +0100

    power: Link against xext, needed for XSync API
    
    https://bugzilla.gnome.org/show_bug.cgi?id=678120

 configure.ac               |   30 +++++++++++++-----------------
 plugins/power/Makefile.am  |    6 +++---
 plugins/xrandr/Makefile.am |    4 ++--
 3 files changed, 18 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5f1d607..d08e366 100644
--- a/configure.ac
+++ b/configure.ac
@@ -189,6 +189,18 @@ dnl ---------------------------------------------------------------------------
 
 PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra])
 
+# ---------------------------------------------------------------------------
+# Power
+# ---------------------------------------------------------------------------
+PKG_CHECK_MODULES(POWER, upower-glib >= $UPOWER_REQUIRED_VERSION gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION libcanberra-gtk3 libnotify x11 xext)
+
+if test x$enable_gudev != xno; then
+	PKG_CHECK_MODULES(BACKLIGHT_HELPER,
+		glib-2.0 >= $GLIB_REQUIRED_VERSION
+		gudev-1.0
+	)
+fi
+
 dnl ---------------------------------------------------------------------------
 dnl - color
 dnl ---------------------------------------------------------------------------
@@ -292,24 +304,9 @@ AC_SUBST(NSS_DATABASE)
 
 
 dnl ==============================================
-dnl power section
+dnl systemd check
 dnl ==============================================
 
-# ---------------------------------------------------------------------------
-# UPower
-# ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(UPOWER, upower-glib >= $UPOWER_REQUIRED_VERSION libcanberra-gtk3 libnotify)
-if test x$enable_gudev != xno; then
-	PKG_CHECK_MODULES(BACKLIGHT_HELPER,
-		glib-2.0 >= $GLIB_REQUIRED_VERSION
-		gudev-1.0
-	)
-fi
-
-# ---------------------------------------------------------------------------
-# systemd
-# ---------------------------------------------------------------------------
-
 AC_ARG_ENABLE([systemd],
               AS_HELP_STRING([--enable-systemd], [Use systemd for session tracking]),
               [with_systemd=$enableval],
@@ -327,7 +324,6 @@ AC_SUBST(SYSTEMD_LIBS)
 
 AM_CONDITIONAL(WITH_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd])
 
-
 # ---------------------------------------------------------------------------
 # CUPS
 # ---------------------------------------------------------------------------
diff --git a/plugins/power/Makefile.am b/plugins/power/Makefile.am
index 8b0dd04..32686c6 100644
--- a/plugins/power/Makefile.am
+++ b/plugins/power/Makefile.am
@@ -27,7 +27,7 @@ libpower_la_CPPFLAGS = \
 
 libpower_la_CFLAGS = \
 	$(PLUGIN_CFLAGS)				\
-	$(UPOWER_CFLAGS)				\
+	$(POWER_CFLAGS)					\
 	$(GNOME_DESKTOP_CFLAGS)				\
 	$(SETTINGS_PLUGIN_CFLAGS)			\
 	$(AM_CFLAGS)
@@ -38,7 +38,7 @@ libpower_la_LDFLAGS = 					\
 libpower_la_LIBADD  = 					\
 	$(top_builddir)/plugins/common/libcommon.la	\
 	$(top_builddir)/gnome-settings-daemon/libgsd.la \
-	$(UPOWER_LIBS)					\
+	$(POWER_LIBS)					\
 	$(GNOME_DESKTOP_LIBS)				\
 	$(SETTINGS_PLUGIN_LIBS)
 
@@ -77,7 +77,7 @@ test_power_LDADD =					\
 	-lm						\
 	$(top_builddir)/plugins/common/libcommon.la	\
 	$(top_builddir)/gnome-settings-daemon/libgsd.la \
-	$(UPOWER_LIBS)					\
+	$(POWER_LIBS)					\
 	$(GNOME_DESKTOP_LIBS)				\
 	$(SETTINGS_PLUGIN_LIBS)
 
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index a6deabf..cacb336 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -49,7 +49,7 @@ libxrandr_la_CPPFLAGS =						\
 
 libxrandr_la_CFLAGS =			\
 	$(PLUGIN_CFLAGS)		\
-	$(UPOWER_CFLAGS)		\
+	$(POWER_CFLAGS)			\
 	$(SETTINGS_PLUGIN_CFLAGS)	\
 	$(GNOME_DESKTOP_CFLAGS)		\
 	$(AM_CFLAGS)
@@ -59,7 +59,7 @@ libxrandr_la_LDFLAGS = 			\
 
 libxrandr_la_LIBADD  =					\
 	$(top_builddir)/plugins/common/libcommon.la	\
-	$(UPOWER_LIBS)					\
+	$(POWER_LIBS)					\
 	$(SETTINGS_PLUGIN_LIBS)				\
 	$(GNOME_DESKTOP_LIBS)