[Xfce4-commits] <xfce4-settings:xfce-4.6> Fix linking issues (bug #6236).

[Jérôme Guelfucci]

Updating branch refs/heads/xfce-4.6
         to b701fe0827fb71a82f7c08c8b60b2a253a2e8aaa (commit)
       from 551d539e5c6ede43a6d4b8d45c703e80a7ba3638 (commit)

commit b701fe0827fb71a82f7c08c8b60b2a253a2e8aaa
Author: Nick Schermer <nick at xfce.org>
Date:   Thu Apr 29 21:30:08 2010 +0200

    Fix linking issues (bug #6236).

 dialogs/mouse-settings/Makefile.am |    3 ++-
 xfsettingsd/Makefile.am            |    6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dialogs/mouse-settings/Makefile.am b/dialogs/mouse-settings/Makefile.am
index b0c459b..bc89d46 100644
--- a/dialogs/mouse-settings/Makefile.am
+++ b/dialogs/mouse-settings/Makefile.am
@@ -34,7 +34,8 @@ xfce4_mouse_settings_LDADD = \
 	$(GLADE_LIBS) \
 	$(LIBXFCEGUI4_LIBS) \
 	$(XFCONF_LIBS) \
-	$(XI_LIBS)
+	$(XI_LIBS) \
+	-lm
 
 if HAVE_XCURSOR
 xfce4_mouse_settings_CFLAGS += \
diff --git a/xfsettingsd/Makefile.am b/xfsettingsd/Makefile.am
index 95723c5..4090d51 100644
--- a/xfsettingsd/Makefile.am
+++ b/xfsettingsd/Makefile.am
@@ -15,7 +15,8 @@ xfsettingsd_CFLAGS = \
 	$(LIBXFCE4UTIL_CFLAGS) \
 	-DDATADIR=\"$(datadir)\" \
 	-DSRCDIR=\"$(top_srcdir)\" \
-	-DLOCALEDIR=\"$(localedir)\"
+	-DLOCALEDIR=\"$(localedir)\" \
+	$(LIBX11_CFLAGS)
 
 xfsettingsd_LDADD = \
 	$(GTK_LIBS) \
@@ -23,7 +24,8 @@ xfsettingsd_LDADD = \
 	$(DBUS_GLIB_LIBS) \
 	$(LIBNOTIFY_LIBS) \
 	$(XFCONF_LIBS) \
-	$(LIBXFCE4UTIL_LIBS)
+	$(LIBXFCE4UTIL_LIBS) \
+	$(LIBX11_LIBS)
 
 INCLUDES = \
 	-I$(top_srcdir)