1
=== modified file 'configure.ac'
2
--- configure.ac	2012-04-11 17:15:43 +0000
3
+++ configure.ac	2012-05-07 23:45:24 +0000
4
@@ -29,8 +29,7 @@
5
29
# Dependencies
29
# Dependencies
6
30
###########################
30
###########################
7
31
31
10
32
GTK_REQUIRED_VERSION=2.18
32
GTK_REQUIRED_VERSION=3.0.0
9
33
GTK3_REQUIRED_VERSION=2.91
11
34
GIO_REQUIRED_VERSION=2.26
33
GIO_REQUIRED_VERSION=2.26
12
35
INDICATOR_REQUIRED_VERSION=0.3.5
34
INDICATOR_REQUIRED_VERSION=0.3.5
13
36
DBUSMENUGTK_REQUIRED_VERSION=0.5.90
35
DBUSMENUGTK_REQUIRED_VERSION=0.5.90
14
@@ -39,36 +38,13 @@
15
39
38
16
40
LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9
39
LIBAPPINDICATOR_REQUIRED_VERSION=0.2.9
17
41
40
48
42
AC_ARG_WITH([gtk],
41
PKG_CHECK_MODULES(INDICATOR,  gtk+-3.0 >= $GTK_REQUIRED_VERSION
49
43
  [AS_HELP_STRING([--with-gtk],
42
                              gio-2.0 >= $GIO_REQUIRED_VERSION
50
44
    [Which version of gtk to use @<:@default=3@:>@])],
43
                              indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
51
45
  [],
44
                              json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
52
46
  [with_gtk=3])
45
                              dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
53
47
AS_IF([test "x$with_gtk" = x3],
46
                              dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
54
48
        [PKG_CHECK_MODULES(INDICATOR,  gtk+-3.0 >= $GTK3_REQUIRED_VERSION
47
PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
25
49
                                       gio-2.0 >= $GIO_REQUIRED_VERSION
26
50
                                       indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
27
51
                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
28
52
                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
29
53
                                       dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
30
54
31
55
         PKG_CHECK_MODULES(APPINDICATOR, appindicator3-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
32
56
33
57
         AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available])
34
58
        ],
35
59
      [test "x$with_gtk" = x2],
36
60
        [PKG_CHECK_MODULES(INDICATOR,  gtk+-2.0 >= $GTK_REQUIRED_VERSION
37
61
                                       gio-2.0 >= $GIO_REQUIRED_VERSION
38
62
                                       indicator-0.4 >= $INDICATOR_REQUIRED_VERSION 
39
63
                                       json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
40
64
                                       dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION
41
65
                                       dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
42
66
43
67
         PKG_CHECK_MODULES(APPINDICATOR, appindicator-0.1 >= $LIBAPPINDICATOR_REQUIRED_VERSION)
44
68
        ],
45
69
      [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
46
70
)
47
71
AM_CONDITIONAL(USE_GTK3, [test "x$with_gtk" = x3])
55
72
48
56
73
###########################
49
###########################
57
74
# gcov coverage reporting
50
# gcov coverage reporting
58
@@ -142,6 +118,5 @@
59
142
118
60
143
	Prefix:        $prefix
119
	Prefix:        $prefix
61
144
	Indicator Dir: $INDICATORDIR
120
	Indicator Dir: $INDICATORDIR
62
145
	GTK+ Version:  $with_gtk
63
146
	gcov:          $use_gcov
121
	gcov:          $use_gcov
64
147
])
122
])
65
148
123
66
=== modified file 'src/Makefile.am'
67
--- src/Makefile.am	2011-12-06 21:49:39 +0000
68
+++ src/Makefile.am	2012-05-07 23:45:24 +0000
69
@@ -1,9 +1,3 @@
70
1
if USE_GTK3
71
2
VER=3
72
3
else
73
4
VER=
74
5
endif
75
6
76
7
CLEANFILES =
1
CLEANFILES =
77
8
DISTCLEANFILES =
2
DISTCLEANFILES =
78
9
BUILT_SOURCES =
3
BUILT_SOURCES =
Reviewer	Review Type	Date Requested	Status
Lars Karlitski (community)		2012-05-07	Approve on 2012-05-08
jenkins	continuous-integration		Pending
Review via email: mp+105003@code.launchpad.net