aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorEvgeni Golov <evgeni@debian.org>2011-03-31 14:09:07 +0200
committerEvgeni Golov <evgeni@debian.org>2011-03-31 14:09:07 +0200
commit38a90ca64a3d976218be46f7f5241805854d9ef1 (patch)
tree2b24bdb39e61fce6999511da451261daff1db7e2 /configure.ac
parent36559fd986e3226f8c926c69f9c253d4da46cb19 (diff)
parentcb170c0fb193360740cc543816e6f00d46a480c7 (diff)
downloadayatana-indicator-messages-38a90ca64a3d976218be46f7f5241805854d9ef1.tar.gz
ayatana-indicator-messages-38a90ca64a3d976218be46f7f5241805854d9ef1.tar.bz2
ayatana-indicator-messages-38a90ca64a3d976218be46f7f5241805854d9ef1.zip
Merge Ubuntu up to 0.3.92-0ubuntu3
* Merge new upstream from Ubuntu. * debian/patches/lp_690668.patch - Memory leak fixes (LP: #690668) * debian/control - Bump standards version to 3.9.1 * debian/source/format - Use source format 3.0 (quilt) * src/launcher-menu-item.c - Make sure menu entries are displayed for launchers that aren't running (LP: #723873) * New upstream release. * Adding in accessible description support * debian/control: libindicator version 0.3.19 * New upstream release. * Fixing the service file * Adding a log domain * Fixing type handler for dbusmenu 0.3.94 * debian/control: dbusmenu to 0.3.94 [ Ted Gould ] * New upstream release. * GDBus Port * New libindicate and dbusmenu [ Ken VanDine ] * debian/control - Build depends on libindicate-dev to 0.4.91 - Build depends on dbusmenu to 0.3.91 - Set Vcs to ~ubuntu-desktop * data/indicator-messages.service.in - Fixed dbus interface name * debian/control - Bump build depends for libdbusmenu-* to >= 0.3.90 * debian/control: package description spelling (LP: #658096) * Rebuild for libindicator ABI change (LP: #637692) * debian/control: depends on latest libindicator-dev * New upstream release. * Fixing triangles by passing data to callback (LP: #623453) * New upstream release. * Shifting icons into the gutter and adjusting the arrow padding. * New upstream release. * Remove parens from counts * New upstream release. - running apps triangle indicator overlay - message counters are now rendered with a nice rounded background
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac21
1 files changed, 15 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 2f95071..962b6f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-messages.c)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-messages, 0.3.7)
+AM_INIT_AUTOMAKE(indicator-messages, 0.3.92)
AM_MAINTAINER_MODE
@@ -22,6 +22,15 @@ AC_CONFIG_MACRO_DIR([m4])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
+AC_ARG_ENABLE([deprecations],
+ [AS_HELP_STRING([--enable-deprecations],
+ [allow deprecated API usage @<:@default=yes@:>@])],
+ [],
+ [enable_deprecations=yes])
+AS_IF([test "x$enable_deprecations" = xno],
+ [CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE -DGTK_DISABLE_SINGLE_INCLUDES"]
+)
+
###########################
# Dependencies
###########################
@@ -29,15 +38,15 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
GTK_REQUIRED_VERSION=2.12
GIO_UNIX_REQUIRED_VERSION=2.18
PANEL_REQUIRED_VERSION=2.0.0
-INDICATE_REQUIRED_VERSION=0.3.0
-INDICATOR_REQUIRED_VERSION=0.3.5
-DBUSMENUGTK_REQUIRED_VERSION=0.2.8
+INDICATE_REQUIRED_VERSION=0.4.90
+INDICATOR_REQUIRED_VERSION=0.3.19
+DBUSMENUGTK_REQUIRED_VERSION=0.3.94
PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
indicator >= $INDICATOR_REQUIRED_VERSION
- indicate >= $INDICATE_REQUIRED_VERSION
- dbusmenu-gtk >= $DBUSMENUGTK_REQUIRED_VERSION)
+ indicate-0.5 >= $INDICATE_REQUIRED_VERSION
+ dbusmenu-gtk-0.4 >= $DBUSMENUGTK_REQUIRED_VERSION)
AC_SUBST(APPLET_CFLAGS)
AC_SUBST(APPLET_LIBS)