aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDidier Roche <didier.roche@canonical.com>2012-09-20 18:45:10 +0200
committerDidier Roche <didier.roche@canonical.com>2012-09-20 18:45:10 +0200
commitc36de4d59150df37ec782a17fb3d14424fb4734a (patch)
tree61cd8a51b8dfb8089afeee0938e46945dae2f171 /configure.ac
parentd1a1d09ea3487669f8622eb4106414eb01d41cfd (diff)
parentddaa8926d360ed0b6714aab4c06f4b91580bddbc (diff)
downloadlibdbusmenu-c36de4d59150df37ec782a17fb3d14424fb4734a.tar.gz
libdbusmenu-c36de4d59150df37ec782a17fb3d14424fb4734a.tar.bz2
libdbusmenu-c36de4d59150df37ec782a17fb3d14424fb4734a.zip
Import upstream version 12.10.0
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac9
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index cd35002..e0c61bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
-AC_INIT(libdbusmenu, 0.6.2, ted@canonical.com)
+AC_INIT(libdbusmenu, 12.10.0, ted@canonical.com)
AC_COPYRIGHT([Copyright 2009,2010 Canonical])
AC_PREREQ(2.62)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 0.6.2, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 12.10.0, [-Wno-portability])
AM_MAINTAINER_MODE
@@ -121,7 +121,8 @@ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION,
[have_tests=yes]
)
-PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind)
+PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind, have_valgrind=yes, have_valgrind=no)
+AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"])
])
AC_SUBST(DBUSMENUTESTS_CFLAGS)
@@ -166,7 +167,7 @@ AC_PATH_PROG([XSLT_PROC], [xsltproc])
###########################
LIBDBUSMENU_CURRENT=4
-LIBDBUSMENU_REVISION=13
+LIBDBUSMENU_REVISION=12
LIBDBUSMENU_AGE=0
AC_SUBST(LIBDBUSMENU_CURRENT)