diff options
| author | David Barth <david.barth@canonical.com> | 2011-02-25 18:01:20 +0100 |
|---|---|---|
| committer | David Barth <david.barth@canonical.com> | 2011-02-25 18:01:20 +0100 |
| commit | 6f103ce25995b5a40967b0ba683b7f7330aadd8a (patch) | |
| tree | 322e1b173d026de8b0437aaa50ff6ab74be4d491 /configure.ac | |
| parent | 124ef53b7bab308704974bd5a1efc5e40f5fc6c0 (diff) | |
| parent | 42125be0102026e6ecae842413261a8b05a25e96 (diff) | |
| download | ayatana-indicator-datetime-6f103ce25995b5a40967b0ba683b7f7330aadd8a.tar.gz ayatana-indicator-datetime-6f103ce25995b5a40967b0ba683b7f7330aadd8a.tar.bz2 ayatana-indicator-datetime-6f103ce25995b5a40967b0ba683b7f7330aadd8a.zip | |
merging in mterry's branch with the new preferences dialog
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index d06aa6d..08707bc 100644 --- a/configure.ac +++ b/configure.ac @@ -65,6 +65,8 @@ ICAL_REQUIRED_VERSION=0.44 CAIRO_REQUIRED_VERSION=1.10 GDK_REQUIRED_VERSION=2.22 GLIB_REQUIRED_VERSION=2.26 +GTK_REQUIRED_VERSION=2.12 +GTK3_REQUIRED_VERSION=3.0 AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(INDICATOR, indicator3 >= $INDICATOR_REQUIRED_VERSION @@ -117,12 +119,48 @@ AS_IF([test "x$with_gtk" = x3], ], [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] ) + +# FIXME: polkit-gtk-1 isn't gtk3-compatible +AS_IF([test "x$with_gtk" = x3], + [PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION + gtk+-3.0 >= $GTK3_REQUIRED_VERSION + unique-3.0 + json-glib-1.0 + polkit-gtk-1) + ], + [test "x$with_gtk" = x2], + [PKG_CHECK_MODULES(PREF, gio-2.0 >= $GIO_REQUIRED_VERSION + gtk+-2.0 >= $GTK_REQUIRED_VERSION + unique-1.0 + json-glib-1.0 + polkit-gtk-1) + ], + [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] +) + +AS_IF([test "x$with_gtk" = x3], + [PKG_CHECK_MODULES(LIBMAP, gio-2.0 >= $GIO_REQUIRED_VERSION + gtk+-3.0 >= $GTK3_REQUIRED_VERSION) + ], + [test "x$with_gtk" = x2], + [PKG_CHECK_MODULES(LIBMAP, gio-2.0 >= $GIO_REQUIRED_VERSION + gtk+-2.0 >= $GTK_REQUIRED_VERSION) + ], + [AC_MSG_FAILURE([Value for --with-gtk was neither 2 nor 3])] +) AC_SUBST(INDICATOR_CFLAGS) AC_SUBST(INDICATOR_LIBS) AC_SUBST(SERVICE_CFLAGS) AC_SUBST(SERVICE_LIBS) +AC_SUBST(PREF_CFLAGS) +AC_SUBST(PREF_LIBS) + +AC_SUBST(LIBMAP_CFLAGS) +AC_SUBST(LIBMAP_LIBS) +AC_SUBST(LIBMAP_LDFLAGS) + ########################### # Grab the GSettings Macros ########################### @@ -202,6 +240,7 @@ AM_GLIB_GNU_GETTEXT AC_OUTPUT([ Makefile +libmap/Makefile src/Makefile data/Makefile tests/Makefile |