diff options
| author | Ted Gould <ted@gould.cx> | 2011-04-04 11:15:17 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-04-04 11:15:17 -0500 |
| commit | 805b690c6a541986fbbb65a225435ede03cc9fc1 (patch) | |
| tree | 70479b5bad73efd00eccb508f7a19179f5f209ab /configure.ac | |
| parent | 8f93ef6be94f3ca6c994a9001bc249c1b5ccfc47 (diff) | |
| parent | c6d23b37d9833948e9286f849c12cea0061e2a95 (diff) | |
| download | ayatana-indicator-datetime-805b690c6a541986fbbb65a225435ede03cc9fc1.tar.gz ayatana-indicator-datetime-805b690c6a541986fbbb65a225435ede03cc9fc1.tar.bz2 ayatana-indicator-datetime-805b690c6a541986fbbb65a225435ede03cc9fc1.zip | |
* Upstream Merge
* Make sure the calendar follows the user setting (LP: #748772)
* Ensure that events handle month boundries correctly (LP: #746713)
* Only show calendars the user has configured (LP: #729033)
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index d1de2be..b932e56 100644 --- a/configure.ac +++ b/configure.ac @@ -66,6 +66,7 @@ GDK_REQUIRED_VERSION=2.22 GLIB_REQUIRED_VERSION=2.26 GTK_REQUIRED_VERSION=2.12 GTK3_REQUIRED_VERSION=3.0 +GCONF_REQUIRED_VERSION=2.31 AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(INDICATOR, indicator3 >= $INDICATOR_REQUIRED_VERSION @@ -86,7 +87,7 @@ AS_IF([test "x$with_gtk" = x3], AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(SERVICE, indicator >= $INDICATOR_REQUIRED_VERSION - glib-2.0 >= $GLIB_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS @@ -97,11 +98,12 @@ AS_IF([test "x$with_gtk" = x3], libedataserver-1.2 >= EDS_REQUIRED_VERSION libedataserverui-1.2 >= EDS_REQUIRED_VERSION cairo >= CAIRO_REQUIRED_VERSION - gdk-2.0 >= GDK_REQUIRED_VERSION) + gdk-2.0 >= GDK_REQUIRED_VERSION + gconf-2.0 >= GCONF_REQUIRED_VERSION) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(SERVICE, indicator >= $INDICATOR_REQUIRED_VERSION - glib-2.0 >= $GLIB_REQUIRED_VERSION + glib-2.0 >= $GLIB_REQUIRED_VERSION dbusmenu-glib-0.4 >= $DBUSMENUGLIB_REQUIRED_VERSION dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION libido-0.1 >= $INDICATOR_DISPLAY_OBJECTS @@ -112,7 +114,8 @@ AS_IF([test "x$with_gtk" = x3], libedataserver-1.2 >= EDS_REQUIRED_VERSION libedataserverui-1.2 >= EDS_REQUIRED_VERSION cairo >= CAIRO_REQUIRED_VERSION - gdk-2.0 >= GDK_REQUIRED_VERSION) + gdk-2.0 >= GDK_REQUIRED_VERSION + gconf-2.0 >= GCONF_REQUIRED_VERSION) ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] ) |