diff options
| author | Lars Uebernickel <lars.uebernickel@canonical.com> | 2012-08-21 12:07:19 +0200 |
|---|---|---|
| committer | Lars Uebernickel <lars.uebernickel@canonical.com> | 2012-08-21 12:07:19 +0200 |
| commit | 374fa7bb7eb2526f1cf19bf85edd5793d8ef569b (patch) | |
| tree | eae99c80f31d940226680a31100024cd2b4a71c4 /configure.ac | |
| parent | 13f2b1bb69fb69aadcdc838b2321aa2b01657e06 (diff) | |
| parent | 5df53a2c98d806f3b266d0032986d4dab3beb7a3 (diff) | |
| download | ayatana-indicator-messages-374fa7bb7eb2526f1cf19bf85edd5793d8ef569b.tar.gz ayatana-indicator-messages-374fa7bb7eb2526f1cf19bf85edd5793d8ef569b.tar.bz2 ayatana-indicator-messages-374fa7bb7eb2526f1cf19bf85edd5793d8ef569b.zip | |
Merge lp:~larsu/indicator-messags/towards-q-redesign
This branch introduces libmessaging-menu, a new library for applications to
integrate with the messaging menu. Libindicate is not supported anymore.
libmessaging-menu uses GMenuModel to communicate with
indicator-messages-service. In order to take advantage of GMenuModel's
architecture (re-exporting menus on a different path), the service now also
sends its menu as a GMenuModel to the panel plugin.
The plugin uses gtk_menu_new_from_model to create the menu widgets. Custom
menu items are created by a small gtk+ patch that watches for x-canonical-type
attributes.
The branch also contains most of the design changes for quantal.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 39 |
1 files changed, 12 insertions, 27 deletions
diff --git a/configure.ac b/configure.ac index ca879a1..dc56181 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT(src/indicator-messages.c) +AC_INIT(indicator-messages, 0.6.0) -AC_PREREQ(2.53) +AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-messages, 0.6.0) +AM_INIT_AUTOMAKE() AM_MAINTAINER_MODE @@ -41,43 +41,26 @@ AC_PROG_CXX GTK_REQUIRED_VERSION=3.0 GIO_UNIX_REQUIRED_VERSION=2.18 PANEL_REQUIRED_VERSION=2.0.0 -INDICATE_REQUIRED_VERSION=0.6.90 INDICATOR_REQUIRED_VERSION=0.3.19 -DBUSMENUGTK_REQUIRED_VERSION=0.5.90 GLIB_REQUIRED_VERSION=2.31.20 +INTROSPECTION_REQUIRED_VERSION=1.32.0 PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= $GTK_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION indicator3-0.4 >= $INDICATOR_REQUIRED_VERSION - indicate-0.7 >= $INDICATE_REQUIRED_VERSION - dbusmenu-gtk3-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION glib-2.0 >= $GLIB_REQUIRED_VERSION gmodule-2.0 >= $GLIB_REQUIRED_VERSION) +PKG_CHECK_MODULES(GIO, gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION) + AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) -########################### -# Status Provider Deps -########################### - -PKG_CHECK_MODULES(STATUS_PROVIDER_PIDGIN, dbus-glib-1) -AC_SUBST(STATUS_PROVIDER_PIDGIN_CFLAGS) -AC_SUBST(STATUS_PROVIDER_PIDGIN_LIBS) - -PKG_CHECK_MODULES(STATUS_PROVIDER_TELEPATHY, dbus-glib-1) -AC_SUBST(STATUS_PROVIDER_TELEPATHY_CFLAGS) -AC_SUBST(STATUS_PROVIDER_TELEPATHY_LIBS) +GLIB_GSETTINGS -TELEPATHYGLIB_REQUIRED_VERSION=0.9.0 -PKG_CHECK_MODULES(STATUS_PROVIDER_MC5, dbus-glib-1 - telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION) -AC_SUBST(STATUS_PROVIDER_MC5_CFLAGS) -AC_SUBST(STATUS_PROVIDER_MC5_LIBS) +GTK_DOC_CHECK([1.18], []) -PKG_CHECK_MODULES(STATUS_PROVIDER_EMESENE, dbus-glib-1) -AC_SUBST(STATUS_PROVIDER_EMESENE_CFLAGS) -AC_SUBST(STATUS_PROVIDER_EMESENE_LIBS) +GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_REQUIRED_VERSION]) ########################### # gcov coverage reporting @@ -177,7 +160,6 @@ AM_GLIB_GNU_GETTEXT AC_OUTPUT([ Makefile src/Makefile -src/indicator-messages-status-provider-0.5.pc.in data/Makefile data/icons/Makefile data/icons/16x16/Makefile @@ -198,6 +180,8 @@ data/icons/scalable/status/Makefile data/icons/scalable/categories/Makefile po/Makefile.in test/Makefile +libmessaging-menu/Makefile +libmessaging-menu/messaging-menu.pc ]) ########################### @@ -212,4 +196,5 @@ Messaging Indicator Configuration: Indicator Dir: $INDICATORDIR gtest: $enable_tests gcov: $use_gcov + introspecion: $enable_introspection ]) |