← Back to branch summary

~desrt/indicator-session/gdbus

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Ted Gould
  • Date: 2011-06-10 19:28:37 UTC
  • mfrom: (146.2.1 indicator-session)
  • Revision ID: ted@gould.cx-20110610192837-n192rrhnti3s5lr5
GTK3 Support

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
26
26
###########################
27
27
 
28
28
GTK_REQUIRED_VERSION=2.12
 
29
GTK3_REQUIRED_VERSION=3.0
29
30
INDICATOR_REQUIRED_VERSION=0.3.19
30
31
DBUSMENUGTK_REQUIRED_VERSION=0.3.91
31
32
POLKIT_REQUIRED_VERSION=0.92
32
33
 
33
 
PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
34
 
                          indicator >= $INDICATOR_REQUIRED_VERSION
35
 
                          dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
 
34
AC_ARG_WITH([indicator-gtk],
 
35
  [AS_HELP_STRING([--with-indicator-gtk],
 
36
    [Which version of gtk to use for the indicator @<:@default=3@:>@])],
 
37
  [],
 
38
  [with_indicator_gtk=3])
 
39
 
 
40
AS_IF([test "x$with_indicator_gtk" = x3],
 
41
        [PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
 
42
                                   indicator3 >= $INDICATOR_REQUIRED_VERSION
 
43
                                   dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
 
44
        ],
 
45
      [test "x$with_indicator_gtk" = x2],
 
46
         [PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
 
47
                                    indicator >= $INDICATOR_REQUIRED_VERSION
 
48
                                    dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
 
49
        ],
 
50
      [AC_MSG_FAILURE([Value for --with-indicator-gtk was neither 2 nor 3])]
 
51
)
36
52
AC_SUBST(APPLET_CFLAGS)
37
53
AC_SUBST(APPLET_LIBS)
38
54
 
39
55
DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
40
56
 
41
57
PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
42
 
                                  dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
 
58
                                  dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
43
59
                                  dbus-glib-1
44
60
                                  gio-unix-2.0
45
 
                                  indicator >= $INDICATOR_REQUIRED_VERSION)
 
61
                                  indicator3 >= $INDICATOR_REQUIRED_VERSION)
46
62
 
47
63
AC_SUBST(SESSIONERVICE_CFLAGS)
48
64
AC_SUBST(SESSIONERVICE_LIBS)
49
65
 
50
 
PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION
 
66
PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-3.0 >= $GTK3_REQUIRED_VERSION
51
67
                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
52
68
 
53
69
 
78
94
if test "x$with_localinstall" = "xyes"; then
79
95
        INDICATORDIR="${libdir}/indicators/2/"
80
96
        INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
81
 
else
 
97
elif test "x$with_indicator_gtk" = x2; then
82
98
        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
83
99
        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator`
 
100
else
 
101
        INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3`
 
102
        INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3`
84
103
fi
85
104
AC_SUBST(INDICATORDIR)
86
105
AC_SUBST(INDICATORICONSDIR)
160
179
SUS Indicator Configuration:
161
180
 
162
181
        Prefix:        $prefix
 
182
        Indicator GTK: $with_indicator_gtk
163
183
])