← Back to branch summary

~ubuntu-branches/ubuntu/natty/indicator-datetime/natty

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Ken VanDine, Ted Gould, Ken VanDine
  • Date: 2011-04-07 14:53:52 UTC
  • mfrom: (1.1.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20110407145352-cd9vrg26t45nk7r2
Tags: 0.2.2-0ubuntu1
https://launchpad.net/bugs/748772
https://launchpad.net/bugs/746713
https://launchpad.net/bugs/729033
[ Ted Gould ]
* New upstream release.
  ∘ Add language and proper distro version to geonames URL to allow
    for proper server side fixes
  ∘ Give full day events the day name instead of a time
  ∘ Make sure the calendar follows the user setting (LP: #748772)
  ∘ Ensure that events handle month boundaries correctly (LP: #746713)
  ∘ Only show calendars the user has configured (LP: #729033)
  ∘ Reenable clicking on the timezone in the menu to set it.

[ Ken VanDine ]
* debian/control
  - Added build depends for libgconf2-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
 
2
 
AC_INIT(indicator-datetime, 0.2.1, ted@canonical.com)
 
2
AC_INIT(indicator-datetime, 0.2.2, ted@canonical.com)
3
3
AC_COPYRIGHT([Copyright 2009,2010 Canonical])
4
4
 
5
5
AC_PREREQ(2.53)
6
6
 
7
7
AM_CONFIG_HEADER(config.h)
8
 
AM_INIT_AUTOMAKE(indicator-datetime, 0.2.1)
 
8
AM_INIT_AUTOMAKE(indicator-datetime, 0.2.2)
9
9
 
10
10
AM_MAINTAINER_MODE
11
11
 
66
66
GLIB_REQUIRED_VERSION=2.26
67
67
GTK_REQUIRED_VERSION=2.12
68
68
GTK3_REQUIRED_VERSION=3.0
 
69
GCONF_REQUIRED_VERSION=2.31
69
70
 
70
71
AS_IF([test "x$with_gtk" = x3],
71
72
    [PKG_CHECK_MODULES(INDICATOR, indicator3 >= $INDICATOR_REQUIRED_VERSION
86
87
 
87
88
AS_IF([test "x$with_gtk" = x3],
88
89
        [PKG_CHECK_MODULES(SERVICE,  indicator >= $INDICATOR_REQUIRED_VERSION
89
 
                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
 
90
                                 glib-2.0 >= $GLIB_REQUIRED_VERSION
90
91
                                     dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
91
92
                                 dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
92
93
                                     libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
97
98
                                     libedataserver-1.2 >= EDS_REQUIRED_VERSION
98
99
                                     libedataserverui-1.2 >= EDS_REQUIRED_VERSION
99
100
                                     cairo >= CAIRO_REQUIRED_VERSION
100
 
                                     gdk-2.0 >= GDK_REQUIRED_VERSION)
 
101
                                     gdk-2.0 >= GDK_REQUIRED_VERSION
 
102
                                     gconf-2.0 >= GCONF_REQUIRED_VERSION)
101
103
                ],
102
104
      [test "x$with_gtk" = x2],
103
105
        [PKG_CHECK_MODULES(SERVICE,  indicator >= $INDICATOR_REQUIRED_VERSION
104
 
                                     glib-2.0 >= $GLIB_REQUIRED_VERSION
 
106
                                 glib-2.0 >= $GLIB_REQUIRED_VERSION
105
107
                                     dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION
106
108
                                 dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION
107
109
                                     libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS
112
114
                                     libedataserver-1.2 >= EDS_REQUIRED_VERSION
113
115
                                     libedataserverui-1.2 >= EDS_REQUIRED_VERSION
114
116
                                     cairo >= CAIRO_REQUIRED_VERSION
115
 
                                     gdk-2.0 >= GDK_REQUIRED_VERSION)
 
117
                                     gdk-2.0 >= GDK_REQUIRED_VERSION
 
118
                                     gconf-2.0 >= GCONF_REQUIRED_VERSION)
116
119
        ],
117
120
    [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])]
118
121
)