diff options
| author | Ted Gould <ted@gould.cx> | 2011-02-18 12:54:09 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-02-18 12:54:09 -0600 |
| commit | 92029bc783017bec46a862ae79d72076157ac38f (patch) | |
| tree | 5cd21774ca4416d4858bea14b659eb4f4d8d9d5d /configure.ac | |
| parent | bcedc26848a0fe4f2f67a129d34976f69eb03fdf (diff) | |
| parent | 87703b408d42ce97b5a64142b0c33951d366890a (diff) | |
| download | libdbusmenu-92029bc783017bec46a862ae79d72076157ac38f.tar.gz libdbusmenu-92029bc783017bec46a862ae79d72076157ac38f.tar.bz2 libdbusmenu-92029bc783017bec46a862ae79d72076157ac38f.zip | |
Updating to trunk
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index f1c275f..7f53d3c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ -AC_INIT(libdbusmenu, 0.3.97, ted@canonical.com) +AC_INIT(libdbusmenu, 0.3.98, ted@canonical.com) AC_COPYRIGHT([Copyright 2009,2010 Canonical]) AC_PREREQ(2.62) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(libdbusmenu, 0.3.97, [-Wno-portability]) +AM_INIT_AUTOMAKE(libdbusmenu, 0.3.98, [-Wno-portability]) AM_MAINTAINER_MODE @@ -44,11 +44,9 @@ GNOME_DOC_INIT ########################### GLIB_REQUIRED_VERSION=2.26 -XML_REQUIRED_VERSION=2.6 PKG_CHECK_MODULES(DBUSMENUGLIB, glib-2.0 >= $GLIB_REQUIRED_VERSION - gio-2.0 >= $GLIB_REQUIRED_VERSION - libxml-2.0 >= $XML_REQUIRED_VERSION) + gio-2.0 >= $GLIB_REQUIRED_VERSION) AC_SUBST(DBUSMENUGLIB_CFLAGS) AC_SUBST(DBUSMENUGLIB_LIBS) @@ -67,16 +65,14 @@ AC_ARG_WITH([gtk], [with_gtk=2]) AS_IF([test "x$with_gtk" = x3], [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-3.0 >= $GTK3_REQUIRED_VERSION - glib-2.0 >= $GLIB_REQUIRED_VERSION - libxml-2.0 >= $XML_REQUIRED_VERSION) + glib-2.0 >= $GLIB_REQUIRED_VERSION) AC_SUBST(DBUSMENUGTK_CFLAGS) AC_SUBST(DBUSMENUGTK_LIBS) AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) ], [test "x$with_gtk" = x2], [PKG_CHECK_MODULES(DBUSMENUGTK, gtk+-2.0 >= $GTK_REQUIRED_VERSION - glib-2.0 >= $GLIB_REQUIRED_VERSION - libxml-2.0 >= $XML_REQUIRED_VERSION) + glib-2.0 >= $GLIB_REQUIRED_VERSION) AC_SUBST(DBUSMENUGTK_CFLAGS) AC_SUBST(DBUSMENUGTK_LIBS) ], @@ -138,7 +134,7 @@ AC_PATH_PROG([XSLT_PROC], [xsltproc]) ########################### LIBDBUSMENU_CURRENT=3 -LIBDBUSMENU_REVISION=5 +LIBDBUSMENU_REVISION=6 LIBDBUSMENU_AGE=0 AC_SUBST(LIBDBUSMENU_CURRENT) |