[gnome-settings-daemon] Fix linking with pedantic linkers

[Bastien Nocera <hadess src gnome org>]

commit 393ca4ffd2b48215498cc19e12bec3474b6200e2
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Feb 17 11:09:51 2010 +0000

    Fix linking with pedantic linkers
    
    The common library and the background and mouse plugins use libX11
    symbols so need to link against it. The media-keys, and mouse
    plugins use libm symbols so need to link against it.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=610244

 configure.ac                   |    3 +++
 plugins/background/Makefile.am |    1 +
 plugins/common/Makefile.am     |    2 +-
 plugins/media-keys/Makefile.am |    9 ++++++---
 plugins/mouse/Makefile.am      |    5 ++++-
 5 files changed, 15 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9dee4c1..ec2f4f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -168,6 +168,9 @@ AC_PATH_XTRA
 
 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS"
 
+X11_LIBS="$ALL_X_LIBS"
+AC_SUBST(X11_LIBS)
+
 dnl ---------------------------------------------------------------------------
 dnl - XInput
 dnl ---------------------------------------------------------------------------
diff --git a/plugins/background/Makefile.am b/plugins/background/Makefile.am
index 54d7c10..4d65752 100644
--- a/plugins/background/Makefile.am
+++ b/plugins/background/Makefile.am
@@ -22,6 +22,7 @@ test_background_CFLAGS = \
 test_background_LDADD =		\
 	$(top_builddir)/gnome-settings-daemon/libgsd-profile.la	\
 	$(SETTINGS_PLUGIN_LIBS)	\
+	$(X11_LIBS) \
 	$(NULL)
 
 plugin_LTLIBRARIES = \
diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
index 03d4bc8..447d02d 100644
--- a/plugins/common/Makefile.am
+++ b/plugins/common/Makefile.am
@@ -17,7 +17,7 @@ libcommon_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libcommon_la_LDFLAGS = \
-	$(GSD_PLUGIN_LDFLAGS)
+	$(GSD_PLUGIN_LDFLAGS) $(X11_LIBS)
 
 libcommon_la_LIBADD  = \
 	$(SETTINGS_PLUGIN_LIBS)
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 7853824..f9a71cd 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -102,7 +102,8 @@ libmedia_keys_la_LIBADD  = 		\
 	$(top_builddir)/plugins/common/libcommon.la			\
 	$(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la	\
 	$(SETTINGS_PLUGIN_LIBS)						\
-	$(XF86MISC_LIBS)
+	$(XF86MISC_LIBS)						\
+	-lm
 
 plugin_in_files = 		\
 	media-keys.gnome-settings-plugin.in
@@ -141,7 +142,8 @@ test_media_window_LDADD = \
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\
 	$(XF86MISC_LIBS)			\
-	$(GST_LIBS)
+	$(GST_LIBS)				\
+	-lm
 
 test_media_keys_SOURCES =			\
 	gsd-media-keys-manager.c		\
@@ -171,7 +173,8 @@ test_media_keys_LDADD = \
 	$(SETTINGS_DAEMON_LIBS)			\
 	$(SETTINGS_PLUGIN_LIBS)			\
 	$(XF86MISC_LIBS)			\
-	$(GST_LIBS)
+	$(GST_LIBS)				\
+	-lm
 
 if HAVE_PULSE
 test_media_keys_LDADD += $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index d05a068..814c21a 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -21,6 +21,7 @@ libmouse_la_LDFLAGS = 		\
 
 libmouse_la_LIBADD  = 		\
 	$(SETTINGS_PLUGIN_LIBS)	\
+	$(X11_LIBS)		\
 	$(XINPUT_LIBS)
 
 plugin_in_files = mouse.gnome-settings-plugin.in
@@ -40,7 +41,9 @@ gsd_locate_pointer_CFLAGS = \
 	$(AM_CFLAGS)
 
 gsd_locate_pointer_LDADD  = 		\
-	$(SETTINGS_PLUGIN_LIBS)
+	$(SETTINGS_PLUGIN_LIBS)		\
+	$(X11_LIBS)			\
+	-lm
 
 EXTRA_DIST = $(plugin_in_files)
 CLEANFILES = $(plugin_DATA)