[gnome-power-manager] bugfix: fix compile when using an ld that defaults to --as-needed

[Richard Hughes <rhughes src gnome org>]

commit c0363054242f20c8c0f6d5df8b6481c98a2437b3
Author: Richard Hughes <richard hughsie com>
Date:   Fri Jan 8 09:51:40 2010 +0000

    bugfix: fix compile when using an ld that defaults to --as-needed

 configure.ac    |    7 +++++--
 src/Makefile.am |   16 ++++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ee0c5f4..9b70f1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,11 +180,14 @@ AC_SUBST(GDK_CFLAGS)
 AC_SUBST(GDK_LIBS)
 
 PKG_CHECK_MODULES(XRANDR, [
- xrandr >= $XRANDR_REQUIRED 
- xrender x11])
+ xrandr >= $XRANDR_REQUIRED])
 AC_SUBST(XRANDR_CFLAGS)
 AC_SUBST(XRANDR_LIBS)
 
+PKG_CHECK_MODULES(X11, x11 xrender)
+AC_SUBST(X11_CFLAGS)
+AC_SUBST(X11_LIBS)
+
 PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED)
 AC_SUBST(LIBNOTIFY_CFLAGS)
 AC_SUBST(LIBNOTIFY_LIBS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 3e70be3..a90b4dc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,12 +93,12 @@ gnome_power_statistics_SOURCES =			\
 gnome_power_statistics_LDADD =				\
 	libgpmshared.a					\
 	$(GLIB_LIBS)					\
+	$(X11_LIBS)					\
 	$(DEVKIT_LIBS)					\
 	$(GNOME_LIBS)					\
 	$(UNIQUE_LIBS)					\
 	$(DBUS_LIBS)					\
-	-lm						\
-	$(NULL)
+	-lm
 
 gnome_power_statistics_CFLAGS =				\
 	$(WARNINGFLAGS)					\
@@ -113,13 +113,13 @@ gnome_power_preferences_SOURCES =			\
 gnome_power_preferences_LDADD =				\
 	libgpmshared.a					\
 	$(GLIB_LIBS)					\
+	$(X11_LIBS)					\
 	$(GNOME_LIBS)					\
 	$(DBUS_LIBS)					\
-	-lm						\
 	$(UNIQUE_LIBS)					\
 	$(GPM_EXTRA_LIBS)				\
 	$(DEVKIT_LIBS)					\
-	$(NULL)
+	-lm
 
 if HAVE_HAL
 gnome_power_preferences_LDADD += $(LOCAL_LIBHAL_LIBS)
@@ -180,16 +180,16 @@ endif
 gnome_power_manager_LDADD =				\
 	libgpmshared.a					\
 	$(GLIB_LIBS)					\
+	$(X11_LIBS)				\
 	$(GSTREAMER_LIBS)				\
 	$(GNOME_LIBS)					\
 	$(DBUS_LIBS)					\
-	-lm						\
 	$(XRANDR_LIBS)					\
 	$(CANBERRA_LIBS)				\
 	$(LIBNOTIFY_LIBS)				\
 	$(GPM_EXTRA_LIBS)				\
 	$(DEVKIT_LIBS)					\
-	$(NULL)
+	-lm
 
 if HAVE_HAL
 gnome_power_manager_LDADD += $(LOCAL_LIBHAL_LIBS)
@@ -253,14 +253,14 @@ gnome_power_self_test_SOURCES =				\
 
 gnome_power_self_test_LDADD =				\
 	$(GLIB_LIBS)					\
+	$(X11_LIBS)					\
 	$(GNOME_LIBS)					\
 	$(GSTREAMER_LIBS)				\
 	$(DEVKIT_LIBS)					\
 	$(DBUS_LIBS)					\
-	-lm						\
 	$(LIBNOTIFY_LIBS)				\
 	$(GPM_EXTRA_LIBS)				\
-	$(NULL)
+	-lm
 
 if HAVE_HAL
 gnome_power_self_test_LDADD += $(LOCAL_LIBHAL_LIBS)