Merge lp:~ken-vandine/indicator-application/pkgconfig-gtk2 into lp:indicator-application/0.4

Proposed by Ken VanDine
Status: Merged
Merged at revision: 208
Proposed branch: lp:~ken-vandine/indicator-application/pkgconfig-gtk2
Merge into: lp:indicator-application/0.4
Diff against target: 12 lines (+1/-1)
1 file modified
configure.ac (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/indicator-application/pkgconfig-gtk2
Reviewer Review Type Date Requested Status
Indicator Applet Developers Pending
Review via email: mp+66115@code.launchpad.net

Description of the change

Make sure gtk2 builds get pkgconfig info for appindicator-0.1 instead of appindicator3-0.1

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2011-06-22 16:22:45 +0000
3+++ configure.ac 2011-06-28 11:05:40 +0000
4@@ -64,7 +64,7 @@
5 dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
6 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
7
8- PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
9+ PKG_CHECK_MODULES(APPINDICATOR, appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
10 ],
11 [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
12 )

Subscribers

People subscribed via source and target branches