Unity Settings Daemon

Merge lp:~larsu/unity-settings-daemon/fix-build into lp:unity-settings-daemon

  1. fix-build
  2. Merge into trunk
Proposed by Lars Karlitski
Status: Merged
Approved by: Sebastien Bacher
Approved revision: 4087
Merged at revision: 4088
Proposed branch: lp:~larsu/unity-settings-daemon/fix-build
Merge into: lp:unity-settings-daemon
Diff against target: 11 lines (+1/-0)
1 file modified
plugins/xsettings/Makefile.am (+1/-0)
To merge this branch: bzr merge lp:~larsu/unity-settings-daemon/fix-build
Reviewer Review Type Date Requested Status
Robert Ancell Approve
Review via email: mp+264475@code.launchpad.net

Commit message

xsettings: include needed libs for test program

Description of the change

xsettings: include needed libs for test program

To post a comment you must log in.
Revision history for this message
Robert Ancell (robert-ancell) wrote :

Looks right. Upstream also has this line missing - does it need proposing there too?

review: Approve
Revision history for this message
Lars Karlitski (larsu) wrote :

> Looks right. Upstream also has this line missing - does it need proposing
> there too?

I'd think it does, but it compiles cleanly without. They seemed to have fixed it by adding a dependency to gnome-desktop-3.0 in their configure check for XSETTINGS.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/xsettings/Makefile.am'
2--- plugins/xsettings/Makefile.am 2014-11-27 10:52:57 +0000
3+++ plugins/xsettings/Makefile.am 2015-07-11 10:59:31 +0000
4@@ -42,6 +42,7 @@
5
6 test_wm_button_layout_translations_LDADD = \
7 $(XSETTINGS_LIBS) \
8+ $(SETTINGS_PLUGIN_LIBS) \
9 $(NULL)
10
11 libexec_PROGRAMS = usd-test-xsettings

Subscribers

People subscribed via source and target branches