Updating branch refs/heads/master
to adb829faf352bc77be6a1b17f15f0bdb69ecddba (commit)
from d6e7169ef4f8cd2eb0324881e2dee0a4d6adef05 (commit)
commit adb829faf352bc77be6a1b17f15f0bdb69ecddba
Author: Nick Schermer <[email protected]>
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 070db71..9da814f 100644
--- a/dialogs/mouse-settings/Makefile.am
+++ b/dialogs/mouse-settings/Makefile.am
@@ -33,7 +33,8 @@ xfce4_mouse_settings_LDADD = \
$(LIBXFCE4UTIL_LIBS) \
$(LIBXFCE4UI_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 dd0dc5c..3c1c679 100644
--- a/xfsettingsd/Makefile.am
+++ b/xfsettingsd/Makefile.am
@@ -25,7 +25,8 @@ xfsettingsd_CFLAGS = \
$(LIBNOTIFY_CFLAGS) \
$(XFCONF_CFLAGS) \
$(LIBXFCE4UTIL_CFLAGS) \
- $(PLATFORM_CFLAGS)
+ $(PLATFORM_CFLAGS) \
+ $(LIBX11_CFLAGS)
xfsettingsd_LDFLAGS = \
-no-undefined \
@@ -36,7 +37,8 @@ xfsettingsd_LDADD = \
$(GLIB_LIBS) \
$(LIBNOTIFY_LIBS) \
$(XFCONF_LIBS) \
- $(LIBXFCE4UTIL_LIBS)
+ $(LIBXFCE4UTIL_LIBS) \
+ $(LIBX11_LIBS)
settingsdir = $(sysconfdir)/xdg/xfce4/xfconf/xfce-perchannel-xml
settings_DATA = xsettings.xml
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
