The Sound Menu

Merge lp:~cjcurran/indicator-sound/tidy-build-deps into lp:~indicator-applet-developers/indicator-sound/trunk_3

  1. tidy-build-deps
  2. Merge into trunk_3
Proposed by Conor Curran
Status: Merged
Merged at revision: 105
Proposed branch: lp:~cjcurran/indicator-sound/tidy-build-deps
Merge into: lp:~indicator-applet-developers/indicator-sound/trunk_3
Diff against target: 35 lines (+5/-3)
2 files modified
Makefile.am (+1/-1)
configure.ac (+4/-2)
To merge this branch: bzr merge lp:~cjcurran/indicator-sound/tidy-build-deps
Reviewer Review Type Date Requested Status
Mikkel Kamstrup Erlandsen (community) Approve
Review via email: mp+45154@code.launchpad.net

Description of the change

fixes the bug attached and removes the Indicate.vapi from the root Makefile.am which allows distcheck to complete properly

To post a comment you must log in.
Revision history for this message
Mikkel Kamstrup Erlandsen (kamstrup) wrote :

 review approve

Looks fine

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile.am'
2--- Makefile.am 2010-06-24 17:16:23 +0000
3+++ Makefile.am 2011-01-04 18:04:49 +0000
4@@ -5,7 +5,7 @@
5 tests \
6 po
7
8-EXTRA_DIST = autogen.sh vapi/common-defs.vapi vapi/Indicate-0.2.vapi
9+EXTRA_DIST = autogen.sh vapi/common-defs.vapi
10
11 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
12
13
14=== modified file 'configure.ac'
15--- configure.ac 2010-12-16 17:01:36 +0000
16+++ configure.ac 2011-01-04 18:04:49 +0000
17@@ -46,14 +46,16 @@
18 AC_SUBST(APPLET_LIBS)
19
20
21-PKG_CHECK_MODULES(PULSEAUDIO, libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION)
22+PKG_CHECK_MODULES(PULSEAUDIO, libpulse-mainloop-glib >= $PULSE_AUDIO_REQUIRED_VERSION
23+ gio-unix-2.0)
24 AC_SUBST(PULSEAUDIO_CFLAGS)
25 AC_SUBST(PULSEAUDIO_LIBS)
26
27 PKG_CHECK_MODULES(SOUNDSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
28 indicator >= $INDICATOR_REQUIRED_VERSION
29 indicate >= $INDICATE_REQUIRED_VERSION
30- gee-1.0)
31+ gee-1.0
32+ gio-unix-2.0)
33
34 AC_SUBST(SOUNDSERVICE_CFLAGS)
35 AC_SUBST(SOUNDERVICE_LIBS)

Subscribers

People subscribed via source and target branches