Merge lp:~3v1n0/indicator-appmenu/use-indicator-0.4-API into lp:indicator-appmenu/0.3

Proposed by Marco Trevisan (Treviño) on 2011-07-09
Status: Merged
Merged at revision: 128
Proposed branch: lp:~3v1n0/indicator-appmenu/use-indicator-0.4-API
Merge into: lp:indicator-appmenu/0.3
Diff against target: 36 lines (+6/-6)
1 file modified
configure.ac (+6/-6)
To merge this branch: bzr merge lp:~3v1n0/indicator-appmenu/use-indicator-0.4-API
Reviewer Review Type Date Requested Status
Indicator Applet Developers 2011-07-09 Pending
Review via email: mp+67413@code.launchpad.net

Description of the change

Compile with new libindicator-0.4

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-21 21:12:16 +0000
3+++ configure.ac 2011-07-09 02:57:06 +0000
4@@ -62,14 +62,14 @@
5 AS_IF([test "x$with_gtk" = x3],
6 [PKG_CHECK_MODULES(INDICATOR, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
7 gio-2.0 >= $GIO_REQUIRED_VERSION
8- indicator3 >= $INDICATOR_REQUIRED_VERSION
9+ indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
10 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
11 libbamf3 >= $BAMF_REQUIRED_VERSION)
12 ],
13 [test "x$with_gtk" = x2],
14 [PKG_CHECK_MODULES(INDICATOR, gtk+-2.0 >= $GTK_REQUIRED_VERSION
15 gio-2.0 >= $GIO_REQUIRED_VERSION
16- indicator >= $INDICATOR_REQUIRED_VERSION
17+ indicator-0.4 >= $INDICATOR_REQUIRED_VERSION
18 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
19 libbamf >= $BAMF_REQUIRED_VERSION)
20 ],
21@@ -113,11 +113,11 @@
22 INDICATORDIR="${libdir}/indicators/3/"
23 INDICATORICONSDIR="${datadir}/libindicate/icons/"
24 elif test "x$with_gtk" = x2; then
25- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
26- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
27+ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator-0.4`
28+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator-0.4`
29 else
30- INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
31- INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
32+ INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
33+ INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
34 fi
35 AC_SUBST(INDICATORDIR)
36 AC_SUBST(INDICATORICONSDIR)

Subscribers

People subscribed via source and target branches