← Back to branch summary

~laney/indicator-session/logind-port

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Tarmac
  • Author(s): Charles Kerr
  • Date: 2012-11-30 17:29:09 UTC
  • mfrom: (378.1.4 deps)
  • Revision ID: tarmac-20121130172909-3ow9vml9y6u5j9fs
i-session doesn't use polkit or packagekit anymore, so don't refer to them in configure.ac or debian/*. Fixes: https://bugs.launchpad.net/bugs/1085100.

Approved by PS Jenkins bot, Mathieu Trudel-Lapierre.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
30
30
GTK_REQUIRED_VERSION=3.0
31
31
INDICATOR_REQUIRED_VERSION=0.3.19
32
32
DBUSMENUGTK_REQUIRED_VERSION=0.5.90
33
 
POLKIT_REQUIRED_VERSION=0.92
34
33
DBUSTEST_REQUIRED_VERSION=0.0.5
35
34
DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
36
35
 
47
46
                                  dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
48
47
                                  dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
49
48
                                  gio-unix-2.0
50
 
                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION
51
 
                                  packagekit-glib2)
 
49
                                  indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION)
52
50
AC_SUBST(SESSIONERVICE_CFLAGS)
53
51
AC_SUBST(SESSIONERVICE_LIBS)
54
52
 
60
58
###########################
61
59
 
62
60
AC_ARG_ENABLE([gtklogouthelper],
63
 
            AS_HELP_STRING([--enable-gtklogouthelper], [enable GTK Logout Helper]),,
64
 
            enable_gtklogouthelper=auto)
 
61
              [AS_HELP_STRING([--enable-gtklogouthelper], [enable GTK Logout Helper])],
 
62
              [],
 
63
              [enable_gtklogouthelper=auto])
65
64
 
66
65
if test x"$enable_gtklogouthelper" != x"no" ; then
67
 
   PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-3.0 >= $GTK_REQUIRED_VERSION
68
 
                                      polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION,
69
 
                                      [have_gtklogouthelper=yes],
70
 
                                      [have_gtklogouthelper=no])
 
66
   PKG_CHECK_MODULES([GTKLOGOUTHELPER],
 
67
                     [gtk+-3.0 >= $GTK_REQUIRED_VERSION],
 
68
                     [have_gtklogouthelper=yes],
 
69
                     [have_gtklogouthelper=no])
71
70
   if test x${have_gtklogouthelper} = xyes; then
72
71
      AC_DEFINE(HAVE_GTKLOGOUTHELPER, 1, [Define to 1 to enable GTK Logout Helper])
73
72
   fi